Skip to content

CLDSRV-1020: Improve KMS upfront decrypt with many parts - #6341

Merged
bert-e merged 9 commits into
development/7.10from
improvement/CLDSRV-1020-kms-upfront
Oct 27, 2026
Merged

bert-e merged 9 commits into
development/7.10from
improvement/CLDSRV-1020-kms-upfront

Conversation

@BourgoisMickael

@BourgoisMickael BourgoisMickael commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

Describe the trade-off of upfront parallel KMS Decrypt before streaming parts done by:

pros cons
- return KMS error instead of success with socket closing mid-stream
- parallel queries instead of in series between each parts for faster overall streaming
for many parts:
- can delay time to first byte
- can flood the KMS, parallel should be limited
- can hold native memory, should be cleaned asap if not consumed (on error) without waiting for GC

  • Limit the number of parallel requests made to KMS
    Defaults to 100, with environment variable GET_OBJECT_MAX_PARALLEL_KMS_DECRYPT to override or skip upfront KMS decrypt
  • Cleanup crypto streams early on error
  • Unit tests

This fixes comments from this backport #6322

Provide an env var to override or skip.
Instead of synchronous callback that trigger stack overflow
with many parts in async 2.5 (branch 7.X and 8.X).

Also should be more optimized.
If only 1 of multiple parallel queries fails the objectGet,
cleanup early the decipher stream of other successful KMS queries
Those streams for cryptography can hold native C++ memory
for OpenSSL. It's good to release them early without
waiting for GC.
@bert-e

bert-e commented Oct 23, 2026

Copy link
Copy Markdown
Contributor

Hello bourgoismickael,

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.

@bert-e

bert-e commented Oct 23, 2026

Copy link
Copy Markdown
Contributor

Incorrect fix version

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

  • None

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

  • 7.10.62

  • 7.70.78

  • 8.8.60

  • 9.0.38

  • 9.1.16

  • 9.2.44

  • 9.3.25

  • 9.4.10

  • 9.5.1

  • 9.6.0

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

@BourgoisMickael
BourgoisMickael requested review from a team, anurag4DSB, jonathan-gramain, leif-scality and tcarmet and removed request for a team October 23, 2026 14:32
@bert-e

bert-e commented Oct 23, 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.

@BourgoisMickael
BourgoisMickael requested a review from a team October 26, 2026 12:34
@anurag4DSB

Copy link
Copy Markdown
Contributor

If it changes what user sees, we should document the cons (may be release notes or something else)

@BourgoisMickael

Copy link
Copy Markdown
Contributor Author

/create_integration_branches

The latest is 26 with breaks with tests needing python 3.9
@BourgoisMickael
BourgoisMickael force-pushed the improvement/CLDSRV-1020-kms-upfront branch from cfd1363 to 8503658 Compare October 26, 2026 14:14
@bert-e

bert-e commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

History mismatch

Merge commit #cfd136373489893f4123b1cc55d12e4c5542f5ea on the integration branch
w/7.70/improvement/CLDSRV-1020-kms-upfront is merging a branch which is neither the current
branch improvement/CLDSRV-1020-kms-upfront nor the development branch
development/7.70.

It is likely due to a rebase of the branch improvement/CLDSRV-1020-kms-upfront and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_integration_branches

@BourgoisMickael

Copy link
Copy Markdown
Contributor Author

@bert-e reset

@bert-e

bert-e commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_integration_branches

@bert-e

bert-e commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/improvement/CLDSRV-1020-kms-upfront with contents from improvement/CLDSRV-1020-kms-upfront
and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/7.70/improvement/CLDSRV-1020-kms-upfront origin/development/7.70
 git merge origin/improvement/CLDSRV-1020-kms-upfront
 # <intense conflict resolution>
 git commit
 git push -u origin w/7.70/improvement/CLDSRV-1020-kms-upfront

The following options are set: create_integration_branches

@scality scality deleted a comment from bert-e Oct 26, 2026
@scality scality deleted a comment from bert-e Oct 26, 2026
@bert-e

bert-e commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/8.8/improvement/CLDSRV-1020-kms-upfront with contents from w/7.70/improvement/CLDSRV-1020-kms-upfront
and development/8.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/8.8/improvement/CLDSRV-1020-kms-upfront origin/development/8.8
 git merge origin/w/7.70/improvement/CLDSRV-1020-kms-upfront
 # <intense conflict resolution>
 git commit
 git push -u origin w/8.8/improvement/CLDSRV-1020-kms-upfront

The following options are set: create_integration_branches

@bert-e

bert-e commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/9.0/improvement/CLDSRV-1020-kms-upfront with contents from w/8.8/improvement/CLDSRV-1020-kms-upfront
and development/9.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/9.0/improvement/CLDSRV-1020-kms-upfront origin/development/9.0
 git merge origin/w/8.8/improvement/CLDSRV-1020-kms-upfront
 # <intense conflict resolution>
 git commit
 git push -u origin w/9.0/improvement/CLDSRV-1020-kms-upfront

