mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-02 06:55:16 +00:00
Code Issues Releases Wiki Activity

[#1369] Added retry logic to kea-dhcp6 and ChangeLog

Browse Source
This commit is contained in:
Thomas Markwalder
2020-08-06 14:31:42 -04:00
parent f562be111d
commit 6c84acf33b
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
1792. [bug] tmark
Corrected a bug that causes kea-dhcp4/kea-dhcp6 servers to crash after
losing connectivity to a configuration backend database. The servers
now correctly honor the max-reconnect-tries parameter.
(Gitlab #1369)
1781. [bug] razvan 1781. [bug] razvan
Reject invalid declined state for PD prefix in add and update Reject invalid declined state for PD prefix in add and update
commands in lease-cmds hook. commands in lease-cmds hook.

9
src/bin/dhcp6/ctrl_dhcp6_srv.cc
View File

@@ -1155,10 +1155,17 @@ void
ControlledDhcpv6Srv::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) { ControlledDhcpv6Srv::dbReconnect(ReconnectCtlPtr db_reconnect_ctl) {
bool reopened = false; bool reopened = false;
// Re-open lease and host database with new parameters. // We lost at least one of them, Reopen all of them (lease, host, and CB databases)
try { try {
CfgDbAccessPtr cfg_db = CfgMgr::instance().getCurrentCfg()->getCfgDbAccess(); CfgDbAccessPtr cfg_db = CfgMgr::instance().getCurrentCfg()->getCfgDbAccess();
cfg_db->createManagers(); cfg_db->createManagers();
auto ctl_info = CfgMgr::instance().getCurrentCfg()->getConfigControlInfo();
if (ctl_info) {
auto srv_cfg = CfgMgr::instance().getCurrentCfg();
server_->getCBControl()->databaseConfigConnect(srv_cfg);
}
reopened = true; reopened = true;
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
LOG_ERROR(dhcp6_logger, DHCP6_DB_RECONNECT_ATTEMPT_FAILED).arg(ex.what()); LOG_ERROR(dhcp6_logger, DHCP6_DB_RECONNECT_ATTEMPT_FAILED).arg(ex.what());