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.

Sign up for GitHub

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

Jump to bottom

ARSN-419 Cherry-pick change to fix CRR null version in Metadata #2246

Merged
merged 4 commits into from
Jun 20, 2024
Merged

ARSN-419 Cherry-pick change to fix CRR null version in Metadata #2246

merged 4 commits into from
Jun 20, 2024

Conversation

nicolas2bert
Copy link
Contributor

@nicolas2bert nicolas2bert commented Jun 19, 2024 •
edited
Loading

Cherry-picking from development/7.70 branch.
The code has already been reviewed.

@nicolas2bert
ARSN-392 Import the V0 processVersionSpecificPut from Metadata
344c287 
This logic is used by CRR replication feature to BackbeatClient.putMetadata on top of a null version

(cherry picked from commit 40e271f)
(cherry picked from commit 7be2ca2)
@nicolas2bert
ARSN-392 Fix processVersionSpecificPut
2868ee5 
- For backward compatibility (if isNull is undefined), add the nullVersionId field to the master update. The nullVersionId is needed for listing, retrieving, and deleting null versions.

- For the new null key implementation (if isNull is defined): add the isNull2 field and set it to true to specify that the new version is null AND has been put with a Cloudserver handling null keys (i.e., supporting S3C-7352).

- Manage scenarios in which a version is marked with the isNull attribute set to true, but without a version ID. This happens after BackbeatClient.putMetadata() is applied to a standalone null master.

(cherry picked from commit 6820444)
(cherry picked from commit 8367e8a)
@bert-e
Copy link
Contributor

bert-e commented Jun 19, 2024

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

bert-e commented Jun 19, 2024

Incorrect fix version

The Fix Version/s in issue ARSN-419 contains:

  • None

Considering where you are trying to merge, I expected to find at least:

  • 7.70.20.1

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

@bert-e
Copy link
Contributor

bert-e commented Jun 19, 2024

Waiting for approval

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

  • the author

  • 2 peers

jonathan-gramain
jonathan-gramain approved these changes Jun 19, 2024
View reviewed changes
Copy link
Contributor

@jonathan-gramain jonathan-gramain left a comment

Choose a reason for hiding this comment

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

It may not matter but the version bump is not the last commit, may lead to confusion on which commit is the latest included in the release, approving as the tag should be created correctly.

@nicolas2bert nicolas2bert force-pushed the bugfix/ARSN-419/fix-crr-null-version branch from 70ecf41 to 9a4fa57 Compare June 20, 2024 08:49
@nicolas2bert
Copy link
Contributor Author

@jonathan-gramain yes, it is a mistake on my side.

@nicolas2bert
Copy link
Contributor Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Jun 20, 2024

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

  • ✔️ hotfix/7.70.20

The following branches have NOT changed:

  • development/6.4
  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.1

Please check the status of the associated issue ARSN-419.

Goodbye nicolas2bert.

The following options are set: approve

@bert-e bert-e merged commit 9a4fa57 into hotfix/7.70.20 Jun 20, 2024
5 checks passed
@bert-e bert-e deleted the bugfix/ARSN-419/fix-crr-null-version branch June 20, 2024 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonathan-gramain jonathan-gramain jonathan-gramain approved these changes

@BourgoisMickael BourgoisMickael BourgoisMickael approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nicolas2bert @bert-e @jonathan-gramain @BourgoisMickael