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

BB-269 avoid clearing dataStoreVersionId when retrying a replication #2350

Merged
merged 1 commit into from
Jan 13, 2023

Conversation

Kerkesni
Copy link
Contributor

@Kerkesni Kerkesni commented Nov 23, 2022

Issue: BB-269

Replication has special code to handle replication of tags: in that case, it will not replicate the object again, but simply update the tags on the target object.

However, in the (unlikely) case where that tag update fails, the datastore version id will be reset when the entry is put in the replay queue:

    toRetryEntry(site) {
        return this.clone()
            .setReplicationBackends([{
                site,
                status: 'PENDING',
                dataStoreVersionId: '',
            }])
            .setReplicationStorageClass(site)
            .setReplicationStatus('PENDING');
    }

Consequently, the replay-processor would trigger a full replication of the object, and the data will be copied again.

@bert-e
Copy link
Contributor

bert-e commented Nov 23, 2022

Hello kerkesni,

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 Nov 23, 2022

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 Nov 23, 2022
@bert-e
Copy link
Contributor

bert-e commented Dec 14, 2022

Incorrect fix version

The Fix Version/s in issue BB-269 contains:

  • 8.5.4

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

  • 8.5.4

  • 8.6.0

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

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2022

Incorrect fix version

The Fix Version/s in issue BB-269 contains:

  • 8.5.4

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

  • 8.5.4

  • 8.6.1

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

@Kerkesni Kerkesni force-pushed the bugfix/BB-269 branch 3 times, most recently from b952604 to cffbd1f Compare December 19, 2022 14:42
@scality scality deleted a comment from bert-e Dec 19, 2022
@bert-e
Copy link
Contributor

bert-e commented Dec 19, 2022

Integration data created

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

  • this pull request will merge bugfix/BB-269 into
    development/8.5
  • w/8.6/bugfix/BB-269 will be merged into development/8.6

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4
  • development/8.3
  • development/8.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

@bert-e
Copy link
Contributor

bert-e commented Dec 19, 2022

Waiting for approval

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

  • the author

  • 2 peers

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.

LGTM, though it may be safer (as in "future proof") to rely more on the API provided by ObjectMD to perform the update we want:

this.clone()
            .setReplicationBackends(this.getReplicationBackends().filter(o => o.site === site))
            .setReplicationSiteStatus(site, PENDING)
            ...

@bert-e
Copy link
Contributor

bert-e commented Dec 20, 2022

History mismatch

Merge commit #cffbd1f344a8f2a98a965bd1e01ce1d4ca3c934c on the integration branch
w/8.6/bugfix/BB-269 is merging a branch which is neither the current
branch bugfix/BB-269 nor the development branch
development/8.6.

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

@Kerkesni
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Dec 20, 2022

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Dec 20, 2022

Integration data created

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

  • this pull request will merge bugfix/BB-269 into
    development/8.5
  • w/8.6/bugfix/BB-269 will be merged into development/8.6

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4
  • development/8.3
  • development/8.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

@bert-e
Copy link
Contributor

bert-e commented Dec 20, 2022

Waiting for approval

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

  • the author

  • 2 peers

@Kerkesni
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jan 13, 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.5

  • ✔️ development/8.6

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4
  • development/8.3
  • development/8.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

@bert-e
Copy link
Contributor

bert-e commented Jan 13, 2023

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

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches have NOT changed:

  • development/7.10
  • development/7.4
  • development/8.3
  • development/8.4

Please check the status of the associated issue BB-269.

Goodbye kerkesni.

@bert-e bert-e merged commit 2d80fcf into development/8.5 Jan 13, 2023
@bert-e bert-e deleted the bugfix/BB-269 branch January 13, 2023 15:33
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