BB-462 Expiring non-versioned objects fails #2464

nicolas2bert · 2023-10-25T12:55:51Z

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 · 2023-10-25T12:55:55Z

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 · 2023-10-25T12:56:02Z

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 · 2023-10-25T13:01:19Z

ping

bert-e · 2023-10-25T13:01:27Z

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 · 2023-10-25T13:01:41Z

/create_integration_branches

bert-e · 2023-10-25T13:01:53Z

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 · 2023-10-25T14:46:17Z

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

jonathan-gramain · 2023-10-25T17:22:41Z

package.json

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


Can you do the version bump in a separate commit

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 · 2023-10-25T17:53:59Z

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 · 2023-10-25T17:54:12Z

@bert-e reset

bert-e · 2023-10-25T17:54:23Z

Reset complete

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

The following options are set: create_integration_branches

bert-e · 2023-10-25T17:54:33Z

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 · 2023-10-25T18:00:18Z

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 · 2023-10-25T18:52:56Z

Integration data created

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

this pull request will merge bugfix/BB-462/lifecycle into
development/7.10
w/7.70/bugfix/BB-462/lifecycle will be merged into development/7.70
w/8.5/bugfix/BB-462/lifecycle will be merged into development/8.5
w/8.6/bugfix/BB-462/lifecycle will be merged into development/8.6
w/8.7/bugfix/BB-462/lifecycle will be merged into development/8.7

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 · 2023-10-25T18:52:57Z

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

williamlardier

LGTM

nicolas2bert · 2023-10-26T08:33:45Z

@bert-e approve

bert-e · 2023-10-26T08:34:05Z

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 · 2023-10-26T08:34:19Z

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.

jonathan-gramain reviewed Oct 25, 2023

View reviewed changes

nicolas2bert added 2 commits October 25, 2023 19:53

bump project version

55b7a0b

nicolas2bert force-pushed the bugfix/BB-462/lifecycle branch from d8ab9f8 to 55b7a0b Compare October 25, 2023 17:53

jonathan-gramain approved these changes Oct 25, 2023

View reviewed changes

williamlardier approved these changes Oct 26, 2023

View reviewed changes

bert-e merged commit 55b7a0b into development/7.10 Oct 26, 2023
2 checks passed

bert-e deleted the bugfix/BB-462/lifecycle branch October 26, 2023 08:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

BB-462 Expiring non-versioned objects fails #2464

BB-462 Expiring non-versioned objects fails #2464

nicolas2bert commented Oct 25, 2023 •

edited

Loading

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

jonathan-gramain Oct 25, 2023

nicolas2bert Oct 25, 2023

bert-e commented Oct 25, 2023

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

bert-e commented Oct 25, 2023

williamlardier left a comment

nicolas2bert commented Oct 26, 2023

bert-e commented Oct 26, 2023

bert-e commented Oct 26, 2023

BB-462 Expiring non-versioned objects fails #2464

BB-462 Expiring non-versioned objects fails #2464

Conversation

nicolas2bert commented Oct 25, 2023 • edited Loading

bert-e commented Oct 25, 2023

Hello nicolas2bert,

bert-e commented Oct 25, 2023

Incorrect fix version

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

Request integration branches

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

Conflict

bert-e commented Oct 25, 2023

Conflict

jonathan-gramain Oct 25, 2023

Choose a reason for hiding this comment

nicolas2bert Oct 25, 2023

Choose a reason for hiding this comment

bert-e commented Oct 25, 2023

History mismatch

nicolas2bert commented Oct 25, 2023

bert-e commented Oct 25, 2023

Reset complete

bert-e commented Oct 25, 2023

Conflict

bert-e commented Oct 25, 2023

Conflict

bert-e commented Oct 25, 2023

Integration data created

bert-e commented Oct 25, 2023

Waiting for approval

williamlardier left a comment

Choose a reason for hiding this comment

nicolas2bert commented Oct 26, 2023

bert-e commented Oct 26, 2023

In the queue

bert-e commented Oct 26, 2023

nicolas2bert commented Oct 25, 2023 •

edited

Loading