[#2869] Improved reclaimed handling

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc
index ab9c675fcb16453f1de856666a3f9f003f983645..1a10db1e10e7a423e02a23d552c38c8779921a43 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_mgr.cc
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc
@@ -2099,17 +2099,6 @@ Memfile_LeaseMgr::deleteExpiredReclaimedLeases(const uint32_t secs,
             }
         }
 
-        // Delete references from extended info tables.
-        if (getExtendedInfoTablesEnabled()) {
-            // Swap if and for when v4 will be implemented.
-            if (universe == V6) {
-                for (typename IndexType::const_iterator lease = lower_limit;
-                     lease != upper_limit; ++lease) {
-                    deleteExtendedInfo6((*lease)->addr_);
-                }
-            }
-        }
-
         // Erase leases from memory.
         index.erase(lower_limit, upper_limit);
 

diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc
index a4c5e15ae9e706bfd3848bf9b12e0f701372145f..7e33a31956bf101dff6222add99755a744830a6e 100644 (file)
--- a/src/lib/dhcpsrv/mysql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc
@@ -2409,8 +2409,6 @@ MySqlLeaseMgr::addLease(const Lease6Ptr& lease) {
     lease->updateCurrentExpirationTime();
 
     if (getExtendedInfoTablesEnabled()) {
-        // Expired leases can be removed leaving entries in extended info tables.
-        deleteExtendedInfo6(lease->addr_);
         static_cast<void>(addExtendedInfo6(lease));
     }
 

diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
index 912bca4893bdc6508d115a25dfbe007a7e354fd9..c972dc750ed7a9991a5f5ab34a381c66b2ca766c 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
@@ -1857,8 +1857,6 @@ PgSqlLeaseMgr::addLease(const Lease6Ptr& lease) {
     lease->updateCurrentExpirationTime();
 
     if (getExtendedInfoTablesEnabled()) {
-        // Expired leases can be removed leaving entries in extended info tables.
-        deleteExtendedInfo6(lease->addr_);
         static_cast<void>(addExtendedInfo6(lease));
     }