rgw: Ensure buckets too old to decode a layout have layout logs #43778
Conversation
This file contains 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
cbodley
approved these changes
Nov 2, 2021
adamemerson
force-pushed
the
wip-53132
branch
from
168e544
to
3db5dc2
Compare
|
Jenkins, retest this please. |
|
@cbodley I think this looks reasonable, the failures appear to be pubsub related. https://pulpito.ceph.com/aemerson-2021-11-02_23:30:11-rgw-wip-53132-distro-basic-smithi/ |
|
jenkins test make check |
|
looks great @adamemerson, this can merge once jenkins is happy |
|
Jenkins test make check |
|
dangit jenkins! |
|
jenkins test make check |
When decoding `RGWBucketInfo` data from before Pacific, we won't call `rgw::BucketLayout::decode`, but will instead synthesize the layout information. This leaves the `rgw::BucketLayout::logs` empty, as the fallback to populate it only applies to old versions of `rgw::BucketLayout`. Add a check at the end of `RGWBUcketInfo::decode` to populate it if empty. Fixes: https://tracker.ceph.com/issues/53132 Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
adamemerson
force-pushed
the
wip-53132
branch
from
3db5dc2
to
3279509
Compare
cbodley
approved these changes
Nov 3, 2021
|
Jenkins run api test |
|
jenkins test api |
1 similar comment
|
jenkins test api |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When decoding
RGWBucketInfodata from before Pacific, we won't callrgw::BucketLayout::decode, but will instead synthesize the layoutinformation. This leaves the
rgw::BucketLayout::logsempty, as thefallback to populate it only applies to old versions of
rgw::BucketLayout.Add a check at the end of
RGWBUcketInfo::decodeto populate it ifempty.
Checklist