Skip to content

Conversation

SylvainSenechal
Copy link
Contributor

ISSUE : S3UTILS-203

@bert-e
Copy link
Contributor

bert-e commented Sep 1, 2025

Hello sylvainsenechal,

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.

Copy link
Contributor

@francoisferrand francoisferrand left a comment

Choose a reason for hiding this comment

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

same comments as https://github.com/scality/s3utils/pull/349/files#r2333101487, looks so very similar.... Maybe we should create a ticket to clean this up and deduplicate the redundancy (maybe some sort of common processBucket function, which calls it's parameter to "act" on matching object)

const bodyContent = Buffer.from(args.request.body);
const md5Hash = crypto.createHash('md5').update(bodyContent).digest('base64');
// eslint-disable-next-line no-param-reassign
args.request.headers['Content-MD5'] = md5Hash;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

"name":"BadDigest" error without this stuff

Copy link
Contributor

@francoisferrand francoisferrand Sep 29, 2025

Choose a reason for hiding this comment

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

is this not the "known issue" about content-md5, on which @leif-scality worked and which @benzekrimaha further worked when bumping SDK in cloudserver?

do we have a better/simpler/... fix there?

Choose a reason for hiding this comment

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

DeleteObjects, PutBucketCors and all the other /lib/api routes don't require an MD5 checksum since b10a2d6eeb20118af0a8975ce471b8d438214641.

Note: some backbeat routes may require an MD5 sum today.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, doubled checked with Leif and Maha and tried on cloudserver local, no badDigest after I pulled the latest branch, I'll remove this

@scality scality deleted a comment from bert-e Sep 22, 2025
@bert-e
Copy link
Contributor

bert-e commented Sep 22, 2025

Waiting for approval

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

  • the author

  • 2 peers

Comment on lines 297 to 298
))
.then(res => next(null, res.ReplicationConfiguration))
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
))
.then(res => next(null, res.ReplicationConfiguration))
)).then(res => next(null, res.ReplicationConfiguration))

try {
await Promise.all([
cleanupVersions(bucket),
// abortAllMultipartUploads(bucket),
Copy link
Contributor

Choose a reason for hiding this comment

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

can be fully removed, or please add a comment to explain why it's commented

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My bad, it's needed, I commented for a test this afternoon and forgot to remove it..

const { http, https } = require('httpagent');
const async = require('async');
const AWS = require('aws-sdk');
const crypto = require('crypto');
Copy link
Contributor

Choose a reason for hiding this comment

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

The module doesn't seem to be used, we can remove it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I really messed up this afternoon, removed something that became useless and forgot to cleanup some stuffs -_-

function _deleteVersions(bucket, objectsToDelete, cb) {
// multi object delete can delete max 1000 objects
async function _deleteVersions(bucket, objectsToDelete) {
if (!objectsToDelete || objectsToDelete.length === 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a bit redundant with the check already in cleanupVersions? I think we should be able to merge them

@SylvainSenechal
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Sep 30, 2025

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

  • ✔️ development/1.16

The following branches have NOT changed:

  • development/1.13
  • development/1.14
  • development/1.15
  • development/1.4

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

Goodbye sylvainsenechal.

The following options are set: approve

@bert-e bert-e merged commit eeb784a into development/1.16 Sep 30, 2025
10 checks passed
@bert-e bert-e deleted the improvement/S3UTILS-203 branch September 30, 2025 08:15
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.

5 participants