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

[#2682] Addressed comments

Browse Source
This commit is contained in:
Francis Dupont
2023-02-07 09:42:17 +01:00
parent 06ec4d525d
commit 0c99d67dbc
3 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2092. [bug] fdupont
Added logic to kea-dhcp4 and kea-dhcp6 to catch and log
database connection errors that occur during lease
reclamation. Prior to this such errors caused the
reclamation timer to not get rescheduled.
(Gitlab #2682)
2091. [bug] marcin 2091. [bug] marcin
Fixed a bug that caused a response to a config-get command Fixed a bug that caused a response to a config-get command
to lack the configured read-timeout, write-timeout, and to lack the configured read-timeout, write-timeout, and

24
src/lib/dhcpsrv/alloc_engine.cc
View File

@@ -2343,8 +2343,8 @@ AllocEngine::reclaimExpiredLeases6(const size_t max_leases,
.arg(timeout); .arg(timeout);
try { try {
reclaimExpiredLeases6NoExc(max_leases, timeout, remove_lease, reclaimExpiredLeases6Internal(max_leases, timeout, remove_lease,
max_unwarned_cycles); max_unwarned_cycles);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
LOG_ERROR(alloc_engine_logger, LOG_ERROR(alloc_engine_logger,
ALLOC_ENGINE_V6_LEASES_RECLAMATION_FAILED) ALLOC_ENGINE_V6_LEASES_RECLAMATION_FAILED)
@@ -2353,10 +2353,10 @@ AllocEngine::reclaimExpiredLeases6(const size_t max_leases,
} }
void void
AllocEngine::reclaimExpiredLeases6NoExc(const size_t max_leases, AllocEngine::reclaimExpiredLeases6Internal(const size_t max_leases,
const uint16_t timeout, const uint16_t timeout,
const bool remove_lease, const bool remove_lease,
const uint16_t max_unwarned_cycles) { const uint16_t max_unwarned_cycles) {
// Create stopwatch and automatically start it to measure the time // Create stopwatch and automatically start it to measure the time
// taken by the routine. // taken by the routine.
@@ -2506,8 +2506,8 @@ AllocEngine::reclaimExpiredLeases4(const size_t max_leases,
.arg(timeout); .arg(timeout);
try { try {
reclaimExpiredLeases4NoExc(max_leases, timeout, remove_lease, reclaimExpiredLeases4Internal(max_leases, timeout, remove_lease,
max_unwarned_cycles); max_unwarned_cycles);
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
LOG_ERROR(alloc_engine_logger, LOG_ERROR(alloc_engine_logger,
ALLOC_ENGINE_V4_LEASES_RECLAMATION_FAILED) ALLOC_ENGINE_V4_LEASES_RECLAMATION_FAILED)
@@ -2516,10 +2516,10 @@ AllocEngine::reclaimExpiredLeases4(const size_t max_leases,
} }
void void
AllocEngine::reclaimExpiredLeases4NoExc(const size_t max_leases, AllocEngine::reclaimExpiredLeases4Internal(const size_t max_leases,
const uint16_t timeout, const uint16_t timeout,
const bool remove_lease, const bool remove_lease,
const uint16_t max_unwarned_cycles) { const uint16_t max_unwarned_cycles) {
// Create stopwatch and automatically start it to measure the time // Create stopwatch and automatically start it to measure the time
// taken by the routine. // taken by the routine.

16
src/lib/dhcpsrv/alloc_engine.h
View File

@@ -665,10 +665,10 @@ public:
/// of expired leases, after which the system issues a warning if there /// of expired leases, after which the system issues a warning if there
/// are still expired leases in the database. If this value is 0, the /// are still expired leases in the database. If this value is 0, the
/// warning is never issued. /// warning is never issued.
void reclaimExpiredLeases6NoExc(const size_t max_leases, void reclaimExpiredLeases6Internal(const size_t max_leases,
const uint16_t timeout, const uint16_t timeout,
const bool remove_lease, const bool remove_lease,
const uint16_t max_unwarned_cycles = 0); const uint16_t max_unwarned_cycles = 0);
/// @brief Deletes reclaimed leases expired more than specified amount /// @brief Deletes reclaimed leases expired more than specified amount
/// of time ago. /// of time ago.
@@ -741,10 +741,10 @@ public:
/// of expired leases, after which the system issues a warning if there /// of expired leases, after which the system issues a warning if there
/// are still expired leases in the database. If this value is 0, the /// are still expired leases in the database. If this value is 0, the
/// warning is never issued. /// warning is never issued.
void reclaimExpiredLeases4NoExc(const size_t max_leases, void reclaimExpiredLeases4Internal(const size_t max_leases,
const uint16_t timeout, const uint16_t timeout,
const bool remove_lease, const bool remove_lease,
const uint16_t max_unwarned_cycles = 0); const uint16_t max_unwarned_cycles = 0);
/// @brief Deletes reclaimed leases expired more than specified amount /// @brief Deletes reclaimed leases expired more than specified amount
/// of time ago. /// of time ago.