mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-29 13:07:50 +00:00
Code Issues Releases Wiki Activity

[#1336] addressed review comments

Browse Source
This commit is contained in:
Razvan Becheriu 2025-03-14 20:47:22 +02:00
parent 6e1c34157a
commit 01728b22b2
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1561,8 +1561,10 @@ AllocEngine::removeNonmatchingReservedLeases6(ClientContext6& ctx,
if (pool) { if (pool) {
StatsMgr::instance().addValue( StatsMgr::instance().addValue(
StatsMgr::generateName("subnet", subnet->getID(), StatsMgr::generateName("subnet", subnet->getID(),
StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ? "pool" : "pd-pool", pool->getID(), StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ?
ctx.currentIA().type_ == Lease::TYPE_NA ? "assigned-nas" : "assigned-pds")), "pool" : "pd-pool", pool->getID(),
ctx.currentIA().type_ == Lease::TYPE_NA ?
"assigned-nas" : "assigned-pds")),
static_cast<int64_t>(-1)); static_cast<int64_t>(-1));
} }
} }
@ -1620,8 +1622,10 @@ AllocEngine::removeNonmatchingReservedNoHostLeases6(ClientContext6& ctx,
if (pool) { if (pool) {
StatsMgr::instance().addValue( StatsMgr::instance().addValue(
StatsMgr::generateName("subnet", subnet->getID(), StatsMgr::generateName("subnet", subnet->getID(),
StatsMgr::generateName(candidate->type_ == Lease::TYPE_NA ? "pool" : "pd-pool", pool->getID(), StatsMgr::generateName(candidate->type_ == Lease::TYPE_NA ?
candidate->type_ == Lease::TYPE_NA ? "assigned-nas" : "assigned-pds")), "pool" : "pd-pool", pool->getID(),
candidate->type_ == Lease::TYPE_NA ?
"assigned-nas" : "assigned-pds")),
static_cast<int64_t>(-1)); static_cast<int64_t>(-1));
} }
} }
@ -1703,8 +1707,10 @@ AllocEngine::removeNonreservedLeases6(ClientContext6& ctx,
if (pool) { if (pool) {
StatsMgr::instance().addValue( StatsMgr::instance().addValue(
StatsMgr::generateName("subnet", subnet->getID(), StatsMgr::generateName("subnet", subnet->getID(),
StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ? "pool" : "pd-pool", pool->getID(), StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ?
ctx.currentIA().type_ == Lease::TYPE_NA ? "assigned-nas" : "assigned-pds")), "pool" : "pd-pool", pool->getID(),
ctx.currentIA().type_ == Lease::TYPE_NA ?
"assigned-nas" : "assigned-pds")),
static_cast<int64_t>(-1)); static_cast<int64_t>(-1));
} }
} }
@ -2958,7 +2964,8 @@ AllocEngine::reclaimExpiredLease(const Lease6Ptr& lease,
if (pool) { if (pool) {
StatsMgr::instance().addValue( StatsMgr::instance().addValue(
StatsMgr::generateName("subnet", subnet->getID(), StatsMgr::generateName("subnet", subnet->getID(),
StatsMgr::generateName(lease->type_ == Lease::TYPE_NA ? "pool" : "pd-pool", StatsMgr::generateName(lease->type_ == Lease::TYPE_NA ?
"pool" : "pd-pool",
pool->getID(), "reclaimed-leases")), pool->getID(), "reclaimed-leases")),
static_cast<int64_t>(1)); static_cast<int64_t>(1));
} }
@ -2980,7 +2987,8 @@ AllocEngine::reclaimExpiredLease(const Lease6Ptr& lease,
} else if (lease->type_ == Lease::TYPE_NA || lease->type_ == Lease::TYPE_PD) { } else if (lease->type_ == Lease::TYPE_NA || lease->type_ == Lease::TYPE_PD) {
StatsMgr::instance().addValue(StatsMgr::generateName("subnet", StatsMgr::instance().addValue(StatsMgr::generateName("subnet",
lease->subnet_id_, lease->subnet_id_,
lease->type_ == Lease::TYPE_NA ? "assigned-nas" : "assigned-pds"), lease->type_ == Lease::TYPE_NA ?
"assigned-nas" : "assigned-pds"),
static_cast<int64_t>(-1)); static_cast<int64_t>(-1));
if (subnet) { if (subnet) {
@ -2988,8 +2996,10 @@ AllocEngine::reclaimExpiredLease(const Lease6Ptr& lease,
if (pool) { if (pool) {
StatsMgr::instance().addValue( StatsMgr::instance().addValue(
StatsMgr::generateName("subnet", subnet->getID(), StatsMgr::generateName("subnet", subnet->getID(),
StatsMgr::generateName(lease->type_ == Lease::TYPE_NA ? "pool" : "pd-pool", pool->getID(), StatsMgr::generateName(lease->type_ == Lease::TYPE_NA ?
lease->type_ == Lease::TYPE_NA ? "assigned-nas" : "assigned-pds")), "pool" : "pd-pool", pool->getID(),
lease->type_ == Lease::TYPE_NA ?
"assigned-nas" : "assigned-pds")),
static_cast<int64_t>(-1)); static_cast<int64_t>(-1));
} }
} }