Skip to content

CLDSRV-961 Fix lifecycle listings stuck on PHD master keys - #6310

Merged
bert-e merged 3 commits into
development/9.3from
bugfix/CLDSRV-961/phd-hf
Sep 24, 2026
Merged

bert-e merged 3 commits into
development/9.3from
bugfix/CLDSRV-961/phd-hf

Conversation

@nicolas2bert

Copy link
Copy Markdown
Contributor

Pin arsenal to 8.4.26 (8.5.17 on 9.4), which fixes lifecycle listings (DelimiterNonCurrent,
DelimiterOrphanDeleteMarker) getting stuck forever on a run of dangling PHD
master keys longer than the scan cap. bucketd runs the actual lifecycle
listing, not cloudserver, so also repin the MetaData image to the released
ghcr.io/scality/metadata:9.17.0-standalone tag (MD-1359): the s3c legs need
the fix there too, not only in the pinned arsenal.

Add a functional suite proving the real stack -- an actual metadata backend
that writes PHD masters and races a repair timer, through the real backbeat
route -- makes forward progress across such a desert. The listing algorithm
itself is exhaustively unit-tested in Arsenal against both v0 and v1
(scality/Arsenal#2685); this suite intentionally does not re-derive those
cases and stays scoped to end-to-end wiring.

(cherry picked from commit d14b326)

Pin arsenal to 8.4.26 (8.5.17 on 9.4), which fixes lifecycle listings (DelimiterNonCurrent,
DelimiterOrphanDeleteMarker) getting stuck forever on a run of dangling PHD
master keys longer than the scan cap. bucketd runs the actual lifecycle
listing, not cloudserver, so also repin the MetaData image to the released
ghcr.io/scality/metadata:9.17.0-standalone tag (MD-1359): the s3c legs need
the fix there too, not only in the pinned arsenal.

Add a functional suite proving the real stack -- an actual metadata backend
that writes PHD masters and races a repair timer, through the real backbeat
route -- makes forward progress across such a desert. The listing algorithm
itself is exhaustively unit-tested in Arsenal against both v0 and v1
(scality/Arsenal#2685); this suite intentionally does not re-derive those
cases and stays scoped to end-to-end wiring.

(cherry picked from commit d14b326)
@bert-e

bert-e commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

Hello nicolas2bert,

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 ⭐
/bypass_source_branch_lineage Bypass the cross-branch contamination check ⭐
/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.

@bert-e

bert-e commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

Incorrect fix version

The Fix Version/s in issue CLDSRV-961 contains:

  • 9.4.4

  • 9.5.0

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 9.3.21

  • 9.4.4

  • 9.5.0

Please check the Fix Version/s of CLDSRV-961, or the target
branch of this pull request.

@bert-e

bert-e commented Sep 24, 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.

@nicolas2bert

Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@bert-e

bert-e commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/9.4/bugfix/CLDSRV-961/phd-hf with contents from bugfix/CLDSRV-961/phd-hf
and development/9.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/9.4/bugfix/CLDSRV-961/phd-hf origin/development/9.4
 git merge origin/bugfix/CLDSRV-961/phd-hf
 # <intense conflict resolution>
 git commit
 git push -u origin w/9.4/bugfix/CLDSRV-961/phd-hf

The following options are set: create_integration_branches

@bert-e

bert-e commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.8
  • development/9.0
  • development/9.1
  • development/9.2

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

@bert-e

bert-e commented Sep 24, 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

@nicolas2bert

Copy link
Copy Markdown
Contributor Author

@bert-e approve

@bert-e

bert-e commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

Build failed

The build for commit did not succeed in branch bugfix/CLDSRV-961/phd-hf

The following options are set: approve, create_integration_branches

@codecov

codecov Bot commented Sep 24, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 85.28%. Comparing base (7904b09) to head (3149195).
⚠️ Report is 2 commits behind head on development/9.3.
✅ All tests successful. No failed tests found.

Additional details and impacted files

Impacted file tree graph
see 1 file with indirect coverage changes

@@                 Coverage Diff                 @@
##           development/9.3    #6310      +/-   ##
===================================================
- Coverage            85.32%   85.28%   -0.04%     
===================================================
  Files                  206      206              
  Lines                13435    13435              
===================================================
- Hits                 11463    11458       -5     
- Misses                1972     1977       +5     
Flag Coverage Δ
file-ft-tests 68.40% <ø> (+0.03%) ⬆️
file-ft-tests-null-compat 68.86% <ø> (-0.06%) ⬇️
kmip-ft-tests 28.35% <ø> (ø)
mongo-v0-ft-tests 69.57% <ø> (-0.06%) ⬇️
mongo-v1-ft-tests 69.54% <ø> (-0.07%) ⬇️
multiple-backend 36.82% <ø> (ø)
s3c-ft-tests-v0 64.00% <ø> (-0.04%) ⬇️
s3c-ft-tests-v0-null-compat 64.06% <ø> (ø)
s3c-ft-tests-v1 63.98% <ø> (ø)
sur-tests 36.79% <ø> (ø)
sur-tests-inflights 37.83% <ø> (ø)
unit 71.27% <ø> (ø)
utapi-v2-tests 34.61% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@bert-e

bert-e commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

Build failed

The build for commit did not succeed in branch w/9.4/bugfix/CLDSRV-961/phd-hf

The following options are set: approve, create_integration_branches

@bert-e

bert-e commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/9.3

  • ✔️ development/9.4

  • ✔️ development/9.5

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.8
  • development/9.0
  • development/9.1
  • development/9.2

This pull request does not target the following hotfix branch(es) so they
will be left untouched:

  • hotfix/7.4.6
  • hotfix/9.0.7
  • hotfix/7.7.0
  • hotfix/7.10.15
  • hotfix/7.6.0
  • hotfix/7.70.45
  • hotfix/7.70.73
  • hotfix/7.4.4
  • hotfix/7.10.2
  • hotfix/7.4.10
  • hotfix/7.10.49
  • hotfix/7.10.8
  • hotfix/7.4.9
  • hotfix/7.8.0
  • hotfix/7.70.11
  • hotfix/8.8.45
  • hotfix/9.2.24
  • hotfix/7.4.2
  • hotfix/9.2.36
  • hotfix/7.10.28
  • hotfix/7.10.3
  • hotfix/7.4.8
  • hotfix/7.2.0
  • hotfix/7.4.0
  • hotfix/7.10.27
  • hotfix/7.10.30
  • hotfix/7.4.5
  • hotfix/7.70.51
  • hotfix/7.70.21
  • hotfix/9.3.13
  • hotfix/7.4.1
  • hotfix/6.4.7
  • hotfix/7.4.3
  • hotfix/7.4.7
  • hotfix/7.10.4
  • hotfix/7.10.0
  • hotfix/7.9.0
  • hotfix/7.10.1
  • hotfix/9.0.32

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve, create_integration_branches

@bert-e

bert-e commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

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

  • ✔️ development/9.3

  • ✔️ development/9.4

  • ✔️ development/9.5

The following branches have NOT changed:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.8
  • development/9.0
  • development/9.1
  • development/9.2

Please check the status of the associated issue CLDSRV-961.

Goodbye nicolas2bert.

@bert-e
bert-e merged commit 03ccd96 into development/9.3 Sep 24, 2026
37 checks passed
@bert-e
bert-e deleted the bugfix/CLDSRV-961/phd-hf branch September 24, 2026 20:13
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