CLDSRV-518 Duplication of version ID in metadata #5548

nicolas2bert · 2024-03-12T14:07:17Z

No description provided.

bert-e · 2024-03-12T14:07:21Z

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.

Available options

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

Available commands

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

Status report is not available.

bert-e · 2024-03-12T14:07:26Z

Incorrect fix version

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

None

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

7.10.46
7.70.46
8.6.27
8.7.48
8.8.21

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

nicolas2bert · 2024-03-12T14:31:02Z

ping

bert-e · 2024-03-12T14:31:10Z

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 · 2024-03-12T14:32:20Z

/create_integration_branches

bert-e · 2024-03-12T14:32:32Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/bugfix/CLDSRV-518/duplication with contents from w/7.70/bugfix/CLDSRV-518/duplication
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/bugfix/CLDSRV-518/duplication origin/development/8.6
 $ git merge origin/w/7.70/bugfix/CLDSRV-518/duplication
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/CLDSRV-518/duplication

The following options are set: create_integration_branches

bert-e · 2024-03-12T14:50:55Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.7/bugfix/CLDSRV-518/duplication with contents from w/8.6/bugfix/CLDSRV-518/duplication
and development/8.7.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.7/bugfix/CLDSRV-518/duplication origin/development/8.7
 $ git merge origin/w/8.6/bugfix/CLDSRV-518/duplication
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.7/bugfix/CLDSRV-518/duplication

The following options are set: create_integration_branches

bert-e · 2024-03-12T16:53:11Z

Conflict

A conflict has been raised during the update of
integration branch w/8.6/bugfix/CLDSRV-518/duplication with contents from w/7.70/bugfix/CLDSRV-518/duplication
and development/8.6.

Please resolve the conflict on the integration branch (w/8.6/bugfix/CLDSRV-518/duplication).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.6/bugfix/CLDSRV-518/duplication
 $ git pull  # or "git reset --hard origin/w/8.6/bugfix/CLDSRV-518/duplication"
 $ git merge origin/development/8.6
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/7.70/bugfix/CLDSRV-518/duplication
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/CLDSRV-518/duplication

The following options are set: create_integration_branches

bert-e · 2024-03-13T13:03:02Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.7/bugfix/CLDSRV-518/duplication with contents from w/8.6/bugfix/CLDSRV-518/duplication
and development/8.7.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.7/bugfix/CLDSRV-518/duplication origin/development/8.7
 $ git merge origin/w/8.6/bugfix/CLDSRV-518/duplication
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.7/bugfix/CLDSRV-518/duplication

The following options are set: create_integration_branches

bert-e · 2024-03-13T14:03:35Z

Integration data created

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

this pull request will merge bugfix/CLDSRV-518/duplication into
development/7.10
w/7.70/bugfix/CLDSRV-518/duplication will be merged into development/7.70
w/8.6/bugfix/CLDSRV-518/duplication will be merged into development/8.6
w/8.7/bugfix/CLDSRV-518/duplication will be merged into development/8.7
w/8.8/bugfix/CLDSRV-518/duplication will be merged into development/8.8

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 · 2024-03-13T14:03:38Z

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

jonathan-gramain · 2024-03-13T18:33:41Z

lib/routes/routeBackbeat.js

+                    // with creating a non-version object (versioning set to false) that includes a version id.
+                    // For example, this version ID might come from a null version of a suspended bucket being
+                    // replicated to this bucket.
+                    delete omVal.versionId;


It would look clearer to me if we do this after omVal.isNull = true; above, if that doesn't change the core logic of the fix. But I am not sure I understand fully the logic.

It is indeed cleaner to have this check after omVal.isNull = true; and indeed does not change the core logic since putMetadata to insert a new metadata key is only used for replication by S3C (Artesca uses Cloud provider SDKs) that only supports versioned bucket.

bert-e · 2024-03-14T15:33:46Z

History mismatch

Merge commit #77d390df86050d694b964b976e883fda6ac3b7a5 on the integration branch
w/7.70/bugfix/CLDSRV-518/duplication is merging a branch which is neither the current
branch bugfix/CLDSRV-518/duplication nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-518/duplication 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 · 2024-03-14T15:33:57Z

@bert-e reset

bert-e · 2024-03-14T15:34:05Z

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

bert-e · 2024-03-14T15:34:13Z

History mismatch

Merge commit #77d390df86050d694b964b976e883fda6ac3b7a5 on the integration branch
w/7.70/bugfix/CLDSRV-518/duplication is merging a branch which is neither the current
branch bugfix/CLDSRV-518/duplication nor the development branch
development/7.70.

It is likely due to a rebase of the branch bugfix/CLDSRV-518/duplication 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 · 2024-03-14T15:34:56Z

@bert-e force_reset

bert-e · 2024-03-14T15:35:06Z

Reset complete

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

The following options are set: create_integration_branches

bert-e · 2024-03-14T15:35:16Z

Conflict

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

The following options are set: create_integration_branches

bert-e · 2024-03-14T19:29:36Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/bugfix/CLDSRV-518/duplication with contents from w/7.70/bugfix/CLDSRV-518/duplication
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/bugfix/CLDSRV-518/duplication origin/development/8.6
 $ git merge origin/w/7.70/bugfix/CLDSRV-518/duplication
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/CLDSRV-518/duplication

