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

ARSN-392 Put metadata to a standalone null master breaks CloudServer CRUD #2215

Merged
merged 2 commits into from
Feb 20, 2024

Conversation

nicolas2bert
Copy link
Contributor

@nicolas2bert nicolas2bert commented Feb 12, 2024

Functionally tested here: scality/cloudserver#5531

Notes:

NOTE1: This change is only impacting the "file" metadata backend logic. Similar fixes will be implemented in scality/Metadata using Arsenal.updateOrAppendNullVersionId() method.
NOTE2: null version key is handled very differently from development/7.10 to development/7.70 where:

Description:

cbe6a5e: File backend should be "mocking" the V0 metadata backend. To fix it, we imported the V0 processVersionSpecificPut from scality/Metadata.

46258bc:

  • Add the nullVersionId field into the master update. The nullVersionId is needed for listing, retrieving, and deleting null versions.

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

This logic is used by CRR replication feature to BackbeatClient.putMetadata on top of a null version
@bert-e
Copy link
Contributor

bert-e commented Feb 12, 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.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Feb 12, 2024

Incorrect fix version

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

  • None

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

  • 7.10.58

  • 7.70.24

  • 8.1.123

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

@nicolas2bert nicolas2bert changed the title ARSN-392 Put metadata to a null version breaks CloudServer CRUD ARSN-392 Put metadata to a standalone null master breaks CloudServer CRUD Feb 12, 2024
@bert-e
Copy link
Contributor

bert-e commented Feb 14, 2024

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.

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.

LGTM, just a few suggestions to improve the moved code

lib/versioning/Version.ts Show resolved Hide resolved
lib/versioning/Version.ts Outdated Show resolved Hide resolved
lib/versioning/Version.ts Outdated Show resolved Hide resolved
lib/versioning/Version.ts Outdated Show resolved Hide resolved
- Add the nullVersionId field into the master update. The nullVersionId is needed for listing, retrieving, and deleting null version.

- Manage scenarios in which a version is marked with the isNull attribute set to true, but without a version ID.
It happens after BackbeatClient.putMetadata() is applied to a standalone null master.
@nicolas2bert
Copy link
Contributor Author

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Feb 20, 2024

Conflict

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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Feb 20, 2024

Integration data created

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

The following branches will NOT be impacted:

  • development/6.4
  • 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 Feb 20, 2024

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

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Feb 20, 2024

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.1

The following branches will NOT be impacted:

  • development/6.4
  • 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 Feb 20, 2024

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

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.1

The following branches have NOT changed:

  • development/6.4
  • development/7.4

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

Goodbye nicolas2bert.

@bert-e bert-e merged commit 5f4d7af into development/7.10 Feb 20, 2024
5 checks passed
@bert-e bert-e deleted the bugfix/ARSN-392/null branch February 20, 2024 14:09
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.

4 participants