scality / backbeat

Zenko Backbeat is the core engine for asynchronous replication, optimized for queuing metadata updates and dispatching work to long-running tasks in the background.
https://www.zenko.io
Apache License 2.0
53 stars 19 forks source link

bf: BB-419 increase notification default concurrency #2422

Closed jonathan-gramain closed 1 year ago

jonathan-gramain commented 1 year ago

Replaces https://github.com/scality/backbeat/pull/2421

bert-e commented 1 year ago

Hello jonathan-gramain,

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.

Status report is not available.

bert-e commented 1 year ago

Conflict

A conflict has been raised during the creation of integration branch w/7.70/bugfix/BB-419-increaseNotificationDefaultConcurrency with contents from bugfix/BB-419-increaseNotificationDefaultConcurrency 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/bugfix/BB-419-increaseNotificationDefaultConcurrency origin/development/7.70
 $ git merge origin/bugfix/BB-419-increaseNotificationDefaultConcurrency
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/BB-419-increaseNotificationDefaultConcurrency
bert-e commented 1 year ago

Incorrect fix version

The Fix Version/s in issue BB-419 contains:

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

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

bert-e commented 1 year ago

Conflict

A conflict has been raised during the creation of integration branch w/7.70/bugfix/BB-419-increaseNotificationDefaultConcurrency with contents from bugfix/BB-419-increaseNotificationDefaultConcurrency 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/bugfix/BB-419-increaseNotificationDefaultConcurrency origin/development/7.70
 $ git merge origin/bugfix/BB-419-increaseNotificationDefaultConcurrency
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/BB-419-increaseNotificationDefaultConcurrency
bert-e commented 1 year ago

Conflict

A conflict has been raised during the creation of integration branch w/8.5/bugfix/BB-419-increaseNotificationDefaultConcurrency with contents from w/7.70/bugfix/BB-419-increaseNotificationDefaultConcurrency and development/8.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.5/bugfix/BB-419-increaseNotificationDefaultConcurrency origin/development/8.5
 $ git merge origin/w/7.70/bugfix/BB-419-increaseNotificationDefaultConcurrency
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/bugfix/BB-419-increaseNotificationDefaultConcurrency
bert-e commented 1 year ago

Integration data created

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

The following branches will NOT be impacted:

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
bert-e commented 1 year ago

Waiting for approval

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

bert-e commented 1 year ago

History mismatch

Merge commit #1e5dae878ab6d5cf220e8460791d515480d132c1 on the integration branch w/8.6/bugfix/BB-419-increaseNotificationDefaultConcurrency is merging a branch which is neither the current branch bugfix/BB-419-increaseNotificationDefaultConcurrency nor the development branch development/8.6.

It is likely due to a rebase of the branch bugfix/BB-419-increaseNotificationDefaultConcurrency 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.

bert-e commented 1 year ago

Waiting for approval

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

jonathan-gramain commented 1 year ago

/approve

bert-e commented 1 year ago

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:

The following branches will NOT be impacted:

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.

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

bert-e commented 1 year ago

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

The following branches have NOT changed:

Please check the status of the associated issue BB-419.

Goodbye jonathan-gramain.