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

[#2436] Remove class lease recount definitions from LeaseMgr

Browse Source
This commit is contained in:
Thomas Markwalder
2022-06-22 08:57:26 -04:00
parent 8c59d52279
commit ad9713ce63
3 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/dhcpsrv/lease_mgr.h
View File

@@ -792,24 +792,6 @@ public:
return (io_service_); return (io_service_);
} }
/// @brief Recount the leases per class for V4 leases.
///
/// Clears the current class-lease counts and then iterates
/// over existing leases, retabulating counts based on class
/// lists in each lease user-context.
///
/// For RDBMs back ends this is a NOP.
virtual void recountClassLeases4() {}
/// @brief Recount the leases per class for V6 leases.
///
/// Clears the current class-lease counts and then iterates
/// over existing leases, retabulating counts based on class
/// lists in each lease user-context.
///
/// For RDBMs back ends this is a NOP.
virtual void recountClassLeases6() {}
/// @brief Returns the class lease count for a given class and lease type. /// @brief Returns the class lease count for a given class and lease type.
/// ///
/// @param client_class client class for which the count is desired /// @param client_class client class for which the count is desired

2
src/lib/dhcpsrv/memfile_lease_mgr.cc
View File

@@ -2084,6 +2084,7 @@ Memfile_LeaseMgr::wipeLeases6(const SubnetID& subnet_id) {
void void
Memfile_LeaseMgr::recountClassLeases4() { Memfile_LeaseMgr::recountClassLeases4() {
class_lease_counter_.clear();
auto & idx = storage4_.get<AddressIndexTag>(); auto & idx = storage4_.get<AddressIndexTag>();
auto lower = idx.begin(); auto lower = idx.begin();
@@ -2099,6 +2100,7 @@ Memfile_LeaseMgr::recountClassLeases4() {
void void
Memfile_LeaseMgr::recountClassLeases6() { Memfile_LeaseMgr::recountClassLeases6() {
class_lease_counter_.clear();
auto & idx = storage6_.get<AddressIndexTag>(); auto & idx = storage6_.get<AddressIndexTag>();
auto lower = idx.begin(); auto lower = idx.begin();

17
src/lib/dhcpsrv/memfile_lease_mgr.h
View File

@@ -1219,6 +1219,13 @@ private:
ClassLeaseCounter class_lease_counter_; ClassLeaseCounter class_lease_counter_;
public: public:
/// @brief Returns the class lease count for a given class and lease type.
///
/// @param client_class client class for which the count is desired
/// @param ltype type of lease for which the count is desired. Defaults to
/// Lease::TYPE_V4.
virtual size_t getClassLeaseCount(const ClientClass& client_class,
const Lease::Type& ltype = Lease::TYPE_V4);
/// @brief Recount the leases per class for V4 leases. /// @brief Recount the leases per class for V4 leases.
/// ///
@@ -1232,15 +1239,7 @@ public:
/// Clears the current class-lease count map and then iterates /// Clears the current class-lease count map and then iterates
/// over all, retabulating counts based on class lists in each lease /// over all, retabulating counts based on class lists in each lease
/// user-context. /// user-context.
virtual void recountClassLeases6(); void recountClassLeases6();
/// @brief Returns the class lease count for a given class and lease type.
///
/// @param client_class client class for which the count is desired
/// @param ltype type of lease for which the count is desired. Defaults to
/// Lease::TYPE_V4.
virtual size_t getClassLeaseCount(const ClientClass& client_class,
const Lease::Type& ltype = Lease::TYPE_V4);
/// @brief Clears the class-lease count map. /// @brief Clears the class-lease count map.
void clearClassLeaseCounts(); void clearClassLeaseCounts();