Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARSN-479: Multi ip kms KMIP with simple round robin #2321

Merged
merged 6 commits into from
Mar 24, 2025

Conversation

BourgoisMickael
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Mar 20, 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.

@BourgoisMickael
Copy link
Contributor Author

ping

@scality scality deleted a comment from bert-e Mar 21, 2025
@scality scality deleted a comment from bert-e Mar 21, 2025
@bert-e
Copy link
Contributor

bert-e commented Mar 21, 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.

Copy link
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.

Reviewed cloudserver PR as well.

Verified

This commit was signed with the committer’s verified signature.
BourgoisMickael Mickael Bourgois

Verified

This commit was signed with the committer’s verified signature.
BourgoisMickael Mickael Bourgois
Fix log

```json
{"serverInformation":"[{\"Unknown Tag\":{\"type\":\"TextString\",\"value\":\"CipherTrust Manager\",\"tag\":\"420053\"}},{\"Unknown Tag\":{\"type\":\"TextString\",\"value\":\"2.18.0+13297\",\"tag\":\"541001\"}},{\"Unknown Tag\":{\"type\":\"TextString\",\"value\":\"CipherTrust Manager k170v\",\"tag\":\"541000\"}}]"}
```

Into

```json
{"serverInformation":[{"Name":{"type":"TextString","value":"CipherTrust Manager"}},{"Extension Thales: version":{"type":"TextString","value":"2.18.0+13297"}},{"Extension Thales: model":{"type":"TextString","value":"CipherTrust Manager k170v"}}]}
```

Verified

This commit was signed with the committer’s verified signature.
BourgoisMickael Mickael Bourgois
So each client knows what method to implement

Verified

This commit was signed with the committer’s verified signature.
BourgoisMickael Mickael Bourgois
With simple round robin

Verified

This commit was signed with the committer’s verified signature.
BourgoisMickael Mickael Bourgois
Log the host for multi ip
Log the latency for support to notice slow KMS problem
Log the operation and the success of kmip request to know latency and host

Verified

This commit was signed with the committer’s verified signature.
BourgoisMickael Mickael Bourgois
@BourgoisMickael BourgoisMickael force-pushed the improvement/ARSN-479-kms-ip branch from a741353 to 8b0b191 Compare March 24, 2025 15:56
@BourgoisMickael
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Mar 24, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/improvement/ARSN-479-kms-ip with contents from improvement/ARSN-479-kms-ip
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-479-kms-ip origin/development/8.1
 $ git merge origin/improvement/ARSN-479-kms-ip
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/ARSN-479-kms-ip

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 24, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/8.2/improvement/ARSN-479-kms-ip with contents from w/8.1/improvement/ARSN-479-kms-ip
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-479-kms-ip origin/development/8.2
 $ git merge origin/w/8.1/improvement/ARSN-479-kms-ip
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.2/improvement/ARSN-479-kms-ip

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 24, 2025

Build failed

The build for commit did not succeed in branch w/8.2/improvement/ARSN-479-kms-ip

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 24, 2025

Build failed

The build for commit did not succeed in branch w/8.2/improvement/ARSN-479-kms-ip

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 24, 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-479.

Goodbye bourgoismickael.

The following options are set: approve

@bert-e bert-e merged commit 8b0b191 into development/7.70 Mar 24, 2025
5 checks passed
@bert-e bert-e deleted the improvement/ARSN-479-kms-ip branch March 24, 2025 16:40
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.

None yet

4 participants