Skip to content

Seed zero-value metrics for empty buckets in count-items (1.17 backport) - #406

Merged
bert-e merged 2 commits into
development/1.17from
improvement/S3UTILS-224/preseed-empty-bucket-metrics-1.17
Jul 29, 2026
Merged

Seed zero-value metrics for empty buckets in count-items (1.17 backport)#406
bert-e merged 2 commits into
development/1.17from
improvement/S3UTILS-224/preseed-empty-bucket-metrics-1.17

Conversation

@delthas

@delthas delthas commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

Backport of the S3UTILS-224 / #378 fix to development/1.17, cherry-picked byte-for-byte from development/1 (deb030e) so the GitWaterFlow cascade through 1.18 and 1 auto-resolves — verified with git merge-tree: zero conflicts against both development/1.18 and development/1 for the fix commit.

count-items only produced metric documents for buckets that hold objects. An empty bucket yielded no document in __infostore, which makes Scuba's deep health check fail and disables the quota service cluster-wide (ARTESCA-17063), and leaves the Veeam SOSAPI capacity.xml stuck at Available=0 for empty repositories (RD-2109, reproduced at a customer on ARTESCA 4.2.2).

Seed zero-value bucket, account and location entries in getObjectMDStats() when a bucket scan yields no objects. The bucket key is derived from the __usersbucket creation date, exactly like populated buckets (S3UTILS-131), so the seeded document matches the key quota lookups use; if that date is missing the bucket is skipped with a warning rather than written under an unmatchable key.

Also bumps package.json to 1.17.14 — expect the usual cascade conflict on the version line at each higher development line.

Issue: S3UTILS-224

delthas added 2 commits July 29, 2026 10:44
count-items only produced metric documents for buckets that hold
objects. An empty bucket yielded no document in __infostore, which
makes Scuba's deep health check fail and disables the quota service
cluster-wide (ARTESCA-17063).

Seed zero-value bucket, account and location entries in
getObjectMDStats() when a bucket scan yields no objects. The bucket
key is derived from the __usersbucket creation date, exactly like
populated buckets (S3UTILS-131), so the seeded document matches the
key quota lookups use; if that date is missing the bucket is skipped
with a warning rather than written under an unmatchable key.

Issue: S3UTILS-224
(cherry picked from commit deb030e)
@bert-e

bert-e commented Jul 29, 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 TBA
/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 Jul 29, 2026
@bert-e

bert-e commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@delthas
delthas requested review from a team, SylvainSenechal, benzekrimaha and francoisferrand and removed request for francoisferrand July 29, 2026 08:59
@delthas

delthas commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@scality scality deleted a comment from bert-e Jul 29, 2026
@codecov

codecov Bot commented Jul 29, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 45.28%. Comparing base (db4b2d6) to head (c318e92).

Additional details and impacted files
@@                 Coverage Diff                  @@
##           development/1.17     #406      +/-   ##
====================================================
+ Coverage             45.03%   45.28%   +0.24%     
====================================================
  Files                    88       88              
  Lines                  6466     6486      +20     
  Branches               1355     1360       +5     
====================================================
+ Hits                   2912     2937      +25     
+ Misses                 3508     3503       -5     
  Partials                 46       46              

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@scality scality deleted a comment from bert-e Jul 29, 2026
@bert-e

bert-e commented Jul 29, 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

The following options are set: create_integration_branches

@delthas

delthas commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

/approve

@bert-e

bert-e commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/1.17

  • ✔️ development/1.18

  • ✔️ development/1

The following branches have NOT changed:

  • development/1.13
  • development/1.14
  • development/1.15
  • development/1.16
  • development/1.4
  • development/1.7

This pull request did not target the following hotfix branch(es) so they
were left untouched:

  • hotfix/1.14.0

Please check the status of the associated issue S3UTILS-224.

Goodbye delthas.

The following options are set: approve, create_integration_branches

@bert-e
bert-e merged commit c318e92 into development/1.17 Jul 29, 2026
15 checks passed
@bert-e
bert-e deleted the improvement/S3UTILS-224/preseed-empty-bucket-metrics-1.17 branch July 29, 2026 14:30
@delthas

delthas commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

/release

@delthas

delthas commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

Release summary:

  • development/1.17: releasing 1.17.14
  • development/1.18: releasing 1.18.1
  • development/1: releasing 1.19.1

@eve-ci-cd
eve-ci-cd Bot deployed to zenko/improvement/ZENKO-5334/release-2.15.5@2.15 July 30, 2026 09:29 Active
@eve-ci-cd
eve-ci-cd Bot deployed to zenko/development/2.15 July 31, 2026 12:54 Active
@eve-ci-cd
eve-ci-cd Bot deployed to zenko/2.15.5 July 31, 2026 12:56 Active
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