backbeat icon indicating copy to clipboard operation
backbeat copied to clipboard

Allow replication of null master version

Open nicolas2bert opened this issue 1 year ago • 4 comments

  • if it is a "standalone null master key": created when an object is placed in a non-versioned bucket, which is then converted to a versioned bucket. If no new versioned objects are added for that object, it appears as a standalone null master key with no version id.
  • if it is a master suspended null version: created when a bucket versioning gets suspended and then an object is put.

NOTE 1: Null versions are not being replicated unless triggered by CrrExistingObject s3utils script (or OOB Ingested in Zenko/Artesca) NOTE 2: Backporting existing Artesca logic (c.f. cherry-picks) with an end goal to merge Artesca and Ring branches.

nicolas2bert avatar May 01 '24 07:05 nicolas2bert

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 :star:
/bypass_build_status Bypass the build and test status :star:
/bypass_commit_size Bypass the check on the size of the changeset TBA :star:
/bypass_incompatible_branch Bypass the check on the source branch prefix :star:
/bypass_jira_check Bypass the Jira issue check :star:
/bypass_peer_approval Bypass the pull request peers' approval :star:
/bypass_leader_approval Bypass the pull request leaders' approval :star:
/approve Instruct Bert-E that the author has approved the pull request. :writing_hand:
/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 avatar May 01 '24 07:05 bert-e

Incorrect fix version

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

  • None

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

  • 7.70.13

  • 8.5.5

  • 8.6.43

  • 8.7.0

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

bert-e avatar May 01 '24 07:05 bert-e

ping

nicolas2bert avatar May 01 '24 07:05 nicolas2bert

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.

bert-e avatar May 01 '24 07:05 bert-e

/create_integration_branches

nicolas2bert avatar May 16 '24 13:05 nicolas2bert

Conflict

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

The following options are set: create_integration_branches

bert-e avatar May 16 '24 13:05 bert-e

Integration data created

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

The following branches will NOT be impacted:

  • development/7.10
  • 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 avatar May 16 '24 14:05 bert-e

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

bert-e avatar May 16 '24 14:05 bert-e

@bert-e approve

nicolas2bert avatar May 17 '24 08:05 nicolas2bert

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

  • :heavy_check_mark: development/7.70

  • :heavy_check_mark: development/8.5

  • :heavy_check_mark: development/8.6

  • :heavy_check_mark: development/8.7

The following branches have NOT changed:

  • development/7.10
  • development/7.4

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

Goodbye nicolas2bert.

The following options are set: approve, create_integration_branches

bert-e avatar May 17 '24 08:05 bert-e