The following options are set: create_integration_branches

@bert-e

bert-e commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/9.2/improvement/CLDSRV-1020-kms-upfront with contents from w/9.1/improvement/CLDSRV-1020-kms-upfront
and development/9.2.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/9.2/improvement/CLDSRV-1020-kms-upfront origin/development/9.2
 git merge origin/w/9.1/improvement/CLDSRV-1020-kms-upfront
 # <intense conflict resolution>
 git commit
 git push -u origin w/9.2/improvement/CLDSRV-1020-kms-upfront

The following options are set: create_integration_branches

@bert-e

bert-e commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/9.3/improvement/CLDSRV-1020-kms-upfront with contents from w/9.2/improvement/CLDSRV-1020-kms-upfront
and development/9.3.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/9.3/improvement/CLDSRV-1020-kms-upfront origin/development/9.3
 git merge origin/w/9.2/improvement/CLDSRV-1020-kms-upfront
 # <intense conflict resolution>
 git commit
 git push -u origin w/9.3/improvement/CLDSRV-1020-kms-upfront

The following options are set: create_integration_branches

@bert-e

bert-e commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/9.4/improvement/CLDSRV-1020-kms-upfront with contents from w/9.3/improvement/CLDSRV-1020-kms-upfront
and development/9.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/9.4/improvement/CLDSRV-1020-kms-upfront origin/development/9.4
 git merge origin/w/9.3/improvement/CLDSRV-1020-kms-upfront
 # <intense conflict resolution>
 git commit
 git push -u origin w/9.4/improvement/CLDSRV-1020-kms-upfront

The following options are set: create_integration_branches

@bert-e

bert-e commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/9.5/improvement/CLDSRV-1020-kms-upfront with contents from w/9.4/improvement/CLDSRV-1020-kms-upfront
and development/9.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/9.5/improvement/CLDSRV-1020-kms-upfront origin/development/9.5
 git merge origin/w/9.4/improvement/CLDSRV-1020-kms-upfront
 # <intense conflict resolution>
 git commit
 git push -u origin w/9.5/improvement/CLDSRV-1020-kms-upfront

The following options are set: create_integration_branches

@bert-e

bert-e commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

Integration data created

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

The following branches will NOT be impacted:

  • development/7.4

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

bert-e commented Oct 26, 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

The following options are set: create_integration_branches

@BourgoisMickael

Copy link
Copy Markdown
Contributor Author

/approve

@bert-e

bert-e commented Oct 27, 2026

Copy link
Copy Markdown
Contributor

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.8

  • ✔️ development/9.0

  • ✔️ development/9.1

  • ✔️ development/9.2

  • ✔️ development/9.3

  • ✔️ development/9.4

  • ✔️ development/9.5

  • ✔️ development/9.6

The following branches will NOT be impacted:

  • development/7.4

This pull request does not target the following hotfix branch(es) so they
will be left untouched:

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

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve, create_integration_branches

@bert-e

bert-e commented Oct 27, 2026

Copy link
Copy Markdown
Contributor

Queue build failed

The corresponding build for the queue failed:

  • Checkout the status page.
  • Identify the failing build and review the logs.
  • If no issue is found, re-run the build.
  • If an issue is identified, checkout the steps below to remove
    the pull request from the queue for further analysis and maybe rebase/merge.
Remove the pull request from the queue
  • Add a /wait comment on this pull request.
  • Click on login on the status page.
  • Go into the manage page.
  • Find the option called Rebuild the queue and click on it.
    Bert-E will loop again on all pull requests to put the valid ones
    in the queue again, while skipping the one with the /wait comment.
  • Wait for the new queue to merge, then merge/rebase your pull request
    with the latest changes to then work on a proper fix.
  • Once the issue is fixed, delete the /wait comment and
    follow the usual process to merge the pull request.

@BourgoisMickael

Copy link
Copy Markdown
Contributor Author

ping

@bert-e

bert-e commented Oct 27, 2026

Copy link
Copy Markdown
Contributor

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

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.8

  • ✔️ development/9.0

  • ✔️ development/9.1

  • ✔️ development/9.2

  • ✔️ development/9.3

  • ✔️ development/9.4

  • ✔️ development/9.5

  • ✔️ development/9.6

The following branches have NOT changed:

  • development/7.4

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

Goodbye bourgoismickael.

@bert-e
bert-e merged commit 8503658 into development/7.10 Oct 27, 2026
20 checks passed
@bert-e
bert-e deleted the improvement/CLDSRV-1020-kms-upfront branch October 27, 2026 13:45
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