rgw/multisite_reshard: pass the right generation number for bilog listing#41661
Merged
smanjara merged 1 commit intoceph:wip-rgw-multisite-reshardfrom Jun 3, 2021
Conversation
smanjara
commented
Jun 2, 2021
src/rgw/rgw_data_sync.cc
Outdated
| yield call(new RGWSyncBucketShardCR(sc, data_lease_cr, sync_pair, | ||
| sync_pipe, bucket_status.state, | ||
| tn, progress)); | ||
| *gen, tn, progress)); |
Contributor
There was a problem hiding this comment.
no, it looks like we should use bucket_status.incremental_gen here instead?
if we get a gen, the if (gen) { block above will compare it with bucket_status.incremental_gen and return if they don't match
Contributor
Author
There was a problem hiding this comment.
@cbodley ok but passing bucket_status.incremental_gen doesn't help fix the issue though.
Contributor
Author
There was a problem hiding this comment.
hmm it works in both cases actually.
07884b9 to
76f7a71
Compare
…ting Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
76f7a71 to
74def4d
Compare
cbodley
approved these changes
Jun 2, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
passes
test_bucket_reshard_incrementalSigned-off-by: Shilpa Jagannath smanjara@redhat.com
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox