Skip to content

ARSN-495: KMIP retries#2397

Merged
bert-e merged 5 commits intodevelopment/7.70from
improvement/ARSN-495-kmip-retry
May 21, 2025
Merged

ARSN-495: KMIP retries#2397
bert-e merged 5 commits intodevelopment/7.70from
improvement/ARSN-495-kmip-retry

Conversation

@BourgoisMickael
Copy link
Copy Markdown
Contributor

  • Retry internally for thales session token revoked
  • Blacklist unhealthy hosts (hosts that return error) and add retry mechanism in kmip cluster

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented May 19, 2025

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
/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
Copy link
Copy Markdown
Contributor

bert-e commented May 19, 2025

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 force-pushed the improvement/ARSN-495-kmip-retry branch 3 times, most recently from 571f461 to 7f10726 Compare May 20, 2025 07:53
Copy link
Copy Markdown
Contributor

@anurag4DSB anurag4DSB left a comment

Choose a reason for hiding this comment

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

Should we add a blacklist mechanism so for an unhealthy node further requests are not forwarded.

Comment thread lib/network/kmip/error-comparison.jsonc
Comment thread lib/network/kmip/index.ts Outdated
Comment thread lib/network/kmip/index.ts Outdated
Comment thread lib/network/kmip/Client.ts
Comment thread lib/network/kmip/ClusterClient.ts
Comment thread lib/network/kmip/ClusterClient.ts Outdated
Comment thread lib/network/kmip/ClusterClient.ts Outdated
Copy link
Copy Markdown
Contributor

@anurag4DSB anurag4DSB left a comment

Choose a reason for hiding this comment

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

Approving but some comments improvement is needed for context.

@BourgoisMickael BourgoisMickael force-pushed the improvement/ARSN-495-kmip-retry branch from 7f10726 to 3503526 Compare May 21, 2025 13:36
@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented May 21, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/improvement/ARSN-495-kmip-retry with contents from improvement/ARSN-495-kmip-retry
and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/improvement/ARSN-495-kmip-retry origin/development/8.1
 $ git merge origin/improvement/ARSN-495-kmip-retry
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/ARSN-495-kmip-retry

The following options are set: approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented May 21, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/8.2/improvement/ARSN-495-kmip-retry with contents from w/8.1/improvement/ARSN-495-kmip-retry
and development/8.2.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.2/improvement/ARSN-495-kmip-retry origin/development/8.2
 $ git merge origin/w/8.1/improvement/ARSN-495-kmip-retry
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.2/improvement/ARSN-495-kmip-retry

The following options are set: approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented May 21, 2025

Build failed

The build for commit did not succeed in branch w/8.2/improvement/ARSN-495-kmip-retry

The following options are set: approve

@BourgoisMickael BourgoisMickael force-pushed the improvement/ARSN-495-kmip-retry branch from 3503526 to 0ef69d3 Compare May 21, 2025 14:39
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented May 21, 2025

History mismatch

Merge commit #89a4a1d801a0be07eea2188f0d13909a8f7d14ba on the integration branch
w/8.1/improvement/ARSN-495-kmip-retry is merging a branch which is neither the current
branch improvement/ARSN-495-kmip-retry nor the development branch
development/8.1.

It is likely due to a rebase of the branch improvement/ARSN-495-kmip-retry 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: approve

@bert-e bert-e merged commit 0ef69d3 into development/7.70 May 21, 2025
5 checks passed
@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented May 21, 2025

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

  • ✔️ development/7.70

  • ✔️ development/8.1

  • ✔️ development/8.2

The following branches have NOT changed:

  • development/6.4
  • development/7.10
  • development/7.4

Please check the status of the associated issue ARSN-495.

Goodbye bourgoismickael.

The following options are set: approve

@bert-e bert-e deleted the improvement/ARSN-495-kmip-retry branch May 21, 2025 14:52
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