Enforce microVersionId conflicts at the metadata write level#6235
Open
maeldonn wants to merge 3 commits into
Open
Enforce microVersionId conflicts at the metadata write level#6235maeldonn wants to merge 3 commits into
maeldonn wants to merge 3 commits into
Conversation
Contributor
Hello maeldonn,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
Contributor
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
|
![claude[bot]](https://avatars.githubusercontent.com/in/1236702?s=60&v=4){kind=small}
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files
... and 2 files with indirect coverage changes @@ Coverage Diff @@
## development/9.4 #6235 +/- ##
===================================================
- Coverage 86.10% 86.08% -0.02%
===================================================
Files 212 212
Lines 14483 14490 +7
===================================================
+ Hits 12470 12474 +4
- Misses 2013 2016 +3
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
maeldonn
changed the title
The JS pre-checks in putMetadata are not atomic: two concurrent writes can both pass them and let a stale revision overwrite a newer one. Pass a conditional put to the metadata backend so the write itself rejects stale microVersionIds with PreconditionFailed, mapped to the same CRR conflict response as the pre-checks. Enabled only on backends advertising conditional put support (mongodb). Issue: CLDSRV-952
maeldonn
force-pushed
the
improvement/CLDSRV-952
branch
from
July 23, 2026 14:30
b85feb8 to
ff93206
Compare
maeldonn
marked this pull request as ready for review
July 23, 2026 14:30
| void (await endPromise); | ||
|
|
||
| sinon.assert.notCalled(putObjectMDStub); | ||
| assert.strictEqual(mockResponse.statusCode, 409); |
There was a problem hiding this comment.
Only asserting statusCode is 409 doesn't distinguish this from the StaleMicroVersionIdException 409 response. Assert the body code so a regression that returns the wrong 409 type fails the test.
Suggested change
| assert.strictEqual(mockResponse.statusCode, 409); | |
| assert.strictEqual(mockResponse.statusCode, 409); | |
| assert.strictEqual(mockResponse.body.code, 'MicroVersionIdAlreadyStoredException'); |
| routeBackbeat('127.0.0.1', mockRequest, mockResponse, log); | ||
| void (await endPromise); | ||
|
|
||
| assert.strictEqual(mockResponse.statusCode, 409); |
There was a problem hiding this comment.
Same here — assert the body code so this test doesn't pass if a different 409 path fires.
Suggested change
| assert.strictEqual(mockResponse.statusCode, 409); | |
| assert.strictEqual(mockResponse.statusCode, 409); | |
| assert.strictEqual(mockResponse.body.code, 'StaleMicroVersionIdException'); |
benzekrimaha
requested changes
Jul 24, 2026
| "@opentelemetry/instrumentation-mongodb": "~0.69.0", | ||
| "@smithy/node-http-handler": "^3.0.0", | ||
| "arsenal": "git+https://github.com/scality/arsenal#8.5.6", | ||
| "arsenal": "git+https://github.com/scality/arsenal#fa9abec316dc0a48b9511eec5b41f7b9a626d5f4", |
Contributor
There was a problem hiding this comment.
reminder to point to the released arsenal tag containing ARSN-619 before merging (/after_pull_request on scality/Arsenal#2678 if needed).
|
|
||
| // atomic counterpart of the pre-checks above ($gt cannot match a missing microVersionId) | ||
| if (incomingMicroVersionId !== null && objMd?.microVersionId && metadata.supportsConditionalPutObjectMD?.()) { | ||
| options.conditions = { microVersionId: { $gt: incomingMicroVersionId } }; |
Contributor
There was a problem hiding this comment.
could the condition also cover the missing-field case, e.g. $or: [{ microVersionId: { $exists: false } }, { microVersionId: { $gt: … } }]? otherwise this window stays unprotected , if translateConditions cannot express it, worth mentionning in the comment.
Contributor
ConflictThere is a conflict between your branch Please resolve the conflict on the feature branch ( git fetch && \
git checkout origin/improvement/CLDSRV-952 && \
git merge origin/development/9.4Resolve merge conflicts and commit git push origin HEAD:improvement/CLDSRV-952 |
benzekrimaha
self-requested a review
July 24, 2026 15:36
benzekrimaha
approved these changes
Jul 24, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The JS pre-checks in putMetadata are not atomic: two concurrent CRR writes can
both pass them and let a stale revision overwrite a newer one. This attaches a
conditional put ($gt on microVersionId) so the write itself rejects stale
revisions with PreconditionFailed, mapped to the same conflict response as the
pre-checks. Enabled only on backends supporting conditional puts (mongodb).
Issue: CLDSRV-952