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

BB-462 Expiring non-versioned objects fails #2464

Merged
merged 2 commits into from
Oct 26, 2023

Conversation

nicolas2bert
Copy link
Contributor

@nicolas2bert nicolas2bert commented Oct 25, 2023

Note1: The change won't be forward-ported into Artesca branches.
Note2: Only buckets with versioning enabled can be configured for replication.

To expire non-versioned objects correctly, we currently rely on the InvalidBucketState error returned when the S3C Backbeat API is used for a non-versioned bucket's object, until CLDSRV-461 is implemented to add support for non-versioned buckets to the Backbeat API.

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2023

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
Copy link
Contributor

bert-e commented Oct 25, 2023

Incorrect fix version

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

  • None

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

  • 7.10.14

  • 7.70.8

  • 8.5.5

  • 8.6.29

  • 8.7.0

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

@nicolas2bert
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2023

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
Copy link
Contributor Author

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2023

Conflict

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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2023

Conflict

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

The following options are set: create_integration_branches

@@ -1,6 +1,6 @@
{
"name": "backbeat",
"version": "7.10.13",
"version": "7.10.14",
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you do the version bump in a separate commit

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

Note: Only buckets with versioning enabled can be configured for replication.

To expire non-versioned objects correctly, we currently rely on the InvalidBucketState error returned when the S3C Backbeat API is used for a non-versioned bucket's object, until CLDSRV-461 is implemented to add support for non-versioned buckets to the Backbeat API.
@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2023

History mismatch

Merge commit #d8ab9f8d1c9631ca08b58de056ac4e31faa5e940 on the integration branch
w/7.70/bugfix/BB-462/lifecycle is merging a branch which is neither the current
branch bugfix/BB-462/lifecycle nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/BB-462/lifecycle 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
Copy link
Contributor Author

@bert-e reset

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2023

Reset complete

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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2023

Conflict

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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2023

Conflict

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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2023

Integration data created

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

The following branches will NOT be impacted:

  • 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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 25, 2023

Waiting for approval

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

  • the author

  • 2 peers

The following options are set: create_integration_branches

Copy link
Contributor

@williamlardier williamlardier left a comment

Choose a reason for hiding this comment

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

LGTM

@nicolas2bert
Copy link
Contributor Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Oct 26, 2023

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:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.5

  • ✔️ development/8.6

  • ✔️ development/8.7

The following branches will NOT be impacted:

  • development/7.4

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.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

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
Copy link
Contributor

bert-e commented Oct 26, 2023

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

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.5

  • ✔️ development/8.6

  • ✔️ development/8.7

The following branches have NOT changed:

  • development/7.4

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

Goodbye nicolas2bert.

@bert-e bert-e merged commit 55b7a0b into development/7.10 Oct 26, 2023
2 checks passed
@bert-e bert-e deleted the bugfix/BB-462/lifecycle branch October 26, 2023 08:34
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.

None yet

4 participants