Register quota metrics unconditionally - #6253
Conversation
❌ 10 Tests Failed:
View the full list of 11 ❄️ flaky test(s)
To view more test analytics, go to the Test Analytics Dashboard |
b448fe5 to
d580a11
Compare
|
Requested @francoisferrand in place of Maha Benzekri, who is currently on PTO. |
d580a11 to
fcefd5a
Compare
Hello delthas,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
|
francoisferrand
left a comment
There was a problem hiding this comment.
- I think creating the metrics is harmless (it was already the case); and it avoids adding all the ?. → just create them always
- less sure how to fix crrCacheToPom
Both quota gates in monitoringHandler tested config.isQuotaEnabled -- the function reference rather than a call -- so both were always true and all six quota metrics were always registered. Drop the conditionals rather than calling the function. Always registering is what has actually happened since these checks were written, nothing depends on the metrics disappearing when quota is off, and gating registration would mean guarding every metric touch point against a metric that was never created: crrCacheToProm reached bucketsWithQuota unguarded, and the scuba wrapper observes its histogram in a finally block, on a path the Veeam capacity route hits with no quota gating at all. Behaviour is unchanged -- the six s3_cloudserver_quota_* series are exposed exactly as before -- so this is a dead code removal. Issue: CLDSRV-972
fcefd5a to
33f77af
Compare
Stacked on #6252 — review that one first. This PR's diff is only the last two
commits; retarget to
development/9.4once #6252 merges.Both quota gates in
lib/utilities/monitoringHandler.jstestedconfig.isQuotaEnabled— the function reference rather than a call — so bothwere always true, and all six quota metrics have always been registered.
Rather than calling the function, the conditionals are removed. Always
registering is what has actually happened since these checks were written,
nothing depends on the metrics disappearing when quota is off, and gating
registration would mean guarding every metric touch point against a metric that
was never created:
crrCacheToPromreachedbucketsWithQuotaunguarded, andthe scuba wrapper observes its histogram in a
finallyblock, on a path theVeeam capacity route reaches with no quota gating at all.
Behaviour is unchanged — the six
s3_cloudserver_quota_*series are exposedexactly as before — so this is a dead code removal rather than a metric surface
change.
Issue: CLDSRV-972