Skip to content

Server side encryption migrations should not be reported as an object… - #6292

Merged
bert-e merged 2 commits into
development/9.4from
bugfix/CLDSRV-990
Sep 21, 2026
Merged

bert-e merged 2 commits into
development/9.4from
bugfix/CLDSRV-990

Conversation

@SylvainSenechal

@SylvainSenechal SylvainSenechal commented Sep 14, 2026

Copy link
Copy Markdown
Contributor

Issue: CLDSRV-990

Taking a look at the ticket :
We have this updateObjectEncryption function setting
objMD.originOp = 's3:ObjectCreated:Copy';
all the time which is indeed problematic as it sends bucket notifications (although this is debatable, sending a notif is not exactly a P0..), and also can trigger transition (which is more problematic and the reason why this ticket was created scality/backbeat#2830 (comment))

But, upon looking, the function is called from 5 paths :

  • objectPut

  • objectCopy

  • initMpu

  • objectGet

  • objectHead

The first 3 are writes, which calls updateEncryption with a flag, so that the originOp rewrite path is not even exercised at all (because these 3 writes will have their own logic to set origin op)

Only the 2 reads get/head can make a call that would wrongly set originOp to copy. But even then, this only happens in the even of a sse migration.

So I'm making a change on the originOp to use something that will not trigger bucket notif/transition

2 remarks :

  • Could consider sending this pr on a lower cloudserver version
  • updateEncryption is not tested at all, neither for this particular fix, or for anytging else at all, I could maybe add a test, didnt do it its too easy to create 500 lines of ai test crap

@bert-e

bert-e commented Sep 14, 2026

Copy link
Copy Markdown
Contributor

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
/bypass_source_branch_lineage Bypass the cross-branch contamination check
/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.
/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.

@codecov

codecov Bot commented Sep 14, 2026

Copy link
Copy Markdown

❌ 1 Tests Failed:

Tests completed Failed Passed Skipped
9909 1 9908 0
View the full list of 1 ❄️ flaky test(s)
"before each" hook for "should retrieve a part copied from an MPU after the original part was overwritten"::GET object With default signature With PartNumber field uploadPartCopy overwrite "before each" hook for "should retrieve a part copied from an MPU after the original part was overwritten"

Flake rate in main: 100.00% (Passed 0 times, Failed 33 times)

Stack Traces | 31.7s run time
Connection timed out after 30000 ms

To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.

Comment thread lib/api/apiUtils/bucket/updateEncryption.js Outdated
@scality scality deleted a comment from bert-e Sep 14, 2026
@bert-e

bert-e commented Sep 14, 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

@SylvainSenechal
SylvainSenechal marked this pull request as ready for review September 14, 2026 14:46
@SylvainSenechal
SylvainSenechal requested review from a team, BourgoisMickael, DarkIsDude and delthas and removed request for DarkIsDude September 14, 2026 14:47
// oplog driven logic (CRR, bucket notifications).
// eslint-disable-next-line no-param-reassign
objMD.originOp = 's3:ObjectCreated:Copy';
// Copy should be tested for 9.5 in INTGR-1038

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.

@BourgoisMickael On this old ticket : https://scality.atlassian.net/browse/INTGR-1038

you wrote a comment "It will trigger new bucket notification, but it will not trigger a replication for CRR"

With this change, it will not trigger bucket notif anymore. But I think you have integration tests that may expect it, so I'm letting you know you may have to update your tests

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.

I did that to follow the AWS way of updating the encryption: you do a copy of the object on itself while changing the encryption in metadata.

This is an internal operation but follows the way a user would do.

I can't find that actionUpdateObjectEncryption in the bucket notification documentation.

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.

Well that's the point 🤔 actionUpdateObjectEncryption is not in the list of notifications, so it wont trigger a notif unlike the existing ObjectCreated

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.

I though we wanted to actually receive a notification (even if it's internal change) as the metadata changes.

Is it how it's done in AWS as well ?

Otherwise I'm fine with it. Should this fix ship in development/9.4 ?

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.

Im gonna put it on 9.4

I don't know about AWS, but I guess there is no concept of "sse migration" in aws

@SylvainSenechal
SylvainSenechal requested review from benzekrimaha and removed request for delthas September 14, 2026 14:50
@SylvainSenechal

Copy link
Copy Markdown
Contributor Author

Adding Maha as you kinda created the ticket from the discussion on the bb pr, and Mickael which may be affected on the Ring tests

@SylvainSenechal
SylvainSenechal changed the base branch from development/9.5 to development/9.4 September 21, 2026 08:24
@scality scality deleted a comment from bert-e Sep 21, 2026
@bert-e

bert-e commented Sep 21, 2026

Copy link
Copy Markdown
Contributor

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.

@scality scality deleted a comment from bert-e Sep 21, 2026
dataLocator.masterKeyId = `${keyArnPrefix}${dataLocator.masterKeyId}`;
}
}
// Reformating the key arn is not an operation that should trigger any

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Typo: "Reformating" → "Reformatting" (double t).

Suggested change
// Reformating the key arn is not an operation that should trigger any
// Reformatting the key arn is not an operation that should trigger any

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.

Spot it faster next time its at least the third time that I push and I just approved and created the waterfall branch -_-

@SylvainSenechal

Copy link
Copy Markdown
Contributor Author

/approve

@bert-e

bert-e commented Sep 21, 2026

Copy link
Copy Markdown
Contributor

Integration data created

I have created the integration data for the additional destination branches.

  • this pull request will merge bugfix/CLDSRV-990 into
    development/9.4
  • w/9.5/bugfix/CLDSRV-990 will be merged into development/9.5

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

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

bert-e commented Sep 21, 2026

Copy link
Copy Markdown
Contributor

Build failed

The build for commit did not succeed in branch bugfix/CLDSRV-990

The following options are set: approve

@bert-e

bert-e commented Sep 21, 2026

Copy link
Copy Markdown
Contributor

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

  • ✔️ development/9.4

  • ✔️ development/9.5

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.6
  • hotfix/9.0.7
  • hotfix/7.7.0
  • hotfix/7.10.15
  • hotfix/7.6.0
  • hotfix/7.70.45
  • hotfix/7.70.73
  • hotfix/7.4.4
  • hotfix/7.10.2
  • hotfix/7.4.10
  • hotfix/7.10.49
  • hotfix/7.10.8
  • hotfix/7.4.9
  • hotfix/7.8.0
  • hotfix/7.70.11
  • hotfix/8.8.45
  • hotfix/9.2.24
  • hotfix/7.4.2
  • hotfix/9.2.36
  • hotfix/7.10.28
  • hotfix/7.10.3
  • hotfix/7.4.8
  • hotfix/7.2.0
  • hotfix/7.4.0
  • hotfix/7.10.27
  • hotfix/7.10.30
  • hotfix/7.4.5
  • hotfix/7.70.51
  • hotfix/7.70.21
  • hotfix/9.3.13
  • hotfix/7.4.1
  • hotfix/6.4.7
  • hotfix/7.4.3
  • hotfix/7.4.7
  • hotfix/7.10.4
  • hotfix/7.10.0
  • hotfix/7.9.0
  • hotfix/7.10.1
  • hotfix/9.0.32

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

Goodbye sylvainsenechal.

The following options are set: approve

@bert-e
bert-e merged commit 1bf89fa into development/9.4 Sep 21, 2026
58 of 63 checks passed
@bert-e
bert-e deleted the bugfix/CLDSRV-990 branch September 21, 2026 09:08
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