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

Await asPrometheus to follow the changes in prom-client api which now returns a promise #2375

Closed KillianG closed 1 year ago

KillianG commented 1 year ago

Issue: BB-370

bert-e commented 1 year ago

Hello killiang,

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

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 #7486ed1c7ed74ea9ef7c3408e794c4607048a267 on the integration branch w/8.4/bugfix/BB-370-fix-prom-client-upgrade-promises is merging a branch which is neither the current branch bugfix/BB-370-fix-prom-client-upgrade-promises nor the development branch development/8.4.

It is likely due to a rebase of the branch bugfix/BB-370-fix-prom-client-upgrade-promises 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.

francoisferrand commented 1 year ago

LGTM, but need rebase to "merge" the fixup commit (and then bert-e's /reset and re-creating the missing commits on other branches)

KillianG commented 1 year ago

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

bert-e commented 1 year ago

History mismatch

Merge commit #7486ed1c7ed74ea9ef7c3408e794c4607048a267 on the integration branch w/8.4/bugfix/BB-370-fix-prom-client-upgrade-promises is merging a branch which is neither the current branch bugfix/BB-370-fix-prom-client-upgrade-promises nor the development branch development/8.4.

It is likely due to a rebase of the branch bugfix/BB-370-fix-prom-client-upgrade-promises 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.

KillianG commented 1 year ago

/force_reset

bert-e commented 1 year ago

Reset complete

I have successfully deleted this pull request's 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
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

Waiting for approval

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

The following options are set: approve

KillianG 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-370.

Goodbye killiang.