Skip to content

CLDSRV-835: Fix flaky cleanup and teardown s3C related tests#6109

Merged
bert-e merged 4 commits intodevelopment/9.3from
bugfix/CLDSRV-835-s3c-teardown
Mar 18, 2026
Merged

CLDSRV-835: Fix flaky cleanup and teardown s3C related tests#6109
bert-e merged 4 commits intodevelopment/9.3from
bugfix/CLDSRV-835-s3c-teardown

Conversation

@BourgoisMickael
Copy link
Contributor

@BourgoisMickael BourgoisMickael commented Mar 16, 2026

  • Fix provideRawOutput in async test and normalize utilization
  • Improve bucket empty function

Fix concurrence with cleanup triggering 404 instead of 200
because the function was not awaited and triggered the afterEach immediately
To avoid cascading issues between describe and avoid BucketAlreadyExists
@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2026

Hello bourgoismickael,

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.

@bert-e
Copy link
Contributor

bert-e commented Mar 16, 2026

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.

provideRawOutput[util.promisify.custom] = args =>
new Promise(resolve =>
provideRawOutput(args, (httpCode, rawOutput) => resolve({ httpCode, rawOutput }))
);
Copy link

Choose a reason for hiding this comment

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

The provideRawOutput callback has a non-standard signature (httpCode, rawOutput) — no err first argument. The custom promisify implementation correctly handles this by always resolving (never rejecting). However, if curl crashes or the child process errors, the promise resolves with httpCode as undefined rather than rejecting. Consider adding a rejection path for unexpected failures, or at minimum a short comment explaining the always-resolves design choice.

— Claude Code

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was like that before, it will be the assert on httpCode that will fail

@claude
Copy link

claude bot commented Mar 16, 2026

LGTM — solid cleanup that fixes flaky teardown by switching to batched DeleteObjectsCommand with pagination and modernizing callback-based tests to async/await.

- Minor nit: the custom promisify for provideRawOutput always resolves (never rejects), which could silently swallow unexpected curl failures. Consider adding a comment or a rejection path.

Review by Claude Code

@codecov
Copy link

codecov bot commented Mar 16, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 84.24%. Comparing base (1ff2d99) to head (3a5f77a).
⚠️ Report is 20 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    #6109      +/-   ##
===================================================
- Coverage            84.25%   84.24%   -0.01%     
===================================================
  Files                  206      206              
  Lines                13251    13251              
===================================================
- Hits                 11164    11163       -1     
- Misses                2087     2088       +1     
Flag Coverage Δ
file-ft-tests 67.91% <ø> (ø)
kmip-ft-tests 28.08% <ø> (ø)
mongo-v0-ft-tests 69.09% <ø> (-0.03%) ⬇️
mongo-v1-ft-tests 69.20% <ø> (-0.04%) ⬇️
multiple-backend 36.30% <ø> (+1.19%) ⬆️
sur-tests 35.63% <ø> (-0.84%) ⬇️
sur-tests-inflights 37.49% <ø> (ø)
unit 69.90% <ø> (ø)
utapi-v2-tests 34.36% <ø> (ø)

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.

No need to separate trailing slash keys.
Use multi object delete instead of parallel single delete
List all pagination

Keep a fall back to individual deletes action
for sse kms migration tests that use an older cloudserver version
before migration
@BourgoisMickael BourgoisMickael force-pushed the bugfix/CLDSRV-835-s3c-teardown branch from 08e7b1b to 3a5f77a Compare March 16, 2026 14:08
@claude
Copy link

claude bot commented Mar 16, 2026

LGTM

Review by Claude Code

@BourgoisMickael BourgoisMickael requested review from a team, fredmnl, jonathan-gramain and leif-scality and removed request for a team March 17, 2026 15:58
@BourgoisMickael
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Mar 18, 2026

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: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 18, 2026

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

  • ✔️ development/9.3

  • ✔️ development/9.4

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-835.

Goodbye bourgoismickael.

@bert-e bert-e merged commit 603e27a into development/9.3 Mar 18, 2026
51 of 52 checks passed
@bert-e bert-e deleted the bugfix/CLDSRV-835-s3c-teardown branch March 18, 2026 15:24
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