The following options are set: create_integration_branches

bert-e · 2024-03-19T05:10:14Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.7/bugfix/CLDSRV-518/duplication with contents from w/8.6/bugfix/CLDSRV-518/duplication
and development/8.7.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.7/bugfix/CLDSRV-518/duplication origin/development/8.7
 $ git merge origin/w/8.6/bugfix/CLDSRV-518/duplication
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.7/bugfix/CLDSRV-518/duplication

The following options are set: create_integration_branches

bert-e · 2024-03-19T17:30:51Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.8/bugfix/CLDSRV-518/duplication with contents from w/8.7/bugfix/CLDSRV-518/duplication
and development/8.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.8/bugfix/CLDSRV-518/duplication origin/development/8.8
 $ git merge origin/w/8.7/bugfix/CLDSRV-518/duplication
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.8/bugfix/CLDSRV-518/duplication

The following options are set: create_integration_branches

bert-e · 2024-03-20T07:50:15Z

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

nicolas2bert · 2024-03-25T12:56:02Z

@bert-e approve

bert-e · 2024-03-25T12:56:20Z

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.6
✔️ development/8.7
✔️ development/8.8

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 · 2024-03-25T13:15:06Z

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

✔️ development/7.10
✔️ development/7.70
✔️ development/8.6
✔️ development/8.7
✔️ development/8.8

The following branches have NOT changed:

development/7.4

Please check the status of the associated issue CLDSRV-518.

Goodbye nicolas2bert.

nicolas2bert requested a review from jonathan-gramain March 13, 2024 15:31

jonathan-gramain reviewed Mar 13, 2024

View reviewed changes

CLDSRV-518 Duplication of version ID in metadata

92cfd47

nicolas2bert force-pushed the bugfix/CLDSRV-518/duplication branch from 77d390d to 92cfd47 Compare March 14, 2024 15:33

jonathan-gramain approved these changes Mar 14, 2024

View reviewed changes

BourgoisMickael approved these changes Mar 19, 2024

View reviewed changes

bert-e merged commit 402ed21 into development/7.10 Mar 25, 2024
10 checks passed

bert-e deleted the bugfix/CLDSRV-518/duplication branch March 25, 2024 13:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CLDSRV-518 Duplication of version ID in metadata #5548

CLDSRV-518 Duplication of version ID in metadata #5548

nicolas2bert commented Mar 12, 2024

bert-e commented Mar 12, 2024

bert-e commented Mar 12, 2024

nicolas2bert commented Mar 12, 2024

bert-e commented Mar 12, 2024

nicolas2bert commented Mar 12, 2024

bert-e commented Mar 12, 2024

bert-e commented Mar 12, 2024

bert-e commented Mar 12, 2024

bert-e commented Mar 13, 2024

bert-e commented Mar 13, 2024

bert-e commented Mar 13, 2024

jonathan-gramain Mar 13, 2024

nicolas2bert Mar 13, 2024

bert-e commented Mar 14, 2024

nicolas2bert commented Mar 14, 2024

bert-e commented Mar 14, 2024

bert-e commented Mar 14, 2024

nicolas2bert commented Mar 14, 2024

bert-e commented Mar 14, 2024

bert-e commented Mar 14, 2024

bert-e commented Mar 14, 2024

bert-e commented Mar 19, 2024

bert-e commented Mar 19, 2024

bert-e commented Mar 20, 2024

nicolas2bert commented Mar 25, 2024

bert-e commented Mar 25, 2024

bert-e commented Mar 25, 2024

CLDSRV-518 Duplication of version ID in metadata #5548

CLDSRV-518 Duplication of version ID in metadata #5548

Conversation

nicolas2bert commented Mar 12, 2024

bert-e commented Mar 12, 2024

Hello nicolas2bert,

bert-e commented Mar 12, 2024

Incorrect fix version

nicolas2bert commented Mar 12, 2024

bert-e commented Mar 12, 2024

Request integration branches

nicolas2bert commented Mar 12, 2024

bert-e commented Mar 12, 2024

Conflict

bert-e commented Mar 12, 2024

Conflict

bert-e commented Mar 12, 2024

Conflict

bert-e commented Mar 13, 2024

Conflict

bert-e commented Mar 13, 2024

Integration data created

bert-e commented Mar 13, 2024

Waiting for approval

jonathan-gramain Mar 13, 2024

Choose a reason for hiding this comment

nicolas2bert Mar 13, 2024

Choose a reason for hiding this comment

bert-e commented Mar 14, 2024

History mismatch

nicolas2bert commented Mar 14, 2024

bert-e commented Mar 14, 2024

Lossy reset warning

bert-e commented Mar 14, 2024

History mismatch

nicolas2bert commented Mar 14, 2024

bert-e commented Mar 14, 2024

Reset complete

bert-e commented Mar 14, 2024

Conflict

bert-e commented Mar 14, 2024

Conflict

bert-e commented Mar 19, 2024

Conflict

bert-e commented Mar 19, 2024

Conflict

bert-e commented Mar 20, 2024

Waiting for approval

nicolas2bert commented Mar 25, 2024

bert-e commented Mar 25, 2024

In the queue

bert-e commented Mar 25, 2024