search

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

Skip objects with pending replication when expiring them #2450

Closed nicolas2bert closed 1 year ago

bert-e commented 1 year ago

Hello nicolas2bert,

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

Incorrect fix version

The Fix Version/s in issue BB-450 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-450, or the target branch of this pull request.

bert-e commented 1 year ago

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.

nicolas2bert commented 1 year ago

/create_integration_branches

bert-e commented 1 year ago

Conflict

A conflict has been raised during the creation of integration branch w/8.5/bugfix/BB-450/replication with contents from w/7.70/bugfix/BB-450/replication 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-450/replication origin/development/8.5
 $ git merge origin/w/7.70/bugfix/BB-450/replication
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/bugfix/BB-450/replication

The following options are set: create_integration_branches

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

The following options are set: create_integration_branches

bert-e commented 1 year ago

Waiting for approval

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

The following options are set: create_integration_branches

bert-e commented 1 year ago

History mismatch

Merge commit #53c4273172e59982a51a43c70afcd8d2dc146d08 on the integration branch w/7.70/bugfix/BB-450/replication is merging a branch which is neither the current branch bugfix/BB-450/replication nor the development branch development/7.70.

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

nicolas2bert commented 1 year ago

@bert-e reset

bert-e commented 1 year ago

Reset complete

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

The following options are set: create_integration_branches

bert-e commented 1 year ago

Conflict

A conflict has been raised during the creation of integration branch w/8.5/bugfix/BB-450/replication with contents from w/7.70/bugfix/BB-450/replication 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-450/replication origin/development/8.5
 $ git merge origin/w/7.70/bugfix/BB-450/replication
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/bugfix/BB-450/replication

The following options are set: create_integration_branches

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

The following options are set: create_integration_branches

bert-e commented 1 year ago

Waiting for approval

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

The following options are set: create_integration_branches

nicolas2bert commented 1 year ago

@bert-e approve

bert-e commented 1 year ago

Build failed

The build for commit did not succeed in branch w/7.70/bugfix/BB-450/replication.

The following options are set: approve, create_integration_branches

bert-e commented 1 year ago

Build failed

The build for commit did not succeed in branch w/8.5/bugfix/BB-450/replication.

The following options are set: approve, create_integration_branches

bert-e commented 1 year ago

Build failed

The build for commit did not succeed in branch w/8.6/bugfix/BB-450/replication.

The following options are set: approve, create_integration_branches

nicolas2bert commented 1 year ago

ping

nicolas2bert commented 1 year ago

@bert-e status

bert-e commented 1 year ago

Status

Status report is not available.

The following options are set: approve, create_integration_branches

nicolas2bert commented 1 year ago

@bert-e help

bert-e commented 1 year ago

Help page

The following options and commands are available at this time.

Options

name description privileged authored
:arrow_right: after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
:arrow_right: bypass_author_approval Bypass the pull request author's approval :star:
:arrow_right: bypass_build_status Bypass the build and test status :star:
:arrow_right: bypass_commit_size Bypass the check on the size of the changeset TBA :star:
:arrow_right: bypass_incompatible_branch Bypass the check on the source branch prefix :star:
:arrow_right: bypass_jira_check Bypass the Jira issue check :star:
:arrow_right: bypass_peer_approval Bypass the pull request peers' approval :star:
:arrow_right: bypass_leader_approval Bypass the pull request leaders' approval :star:
:arrow_right: approve Instruct Bert-E that the author has approved the pull request. :writing_hand:
:arrow_right: create_pull_requests Allow the creation of integration pull requests.
:arrow_right: create_integration_branches Allow the creation of integration branches.
:arrow_right: no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
:arrow_right: unanimity Change review acceptance criteria from one reviewer at least to all reviewers
:arrow_right: wait Instruct Bert-E not to run until further notice.

Commands

name description privileged
:arrow_right: help Print Bert-E's manual in the pull request.
:arrow_right: status Print Bert-E's current status in the pull request TBA
:arrow_right: clear Remove all comments from Bert-E from the history TBA
:arrow_right: retry Re-start a fresh build TBA
:arrow_right: build Re-start a fresh build TBA
:arrow_right: force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
:arrow_right: reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

The following options are set: approve, create_integration_branches

nicolas2bert commented 1 year ago

@bert-e reset

bert-e commented 1 year ago

Lossy reset warning

There seems to be manual commits on integration branches (e.g. conflict resolutions) that will be lost if you chose to reset.

You can use the force_reset command if you still want me to delete those branches.

The following options are set: approve, create_integration_branches

nicolas2bert commented 1 year ago

@bert-e force_reset

bert-e commented 1 year ago

Reset complete

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

The following options are set: approve, create_integration_branches

bert-e commented 1 year ago

Conflict

A conflict has been raised during the creation of integration branch w/8.5/bugfix/BB-450/replication with contents from w/7.70/bugfix/BB-450/replication 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-450/replication origin/development/8.5
 $ git merge origin/w/7.70/bugfix/BB-450/replication
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/bugfix/BB-450/replication

The following options are set: approve, create_integration_branches

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

The following options are set: approve, create_integration_branches

bert-e commented 1 year ago

Build failed

The build for commit did not succeed in branch w/8.7/bugfix/BB-450/replication.

The following options are set: approve, create_integration_branches

bert-e commented 1 year ago

Build failed

The build for commit did not succeed in branch w/8.6/bugfix/BB-450/replication.

The following options are set: approve, create_integration_branches

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, create_integration_branches

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-450.

Goodbye nicolas2bert.