cloudserver icon indicating copy to clipboard operation
cloudserver copied to clipboard
verified publisher icon scality

utapi-v1 delete inconsistency with versioning suspended

Open watsaqat opened this issue 3 years ago • 7 comments

Description

Motivation and context

Addresses https://scality.atlassian.net/browse/S3C-5741. Passes in a byteLength when versioning is suspended and the object exists. This allows Utapi to properly decrement the object count and storage utilized for various metrics.

Related issues

Please use the following link syntaxes #600 to reference issues in the current repository

Checklist

Add tests to cover the changes

New tests added or existing tests modified to cover all changes

Code conforms with the style guide

Sign your work

In order to contribute to the project, you must sign your work https://github.com/scality/Guidelines/blob/master/CONTRIBUTING.md#sign-your-work

Thank you again for contributing! We will try to test and integrate the change as soon as we can.

watsaqat avatar Aug 31 '22 21:08 watsaqat

Hello watsaqat,

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 avatar Aug 31 '22 21:08 bert-e

Branches have diverged

This pull request's source branch bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended has diverged from development/8.5 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the following solutions:

  • Merge origin/development/8.5 into bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended
  • Rebase bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended onto origin/development/8.5

Note: If you choose to rebase, you may have to ask me to rebuild integration branches using the reset command.

bert-e avatar Aug 31 '22 21:08 bert-e

Incorrect fix version

The Fix Version/s in issue CLDSRV-275 contains:

  • None

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

  • 7.10.12

  • 7.70.6

  • 8.4.15

  • 8.5.14

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

bert-e avatar Sep 09 '22 23:09 bert-e

/reset

watsaqat avatar Sep 09 '22 23:09 watsaqat

Reset complete

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

bert-e avatar Sep 09 '22 23:09 bert-e

Integration data created

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

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

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 avatar Sep 09 '22 23:09 bert-e

Waiting for approval

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

  • the author

  • 2 peers

bert-e avatar Sep 09 '22 23:09 bert-e

History mismatch

Merge commit #4457ade0dbaf04b94dd64975ecd3bafa35208991 on the integration branch w/7.70/bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended is merging a branch which is neither the current branch bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended nor the development branch development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended 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 avatar Oct 14 '22 22:10 bert-e

Waiting for approval

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

  • the author

  • 2 peers

bert-e avatar Oct 14 '22 22:10 bert-e

/reset

watsaqat avatar Oct 14 '22 22:10 watsaqat

Reset complete

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

bert-e avatar Oct 14 '22 22:10 bert-e

Integration data created

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

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

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 avatar Oct 14 '22 22:10 bert-e

Waiting for approval

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

  • the author

  • 2 peers

bert-e avatar Oct 14 '22 22:10 bert-e

History mismatch

Merge commit #4457ade0dbaf04b94dd64975ecd3bafa35208991 on the integration branch w/7.70/bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended is merging a branch which is neither the current branch bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended nor the development branch development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended 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 avatar Oct 14 '22 22:10 bert-e

/reset

watsaqat avatar Oct 14 '22 23:10 watsaqat

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 avatar Oct 14 '22 23:10 bert-e

History mismatch

Merge commit #4457ade0dbaf04b94dd64975ecd3bafa35208991 on the integration branch w/7.70/bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended is merging a branch which is neither the current branch bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended nor the development branch development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended 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 avatar Oct 14 '22 23:10 bert-e

/force_reset

watsaqat avatar Oct 14 '22 23:10 watsaqat

Reset complete

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

bert-e avatar Oct 14 '22 23:10 bert-e

Integration data created

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

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

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 avatar Oct 14 '22 23:10 bert-e

Waiting for approval

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

  • the author

  • 2 peers

bert-e avatar Oct 14 '22 23:10 bert-e

History mismatch

Merge commit #88d4da002961edbe9a6e0f6669c653141119ace5 on the integration branch w/7.70/bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended is merging a branch which is neither the current branch bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended nor the development branch development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended 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 avatar Oct 15 '22 00:10 bert-e

/reset

watsaqat avatar Oct 15 '22 00:10 watsaqat

Reset complete

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

bert-e avatar Oct 15 '22 00:10 bert-e

Conflict

A conflict has been raised during the creation of integration branch w/8.4/bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended with contents from w/7.70/bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended and development/8.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.4/bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended origin/development/8.4
 $ git merge origin/w/7.70/bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.4/bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended

bert-e avatar Oct 15 '22 00:10 bert-e

Integration data created

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

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

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 avatar Oct 15 '22 01:10 bert-e

Waiting for approval

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

  • the author

  • 2 peers

bert-e avatar Oct 15 '22 01:10 bert-e

History mismatch

Merge commit #e52e082de93530edff9420b3e5367c564ef75429 on the integration branch w/7.70/bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended is merging a branch which is neither the current branch bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended nor the development branch development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-275-utapi-v1-delete-inconsistency-with-versioning-suspended 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 avatar Oct 15 '22 01:10 bert-e

/reset

watsaqat avatar Oct 15 '22 01:10 watsaqat

Reset complete

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

bert-e avatar Oct 15 '22 01:10 bert-e