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

bugfix: S3C-2726 remove some default attributes from ObjectMD #988

Conversation

jonathan-gramain
Copy link
Contributor

@jonathan-gramain jonathan-gramain commented Apr 22, 2020

Remove "nullVersionId", "isNull" and "isDeleteMarker" default values
from ObjectMD model, instead of the previous '' (empty string) default
value that was incorrect and could cause an issue by misinterpreting
the empty "nullVersionId" as an actual null version ID.

The original issue as reported in the Jira ticket is tested in a new integration test case: https://github.com/scality/Integration/pull/731

Remove "nullVersionId", "isNull" and "isDeleteMarker" default values
from ObjectMD model, instead of the previous '' (empty string) default
value that was incorrect and could cause an issue by misinterpreting
the empty "nullVersionId" as an actual null version ID.
@bert-e
Copy link
Contributor

bert-e commented Apr 22, 2020

Hello jonathan-gramain,

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 Apr 22, 2020

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/bugfix/S3C-2726-removeSomeDefaultAttributesFromObjectMD with contents from w/7.7/bugfix/S3C-2726-removeSomeDefaultAttributesFromObjectMD
and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/bugfix/S3C-2726-removeSomeDefaultAttributesFromObjectMD origin/development/8.1
 $ git merge origin/w/7.7/bugfix/S3C-2726-removeSomeDefaultAttributesFromObjectMD
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/S3C-2726-removeSomeDefaultAttributesFromObjectMD

@bert-e
Copy link
Contributor

bert-e commented Apr 22, 2020

Integration data created

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

The following branches will NOT be impacted:

  • development/6.4
  • stabilization/7.4.5
  • stabilization/7.6.0

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented Apr 22, 2020

Waiting for approval

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

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

'versionId': undefined, // If no versionId, it should be undefined
// versionId, isNull, nullVersionId and isDeleteMarker
// should be undefined when not set explicitly
'isNull': undefined,
Copy link
Contributor

@nicolas2bert nicolas2bert Apr 22, 2020

Choose a reason for hiding this comment

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

'isNull' and 'isDeleteMarker' are booleans and could be set to false by default?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wanted to stay consistent with what cloudserver writes when it puts a new object, which has no such attributes in the metadata.

Copy link
Collaborator

@rahulreddy rahulreddy left a comment

Choose a reason for hiding this comment

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

The reason these attributes are an empty string is because undefined ones don't make it past JSON.stringify. If there are going to be conditional attributes that may break some parts of the code where the checks are not done properly, right?

@jonathan-gramain
Copy link
Contributor Author

@rahulreddy if you mean by this that the attributes will not be present in the metadata if they are undefined, yes, and it's already the case since those attributes are not set by Cloudserver when they are not needed today (Cloudserver does not use ObjectMD for most parts).

@jonathan-gramain
Copy link
Contributor Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Apr 27, 2020

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

  • ✔️ development/7.6

  • ✔️ development/7.7

  • ✔️ development/8.1

The following branches will NOT be impacted:

  • development/6.4
  • stabilization/7.4.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: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 27, 2020

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

  • ✔️ development/7.4

  • ✔️ development/7.6

  • ✔️ development/7.7

  • ✔️ development/8.1

The following branches have NOT changed:

  • development/6.4
  • stabilization/7.4.6

Please check the status of the associated issue S3C-2726.

Goodbye jonathan-gramain.

@bert-e bert-e merged commit bbfc32e into development/7.4 Apr 27, 2020
@bert-e bert-e deleted the bugfix/S3C-2726-removeSomeDefaultAttributesFromObjectMD branch April 27, 2020 18:26
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.

7 participants