mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 05:55:28 +00:00
Code Issues Releases Wiki Activity

[#1375] added unittests for recover db connection with timer

Browse Source
This commit is contained in:
Razvan Becheriu
2020-11-13 21:48:43 +02:00
parent f2baa1b612
commit dff6de1464
15 changed files with 424 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/dhcpsrv/mysql_lease_mgr.cc
View File

@@ -1802,17 +1802,9 @@ MySqlLeaseMgr::MySqlLeaseMgr(const DatabaseConnection::ParameterMap& parameters)
// Create an initial context.
pool_.reset(new MySqlLeaseContextPool());
pool_->pool_.push_back(createContext());
auto db_reconnect_ctl = pool_->pool_[0]->conn_.reconnectCtl();
TimerMgr::instance()->registerTimer(timer_name_,
std::bind(&MySqlLeaseMgr::dbReconnect, db_reconnect_ctl),
db_reconnect_ctl->retryInterval(),
asiolink::IntervalTimer::ONE_SHOT);
}
MySqlLeaseMgr::~MySqlLeaseMgr() {
TimerMgr::instance()->unregisterTimer(timer_name_);
}
bool
@@ -1823,6 +1815,8 @@ MySqlLeaseMgr::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
bool reopened = false;
const std::string timer_name = db_reconnect_ctl->timerName();
// At least one connection was lost.
try {
CfgDbAccessPtr cfg_db = CfgMgr::instance().getCurrentCfg()->getCfgDbAccess();
@@ -1837,8 +1831,9 @@ MySqlLeaseMgr::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
if (reopened) {
// Cancel the timer.
const std::string& timer_name = db_reconnect_ctl->timerName();
TimerMgr::instance()->cancel(timer_name);
if (TimerMgr::instance()->isTimerRegistered(timer_name)) {
TimerMgr::instance()->unregisterTimer(timer_name);
}
DatabaseConnection::invokeDbRecoveredCallback(db_reconnect_ctl);
} else {
@@ -1847,6 +1842,11 @@ MySqlLeaseMgr::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
LOG_ERROR(dhcpsrv_logger, DHCPSRV_MYSQL_LEASE_DB_RECONNECT_FAILED)
.arg(db_reconnect_ctl->maxRetries());
// Cancel the timer.
if (TimerMgr::instance()->isTimerRegistered(timer_name)) {
TimerMgr::instance()->unregisterTimer(timer_name);
}
DatabaseConnection::invokeDbFailedCallback(db_reconnect_ctl);
return (false);
@@ -1857,7 +1857,14 @@ MySqlLeaseMgr::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
.arg(db_reconnect_ctl->maxRetries())
.arg(db_reconnect_ctl->retryInterval());
TimerMgr::instance()->setup(db_reconnect_ctl->timerName());
// Start the timer.
if (!TimerMgr::instance()->isTimerRegistered(timer_name)) {
TimerMgr::instance()->registerTimer(timer_name,
std::bind(&MySqlLeaseMgr::dbReconnect, db_reconnect_ctl),
db_reconnect_ctl->retryInterval(),
asiolink::IntervalTimer::ONE_SHOT);
}
TimerMgr::instance()->setup(timer_name);
}
return (true);