bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1028

jonathan-gramain · 2020-05-19T21:44:17Z

The two listing methods Delimiter and DelimiterMaster now support v1
versioning key format in addition to v0.

Modify the listing algo classes to support buckets in v1 versioning
key format, in addition to v0.

Enhance existing unit tests to check the result of getMDParams()

Requires merging PR #1018 first.

bert-e · 2020-05-19T21:44:19Z

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 · 2020-05-19T21:44:30Z

Integration data created

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

this pull request will merge bugfix/S3C-2899-vformatV1delimiterMaster into
development/7.4
w/7.7/bugfix/S3C-2899-vformatV1delimiterMaster will be merged into development/7.7 (pull request INTEGRATION [PR#1028 > development/7.7] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1029)
w/8.1/bugfix/S3C-2899-vformatV1delimiterMaster will be merged into development/8.1 (pull request INTEGRATION [PR#1028 > development/8.1] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1030)

The following branches will NOT be impacted:

development/6.4
stabilization/7.4.6

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

bert-e · 2020-05-19T21:44:32Z

Waiting for approval

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

the author
2 peers

Peer approvals must include a mandatory approval from @jonathan-gramain.

miniscruff · 2020-05-19T22:08:28Z

lib/algos/list/delimiterMaster.js

    skipping() {
+        if (this.vFormat === BucketVersioningKeyFormat.v0) {


Just want to mention the idea of having each version be either a class or an object instead of putting a bunch of these if's around. Could have just one if in a factory method somewhere then everything else is standard.
Mabye a base Bucket Version class if there is a lot of similarities.
Alternatively, an object that maps the v0 and v1 methods around in one place.
Something along the lines of:

const versionRouter = { [BucketVersioningKeyFormat.v0]: { skipping: this.skippingV0, other: this.otherv0, }, [BucketVersioningKeyFormat.v1]: { etc } } // then map through this: versionRouter[this.vFormat].skipping() // make wrap it with a check the version exists if required

Anyway, just ideas.

It sounds better indeed since there is a common pattern, especially after the migration states are introduced (v0 to v1)

miniscruff · 2020-05-19T22:11:26Z

tests/unit/algos/list/tools.js

+            },
+        },
+    ];
+    testCases.forEach(testCase => {


I am pretty sure you can reduce some typing here by doing this:

testCases.forEach(({v0Params, v1Params}) => { // can then just use v0Params instead of testCase.v0Params }

Ah yeah, did not think about using object deconstruction here

bert-e · 2020-05-19T23:36:40Z

History mismatch

Merge commit #24faf5e6ba5698a10bf0037b71ca8e6ec93fe2d1 on the integration branch
w/7.7/bugfix/S3C-2899-vformatV1delimiterMaster is merging a branch which is neither the current
branch bugfix/S3C-2899-vformatV1delimiterMaster nor the development branch
development/7.7.

It is likely due to a rebase of the branch bugfix/S3C-2899-vformatV1delimiterMaster 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.

jonathan-gramain · 2020-05-19T23:38:44Z

@bert-e reset

bert-e · 2020-05-19T23:38:53Z

Reset complete

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

bert-e · 2020-05-19T23:39:05Z

Integration data created

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

this pull request will merge bugfix/S3C-2899-vformatV1delimiterMaster into
development/7.4
w/7.7/bugfix/S3C-2899-vformatV1delimiterMaster will be merged into development/7.7 (pull request INTEGRATION [PR#1028 > development/7.7] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1039)
w/8.1/bugfix/S3C-2899-vformatV1delimiterMaster will be merged into development/8.1 (pull request INTEGRATION [PR#1028 > development/8.1] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1040)

The following branches will NOT be impacted:

development/6.4
stabilization/7.4.6

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

bert-e · 2020-05-19T23:39:07Z

Waiting for approval

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

the author
2 peers

Peer approvals must include a mandatory approval from @jonathan-gramain.

The two listing methods Delimiter and DelimiterMaster now support v1 versioning key format in addition to v0. Modify the listing algo classes to support buckets in v1 versioning key format, in addition to v0. Enhance existing unit tests to check the result of getMDParams()

bert-e · 2020-05-19T23:45:24Z

History mismatch

Merge commit #b431e35857eb1715ad5038b817bad58dd18c94cf on the integration branch
w/7.7/bugfix/S3C-2899-vformatV1delimiterMaster is merging a branch which is neither the current
branch bugfix/S3C-2899-vformatV1delimiterMaster nor the development branch
development/7.7.

It is likely due to a rebase of the branch bugfix/S3C-2899-vformatV1delimiterMaster 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.

jonathan-gramain · 2020-05-19T23:46:18Z

@bert-e reset

bert-e · 2020-05-19T23:46:45Z

Reset complete

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

bert-e · 2020-05-19T23:47:28Z

Integration data created

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

this pull request will merge bugfix/S3C-2899-vformatV1delimiterMaster into
development/7.4
w/7.7/bugfix/S3C-2899-vformatV1delimiterMaster will be merged into development/7.7 (pull request INTEGRATION [PR#1028 > development/7.7] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1045)
w/8.1/bugfix/S3C-2899-vformatV1delimiterMaster will be merged into development/8.1 (pull request INTEGRATION [PR#1028 > development/8.1] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1046)

The following branches will NOT be impacted:

development/6.4
stabilization/7.4.6

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

bert-e · 2020-05-19T23:47:29Z

Waiting for approval

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

the author
2 peers

Peer approvals must include a mandatory approval from @jonathan-gramain.

bert-e · 2020-05-20T05:40:41Z

Branches have diverged

This pull request's source branch bugfix/S3C-2899-vformatV1delimiterMaster has diverged from
development/8.1 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

Merge origin/development/8.1 into bugfix/S3C-2899-vformatV1delimiterMaster
Rebase bugfix/S3C-2899-vformatV1delimiterMaster onto origin/development/8.1

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

bert-e · 2020-05-20T05:41:04Z

Waiting for approval

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

the author
2 peers

Peer approvals must include a mandatory approval from @jonathan-gramain.

jonathan-gramain · 2020-05-20T22:39:18Z

@bert-e approve

bert-e · 2020-05-20T22:39:31Z

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.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 · 2020-05-20T22:42:02Z

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

✔️ development/7.4
✔️ 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-2899.

Goodbye jonathan-gramain.

bert-e mentioned this pull request May 19, 2020

INTEGRATION [PR#1028 > development/7.7] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1029

Closed

bert-e mentioned this pull request May 19, 2020

INTEGRATION [PR#1028 > development/8.1] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1030

Closed

miniscruff approved these changes May 19, 2020

View reviewed changes

miniscruff reviewed May 19, 2020

View reviewed changes

miniscruff approved these changes May 19, 2020

View reviewed changes

jonathan-gramain mentioned this pull request May 19, 2020

bugfix: S3C-2899 implement v1 format for DelimiterVersions listing #1031

Merged

jonathan-gramain force-pushed the bugfix/S3C-2899-vformatV1delimiterMaster branch from 24faf5e to a3e73fe Compare May 19, 2020 23:36

jonathan-gramain force-pushed the bugfix/S3C-2899-vformatV1delimiterMaster branch from a3e73fe to 334c2bf Compare May 19, 2020 23:38

bert-e mentioned this pull request May 19, 2020

INTEGRATION [PR#1028 > development/7.7] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1039

Closed

bert-e mentioned this pull request May 19, 2020

INTEGRATION [PR#1028 > development/8.1] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1040

Closed

jonathan-gramain force-pushed the bugfix/S3C-2899-vformatV1delimiterMaster branch from 334c2bf to fb89b4e Compare May 19, 2020 23:45

This was referenced May 19, 2020

INTEGRATION [PR#1028 > development/7.7] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1045

Merged

INTEGRATION [PR#1028 > development/8.1] bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1046

Merged

jonathan-gramain changed the base branch from development/7.4 to development/8.1 May 20, 2020 05:40

jonathan-gramain changed the base branch from development/8.1 to development/7.4 May 20, 2020 05:40

alexanderchan-scality approved these changes May 20, 2020

View reviewed changes

bert-e merged commit cd9bdcf into development/7.4 May 20, 2020

bert-e deleted the bugfix/S3C-2899-vformatV1delimiterMaster branch May 20, 2020 22:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1028

bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1028

jonathan-gramain commented May 19, 2020 •

edited

Loading

bert-e commented May 19, 2020

bert-e commented May 19, 2020

bert-e commented May 19, 2020

miniscruff May 19, 2020 •

edited

Loading

jonathan-gramain May 19, 2020

jonathan-gramain May 19, 2020

miniscruff May 19, 2020

jonathan-gramain May 19, 2020

jonathan-gramain May 19, 2020

bert-e commented May 19, 2020

jonathan-gramain commented May 19, 2020

bert-e commented May 19, 2020

bert-e commented May 19, 2020

bert-e commented May 19, 2020

bert-e commented May 19, 2020

jonathan-gramain commented May 19, 2020

bert-e commented May 19, 2020

bert-e commented May 19, 2020

bert-e commented May 19, 2020

bert-e commented May 20, 2020

bert-e commented May 20, 2020

jonathan-gramain commented May 20, 2020

bert-e commented May 20, 2020

bert-e commented May 20, 2020

		skipping() {
		if (this.vFormat === BucketVersioningKeyFormat.v0) {

bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1028

bugfix: S3C-2899 support v1 in Delimiter, DelimiterMaster #1028

Conversation

jonathan-gramain commented May 19, 2020 • edited Loading

bert-e commented May 19, 2020

Hello jonathan-gramain,

bert-e commented May 19, 2020

Integration data created

bert-e commented May 19, 2020

Waiting for approval

miniscruff May 19, 2020 • edited Loading

Choose a reason for hiding this comment

jonathan-gramain May 19, 2020

Choose a reason for hiding this comment

jonathan-gramain May 19, 2020

Choose a reason for hiding this comment

miniscruff May 19, 2020

Choose a reason for hiding this comment

jonathan-gramain May 19, 2020

Choose a reason for hiding this comment

jonathan-gramain May 19, 2020

Choose a reason for hiding this comment

bert-e commented May 19, 2020

History mismatch

jonathan-gramain commented May 19, 2020

bert-e commented May 19, 2020

Reset complete

bert-e commented May 19, 2020

Integration data created

bert-e commented May 19, 2020

Waiting for approval

bert-e commented May 19, 2020

History mismatch

jonathan-gramain commented May 19, 2020

bert-e commented May 19, 2020

Reset complete

bert-e commented May 19, 2020

Integration data created

bert-e commented May 19, 2020

Waiting for approval

bert-e commented May 20, 2020

Branches have diverged

bert-e commented May 20, 2020

Waiting for approval

jonathan-gramain commented May 20, 2020

bert-e commented May 20, 2020

In the queue

bert-e commented May 20, 2020

jonathan-gramain commented May 19, 2020 •

edited

Loading

miniscruff May 19, 2020 •

edited

Loading