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

Bugfix/zenko 4909 #2157

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Bugfix/zenko 4909 #2157

merged 2 commits into from
Oct 1, 2024

Conversation

williamlardier
Copy link
Contributor

Fixes the error in the CI, that blocked the last 2.10 bump: with the previous override on sorbet's s3 endpoint, it was always using the SOURCE endpoint to restore objects, causing errors when we were trying to do it during a failover phase, when the restore is expected to take place in the SINK.

- Otherwise, we might be overloading the Vault service with
  multiple API calls at high frequency.

Issue: ZENKO-4909
@bert-e
Copy link
Contributor

bert-e commented Sep 30, 2024

Hello williamlardier,

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
Contributor

bert-e commented Sep 30, 2024

Incorrect fix version

The Fix Version/s in issue ZENKO-4909 contains:

  • None

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

  • 2.10.1

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

@bert-e
Copy link
Contributor

bert-e commented Sep 30, 2024

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@williamlardier
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Sep 30, 2024

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

The following options are set: approve

@@ -296,6 +296,9 @@ When('the DATA_ACCESSOR user tries to perform PutObject on {string} site', { tim
} catch (err) {
this.logger.error('Failed to setup entity', { err });
}
if (!conditionOk) {
await Utils.sleep(1000);
Copy link
Contributor

Choose a reason for hiding this comment

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

Would be nice to explain the delay here, in the code: for people stumbling upon it in the future

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will be done in the ticket targeting all branches - but not sure it's needed to have a comment, it's not mandatory, just to avoid calling APIs in a while loop without sleep times...

@bert-e
Copy link
Contributor

bert-e commented Oct 1, 2024

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

  • ✔️ development/2.10

The following branches have NOT changed:

  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue ZENKO-4909.

Goodbye williamlardier.

The following options are set: approve

@bert-e bert-e merged commit a77d08a into development/2.10 Oct 1, 2024
14 checks passed
@bert-e bert-e deleted the bugfix/ZENKO-4909 branch October 1, 2024 08:41
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