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

Improvement/arsn 420 introduce put object hack #2249

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Improvement/arsn 420 introduce put object hack #2249

merged 2 commits into from
Jul 16, 2024

Conversation

benzekrimaha
Copy link
Contributor

@benzekrimaha benzekrimaha commented Jul 2, 2024 •
edited by francoisferrand
Loading

Details on the implementation are within the commit description

Issue : ARSN-420

@bert-e
Copy link
Contributor

bert-e commented Jul 2, 2024

Hello benzekrimaha,

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.

@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-420-introduce-put-object-hack branch from 5af79f8 to 151bab4 Compare July 2, 2024 06:39
@bert-e
Copy link
Contributor

bert-e commented Jul 2, 2024

Waiting for approval

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

  • the author

  • 2 peers

@scality scality deleted a comment from bert-e Jul 3, 2024
francoisferrand
francoisferrand approved these changes Jul 5, 2024
View reviewed changes
lib/storage/metadata/mongoclient/MongoClientInterface.js Outdated
Comment on lines 925 to 936
const key = formatMasterKey(objName, params.vFormat);
const putFilter = { _id: key };
return collection.updateOne(putFilter, {
$set: {
_id: masterKey,
value: objVal,
_id: key,
value,
},
}, {
upsert: true,
}).then(() => cb()).catch((err) => {
log.error('putObjectNoVer: error putting obect with no versioning', { error: err.message });
}).then(() => cb()).catch(err => {
log.error('internalPutObject: error putting object',
{ bucket: bucketName, object: key, error: err.message });
return cb(errors.InternalError);
Copy link
Contributor

Choose a reason for hiding this comment

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

probably no point changing this, old code works just as well ?
(and putObjectNoVer: error putting obect with no versioning error message was more appropriate, giving details about which part of the code fails...)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

code was kept as is, the error message is fixed here : 043b64c#diff-9c207befbd8f4d79a3b6e3d7d143444e804ca1684236b8fd9fa0f9e03c53477aR935

lib/storage/metadata/mongoclient/MongoClientInterface.js Outdated
const putFilter = { _id: key };
// filter used when finding and updating object
const findFilter = Object.assign({
_id: key,
Copy link
Contributor

Choose a reason for hiding this comment

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

redundant with , putFilter a few lines below...

also, whenever possible, prefer to use ... to "unpack" object instead of Object.assign, as it will be easier to migrate to typescript

Suggested change
_id: key,
const findFilter = {
...putFilter,
$or: [
{ 'value.deleted': { $exists: false } },
{ 'value.deleted': { $eq: false } },
],
};

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done here : 043b64c#diff-9c207befbd8f4d79a3b6e3d7d143444e804ca1684236b8fd9fa0f9e03c53477aR961-R971

lib/storage/metadata/mongoclient/MongoClientInterface.js Show resolved Hide resolved
Kerkesni
Kerkesni reviewed Jul 8, 2024
View reviewed changes
lib/storage/metadata/mongoclient/MongoClientInterface.js Outdated
}, {
upsert: false,
}).then(doc => {
log.info('doc value', { doc: doc.value });
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this a leftover from debugging ?

Kerkesni
Kerkesni reviewed Jul 8, 2024
View reviewed changes
lib/storage/metadata/mongoclient/MongoClientInterface.js Outdated
Comment on lines 962 to 972
const findFilter = Object.assign({
_id: key,
$or: [
{ 'value.deleted': { $exists: false } },
{ 'value.deleted': { $eq: false } },
],
}, putFilter);
const updateDeleteFilter = Object.assign({
'_id': key,
'value.deleted': true,
}, putFilter);
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure what's the point of Object.assign since we already set the _id key in the filters ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

indeed , fixed here : 043b64c#diff-9c207befbd8f4d79a3b6e3d7d143444e804ca1684236b8fd9fa0f9e03c53477aR961-R971

@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-420-introduce-put-object-hack branch from 100e4b9 to 36b7bd2 Compare July 15, 2024 13:17
@benzekrimaha
ARSN-420: putObjectNoVar function update with hack
e3e4b2a 
We agreed on Introducing the same “hack” as in internalDelete function,
so write the MD twice in the oplog: one "deleted: true" copy of the previous MD,
followed by the expected update with the new metadata
@benzekrimaha benzekrimaha force-pushed the improvement/ARSN-420-introduce-put-object-hack branch from 36b7bd2 to e3e4b2a Compare July 15, 2024 13:19
@scality scality deleted a comment from bert-e Jul 15, 2024
@scality scality deleted a comment from bert-e Jul 16, 2024
@benzekrimaha
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jul 16, 2024

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

  • ✔️ development/8.1

The following branches have NOT changed:

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

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

Goodbye benzekrimaha.

The following options are set: approve

@bert-e bert-e merged commit 817bb83 into development/8.1 Jul 16, 2024
5 checks passed
@bert-e bert-e deleted the improvement/ARSN-420-introduce-put-object-hack branch July 16, 2024 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@williamlardier williamlardier williamlardier approved these changes

@francoisferrand francoisferrand francoisferrand approved these changes

@Kerkesni Kerkesni Awaiting requested review from Kerkesni

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

Successfully merging this pull request may close these issues.
5 participants
@benzekrimaha @bert-e @francoisferrand @Kerkesni @williamlardier