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

Fix user MD and tags getting deleted when restoring #5215

Merged
merged 3 commits into from
Aug 10, 2023
Merged

Fix user MD and tags getting deleted when restoring #5215

merged 3 commits into from
Aug 10, 2023

Conversation

KillianG
Copy link
Contributor

@KillianG KillianG commented Jun 22, 2023 •
edited by francoisferrand
Loading

Issue: CLDSRV-408

@bert-e
Copy link
Contributor

bert-e commented Jun 22, 2023

Hello killiang,

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.

@KillianG KillianG changed the base branch from development/8.8 to development/8.7 June 22, 2023 12:35
@scality scality deleted a comment from bert-e Jun 22, 2023
@bert-e
Copy link
Contributor

bert-e commented Jun 22, 2023

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
  • development/7.70
  • development/8.6

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

@scality scality deleted a comment from bert-e Jun 22, 2023
@KillianG KillianG force-pushed the improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring branch 3 times, most recently from e960bb5 to 33382bf Compare June 28, 2023 14:34
@bert-e
Copy link
Contributor

bert-e commented Jun 28, 2023

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
  • development/7.70
  • development/8.6

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

@bert-e
Copy link
Contributor

bert-e commented Jun 28, 2023

Waiting for approval

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

  • the author

  • 2 peers

@KillianG KillianG force-pushed the improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring branch from 5024cac to 4cdeeca Compare June 28, 2023 15:48
@bert-e
Copy link
Contributor

bert-e commented Jun 28, 2023

History mismatch

Merge commit #5024cac0e4a3e5b2877981053c5fef376ff82b31 on the integration branch
w/8.8/improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring is merging a branch which is neither the current
branch improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring nor the development branch
development/8.8.

It is likely due to a rebase of the branch improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring 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.

@KillianG
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Jun 28, 2023

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Jun 28, 2023

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
  • development/7.70
  • development/8.6

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

@bert-e
Copy link
Contributor

bert-e commented Jun 28, 2023

Waiting for approval

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

  • the author

  • 2 peers

@KillianG KillianG requested a review from francoisferrand June 29, 2023 08:01
francoisferrand
francoisferrand reviewed Jul 3, 2023
View reviewed changes
Copy link
Contributor

@francoisferrand francoisferrand left a comment

Choose a reason for hiding this comment

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

Due to node.js "untyped" quality, the unit test do not ensure the code works : need to add extra "functional" tests in scality/cloudserver/tests/functional/aws-node-sdk/test/object/putVersion.js, which will ensure that:

  • update versioning is indeed called
  • the objMD it gets is indeed correctly filled
  • the resulting "metadataObject" has the field which match what is required by metadataStoreObject

@KillianG KillianG force-pushed the improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring branch from 1c49a9a to a76b3ac Compare July 5, 2023 15:47
@bert-e
Copy link
Contributor

bert-e commented Jul 5, 2023

History mismatch

Merge commit #319a4428c1233805362eb9d7cc9da5a9392a8fd7 on the integration branch
w/8.8/improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring is merging a branch which is neither the current
branch improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring nor the development branch
development/8.8.

It is likely due to a rebase of the branch improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring 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.

@scality scality deleted a comment from bert-e Aug 9, 2023
@scality scality deleted a comment from KillianG Aug 9, 2023
@scality scality deleted a comment from bert-e Aug 9, 2023
@scality scality deleted a comment from bert-e Aug 9, 2023
@scality scality deleted a comment from KillianG Aug 9, 2023
@scality scality deleted a comment from bert-e Aug 9, 2023
@scality scality deleted a comment from bert-e Aug 9, 2023
@scality scality deleted a comment from Kerkesni Aug 9, 2023
@scality scality deleted a comment from bert-e Aug 9, 2023
@Kerkesni Kerkesni force-pushed the improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring branch from 8299473 to a264b96 Compare August 10, 2023 10:38
@Kerkesni
keep same object properties after a restore of a cold object
1ee44bc 
Object properties such as ACLs and custom user metadata should
not be removed after the restore of a cold object.

Issue: CLDSRV-408
@Kerkesni Kerkesni force-pushed the improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring branch from a264b96 to b3e731e Compare August 10, 2023 10:59
@scality scality deleted a comment from bert-e Aug 10, 2023
@scality scality deleted a comment from bert-e Aug 10, 2023
@scality scality deleted a comment from bert-e Aug 10, 2023
@Kerkesni Kerkesni force-pushed the improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring branch from d810802 to 0261ad5 Compare August 10, 2023 13:18
@Kerkesni Kerkesni force-pushed the improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring branch from 0261ad5 to 20a08a2 Compare August 10, 2023 14:04
@scality scality deleted a comment from bert-e Aug 10, 2023
@scality scality deleted a comment from bert-e Aug 10, 2023
@scality scality deleted a comment from bert-e Aug 10, 2023
@scality scality deleted a comment from bert-e Aug 10, 2023
@scality scality deleted a comment from bert-e Aug 10, 2023
@bert-e
Copy link
Contributor

bert-e commented Aug 10, 2023

Waiting for approval

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

  • the author

  • 2 peers

@francoisferrand
Copy link
Contributor

/bypass_author_approval

@bert-e
Copy link
Contributor

bert-e commented Aug 10, 2023

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/8.7

  • ✔️ development/8.8

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.6

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

@bert-e
Copy link
Contributor

bert-e commented Aug 10, 2023

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

  • ✔️ development/8.7

  • ✔️ development/8.8

The following branches have NOT changed:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.6

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

Goodbye killiang.

@bert-e bert-e merged commit 20a08a2 into development/8.7 Aug 10, 2023
@bert-e bert-e deleted the improvement/CLDSRV-408-Fix-metadata-getting-deleted-when-restoring branch August 10, 2023 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@francoisferrand francoisferrand francoisferrand approved these changes

@nicolas2bert nicolas2bert nicolas2bert approved these changes

@Kerkesni Kerkesni Awaiting requested review from Kerkesni

@jonathan-gramain jonathan-gramain Awaiting requested review from jonathan-gramain

@KazToozs KazToozs Awaiting requested review from KazToozs

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

Successfully merging this pull request may close these issues.
6 participants
@KillianG @bert-e @nicolas2bert @francoisferrand @KazToozs @Kerkesni