Skip to content

CLDSRV-960: backbeat checksum cleanup - #6241

Merged
bert-e merged 4 commits into
development/9.4from
improvement/CLDSRV-960-backbeat-checksum-cleanup
Aug 4, 2026
Merged

CLDSRV-960: backbeat checksum cleanup#6241
bert-e merged 4 commits into
development/9.4from
improvement/CLDSRV-960-backbeat-checksum-cleanup

Conversation

@leif-scality

Copy link
Copy Markdown
Contributor
  • Accept no checksum in prepareStream
  • Don't handle x-amz-checksum- headers in backbeat routes
  • Add checksum replication tests

@bert-e

bert-e commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Hello leif-scality,

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

bert-e commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Incorrect fix version

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

  • None

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

  • 9.4.0

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

@codecov

codecov Bot commented Jul 30, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 93.47826% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.17%. Comparing base (3e6bac1) to head (a840367).
⚠️ Report is 4 commits behind head on development/9.4.
✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
lib/routes/routeBackbeat.js 62.50% 3 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

Files with missing lines Coverage Δ
lib/api/apiUtils/object/prepareStream.js 100.00% <100.00%> (ø)
lib/api/apiUtils/object/storeObject.js 97.36% <100.00%> (+0.07%) ⬆️
lib/routes/veeam/utils.js 98.19% <ø> (ø)
lib/routes/routeBackbeat.js 78.38% <62.50%> (-0.37%) ⬇️

... and 2 files with indirect coverage changes

@@                 Coverage Diff                 @@
##           development/9.4    #6241      +/-   ##
===================================================
- Coverage            86.23%   86.17%   -0.06%     
===================================================
  Files                  212      212              
  Lines                14536    14519      -17     
===================================================
- Hits                 12535    12512      -23     
- Misses                2001     2007       +6     
Flag Coverage Δ
file-ft-tests 70.00% <78.26%> (-0.01%) ⬇️
file-ft-tests-null-compat 70.48% <78.26%> (-0.01%) ⬇️
kmip-ft-tests 28.05% <50.00%> (+0.09%) ⬆️
mongo-v0-ft-tests 71.08% <78.26%> (-0.07%) ⬇️
mongo-v1-ft-tests 71.08% <78.26%> (-0.09%) ⬇️
multiple-backend 36.09% <60.86%> (-0.05%) ⬇️
s3c-ft-tests-v0 65.08% <71.73%> (+0.03%) ⬆️
s3c-ft-tests-v0-null-compat 65.15% <73.91%> (+0.04%) ⬆️
s3c-ft-tests-v1 65.10% <71.73%> (+0.06%) ⬆️
sur-tests 37.33% <63.04%> (+0.90%) ⬆️
sur-tests-inflights 39.23% <63.04%> (+0.08%) ⬆️
unit 73.63% <82.60%> (+0.01%) ⬆️
utapi-v2-tests 35.21% <52.17%> (+0.08%) ⬆️

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.

@leif-scality
leif-scality force-pushed the improvement/CLDSRV-960-backbeat-checksum-cleanup branch from 518ba53 to 67df9dd Compare July 30, 2026 11:58
Comment thread lib/api/apiUtils/object/prepareStream.js
});
return callback(err);
}
if (contentMD5 !== md5) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Unrelated to this PR, but I noticed it.
In this case, we return BadDigest, but the storeObject has already succeeded.
Doesn't that leave an orphan?
(same in putObject)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

* @return {{ error: Arsenal.Error|null, stream: stream.Readable|null,
* primaryChecksumStream: ChecksumTransform|null,
* secondaryChecksumStream: ChecksumTransform|null,
* contentSHA256Stream: ContentSHA256Transform|null }}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

In some cases we return undefined instead of null for contentSHA256Stream.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

fixed

@leif-scality
leif-scality force-pushed the improvement/CLDSRV-960-backbeat-checksum-cleanup branch from 67df9dd to 435411f Compare August 3, 2026 12:56
);
secondaryChecksumStream.on('error', onStreamError);
stream = v4Transform.pipe(secondaryChecksumStream);
const secondaryChecksumStream = createChecksumStream(secondary, onStreamError, log);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's clearer now than it used to be which is cool, but we seem to have a repeated pattern to create primary and/or secondary checksums and return them (without the trailer), maybe worth another helper that complements createChecksumStream to do that?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

created helper

* digest/algoName properties, or null if no checksum was computed
* @param {object} log - request logger instance
* @param {function} cb - callback to send error or move to next task
* @return {function} - calls callback with arguments:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Seems we are missing the checksum argument description in the return value

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

added

const result = prepareStream(request, null, null, log, () => {});
assert.strictEqual(result.error, null);
assert.strictEqual(result.stream, request);
assert.strictEqual(result.primaryChecksumStream, null);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nit: this test doesn't check the secondary and SHA256 streams nullity

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

fixed

@leif-scality
leif-scality force-pushed the improvement/CLDSRV-960-backbeat-checksum-cleanup branch from 435411f to 153e2fb Compare August 4, 2026 14:43
@leif-scality

Copy link
Copy Markdown
Contributor Author

ping

@bert-e

bert-e commented Aug 4, 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

@leif-scality

Copy link
Copy Markdown
Contributor Author

/approve

@bert-e

bert-e commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

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

  • ✔️ 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
  • development/9.3

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

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

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

Goodbye leif-scality.

The following options are set: approve

@bert-e
bert-e merged commit a840367 into development/9.4 Aug 4, 2026
37 checks passed
@bert-e
bert-e deleted the improvement/CLDSRV-960-backbeat-checksum-cleanup branch August 4, 2026 15:41
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