Skip to content

Register quota metrics unconditionally - #6253

Open
delthas wants to merge 2 commits into
development/9.4from
improvement/CLDSRV-972/call-isquotaenabled
Open

Register quota metrics unconditionally#6253
delthas wants to merge 2 commits into
development/9.4from
improvement/CLDSRV-972/call-isquotaenabled

Conversation

@delthas

@delthas delthas commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Stacked on #6252 — review that one first. This PR's diff is only the last two
commits; retarget to development/9.4 once #6252 merges.

Both quota gates in lib/utilities/monitoringHandler.js tested
config.isQuotaEnabled — the function reference rather than a call — so both
were 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: crrCacheToProm reached bucketsWithQuota unguarded, and
the scuba wrapper observes its histogram in a finally block, on a path the
Veeam capacity route reaches 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 rather than a metric surface
change.

Issue: CLDSRV-972

@codecov

codecov Bot commented Aug 12, 2026

Copy link
Copy Markdown

❌ 10 Tests Failed:

Tests completed Failed Passed Skipped
9865 10 9855 0
View the full list of 11 ❄️ flaky test(s)
"after each" hook for "should batch delete 1000 objects"::Multi-Object Delete Success "after each" hook for "should batch delete 1000 objects"

Flake rate in main: 100.00% (Passed 0 times, Failed 7 times)

Stack Traces | 1.64s run time
The bucket you tried to delete is not empty.
"before each" hook for "should batch delete 1000 objects"::Multi-Object Delete Success "before each" hook for "should batch delete 1000 objects"

Flake rate in main: 100.00% (Passed 0 times, Failed 7 times)

Stack Traces | 5.79s run time
Socket timed out without establishing a connection within 5000 ms
"before each" hook for "should grant read access"::With default signature PUT Bucket ACL using predefined groups - authenticated request "before each" hook for "should grant read access"

Flake rate in main: 100.00% (Passed 0 times, Failed 10 times)

Stack Traces | 0.144s run time
We encountered an internal error. Please try again.
"before each" hook for "should grant read access"::With default signature PUT Bucket ACL using predefined groups - unauthenticated request "before each" hook for "should grant read access"

Flake rate in main: 100.00% (Passed 0 times, Failed 10 times)

Stack Traces | 0.172s run time
We encountered an internal error. Please try again.
"before each" hook for "should grant read access"::With default signature PUT Object ACL using predefined groups - authenticated request "before each" hook for "should grant read access"

Flake rate in main: 100.00% (Passed 0 times, Failed 10 times)

Stack Traces | 0.036s run time
We encountered an internal error. Please try again.
"before each" hook for "should grant read access"::With default signature PUT Object ACL using predefined groups - unauthenticated request "before each" hook for "should grant read access"

Flake rate in main: 100.00% (Passed 0 times, Failed 10 times)

Stack Traces | 0.252s run time
We encountered an internal error. Please try again.
"before each" hook for "should grant read access"::With v4 signature PUT Bucket ACL using predefined groups - authenticated request "before each" hook for "should grant read access"

Flake rate in main: 100.00% (Passed 0 times, Failed 10 times)

Stack Traces | 0.125s run time
We encountered an internal error. Please try again.
"before each" hook for "should grant read access"::With v4 signature PUT Bucket ACL using predefined groups - unauthenticated request "before each" hook for "should grant read access"

Flake rate in main: 100.00% (Passed 0 times, Failed 10 times)

Stack Traces | 0.066s run time
We encountered an internal error. Please try again.
"before each" hook for "should grant read access"::With v4 signature PUT Object ACL using predefined groups - authenticated request "before each" hook for "should grant read access"

Flake rate in main: 100.00% (Passed 0 times, Failed 10 times)

Stack Traces | 0.042s run time
We encountered an internal error. Please try again.
"before each" hook for "should grant read access"::With v4 signature PUT Object ACL using predefined groups - unauthenticated request "before each" hook for "should grant read access"

Flake rate in main: 100.00% (Passed 0 times, Failed 10 times)

Stack Traces | 0.035s run time
We encountered an internal error. Please try again.
should allow action on an object specified in the policy::With default signature Bucket policies with resource statement should allow action on an object specified in the policy

Flake rate in main: 13.81% (Passed 668 times, Failed 107 times)

Stack Traces | 40s run time
Timeout of 40000ms exceeded. For async tests and hooks, ensure "done()" is called; if returning a Promise, ensure it resolves. (.../test/bucket/bucketPolicyWithResourceStatements.js)

To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.

@delthas
delthas marked this pull request as ready for review August 12, 2026 14:09
@delthas
delthas requested review from a team, SylvainSenechal and benzekrimaha August 12, 2026 14:09
Comment thread lib/utilities/monitoringHandler.js Outdated
@delthas
delthas force-pushed the improvement/CLDSRV-972/call-isquotaenabled branch from b448fe5 to d580a11 Compare August 12, 2026 15:33
@delthas
delthas requested review from francoisferrand and removed request for benzekrimaha August 13, 2026 07:49
@delthas

delthas commented Aug 13, 2026

Copy link
Copy Markdown
Contributor Author

Requested @francoisferrand in place of Maha Benzekri, who is currently on PTO.

@delthas
delthas force-pushed the improvement/CLDSRV-972/call-isquotaenabled branch from d580a11 to fcefd5a Compare August 13, 2026 08:10
Base automatically changed from improvement/CLDSRV-971/quota-metrics-retrieval-code-label to development/9.4 August 13, 2026 08:39
@bert-e

bert-e commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

Hello delthas,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request.
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@scality scality deleted a comment from bert-e Aug 13, 2026
@bert-e

bert-e commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@francoisferrand francoisferrand left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment thread lib/utilities/monitoringHandler.js Outdated
Comment thread lib/utilities/monitoringHandler.js Outdated
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
@delthas delthas changed the title Call config.isQuotaEnabled instead of testing the reference Register quota metrics unconditionally Aug 14, 2026
@delthas
delthas force-pushed the improvement/CLDSRV-972/call-isquotaenabled branch from fcefd5a to 33f77af Compare August 14, 2026 15:32
Comment thread tests/unit/utils/monitoring.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants