Skip to content

Fix AbortMPU conditional deletion of wrong data#5849

Merged
bert-e merged 2 commits intodevelopment/8.8from
bugfix/CLDSRV-668
Jun 26, 2025
Merged

Fix AbortMPU conditional deletion of wrong data#5849
bert-e merged 2 commits intodevelopment/8.8from
bugfix/CLDSRV-668

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Jun 26, 2025

Issue and context in: CLDSRV-668

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 26, 2025

Hello williamlardier,

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
Copy Markdown
Contributor

bert-e commented Jun 26, 2025

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.

@codecov
Copy link
Copy Markdown

codecov bot commented Jun 26, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.08%. Comparing base (71f35c8) to head (c47dff0).
Report is 2 commits behind head on development/8.8.

✅ All tests successful. No failed tests found.

Additional details and impacted files

Impacted file tree graph

Files with missing lines Coverage Δ
lib/api/apiUtils/object/abortMultipartUpload.js 84.81% <100.00%> (ø)
@@               Coverage Diff                @@
##           development/8.8    #5849   +/-   ##
================================================
  Coverage            65.08%   65.08%           
================================================
  Files                  188      188           
  Lines                11948    11948           
================================================
  Hits                  7776     7776           
  Misses                4172     4172           
Flag Coverage Δ
unit 65.08% <100.00%> (ø)

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.

Add functional tests to cover scenarios where aborting an MPU
could delete data from a different, completed MPU with the
same object key.

This prevents a regression of a bug where the wrong data was
deleted because the uploadId was not being checked when
looking for object metadata to clean up during an abort.

Issue: CLDSRV-668
@ghost ghost force-pushed the bugfix/CLDSRV-668 branch from 2810699 to c47dff0 Compare June 26, 2025 12:38
@ghost ghost requested review from benzekrimaha and welansari June 26, 2025 12:56
@ghost ghost marked this pull request as ready for review June 26, 2025 12:56
@ghost ghost requested a review from francoisferrand June 26, 2025 12:56
@ghost
Copy link
Copy Markdown
Author

ghost commented Jun 26, 2025

/create_integration_branches

@ghost ghost deleted a comment from bert-e Jun 26, 2025
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 26, 2025

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

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
Copy link
Copy Markdown
Contributor

bert-e commented Jun 26, 2025

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

@ghost
Copy link
Copy Markdown
Author

ghost commented Jun 26, 2025

/approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 26, 2025

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

  • ✔️ development/8.8

  • ✔️ development/9.0

  • ✔️ development/9.1

The following branches have NOT changed:

  • development/7.10
  • development/7.4
  • development/7.70

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

Goodbye williamlardier.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit c47dff0 into development/8.8 Jun 26, 2025
25 checks passed
@bert-e bert-e deleted the bugfix/CLDSRV-668 branch June 26, 2025 13:18
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