octopus: rgw: have "bucket check --fix" fix pool ids correctly #45456
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
reviewed
May 6, 2022
src/rgw/rgw_rados.cc
Outdated
|
|
||
| librados::IoCtx head_obj_ctx; // initialize to data pool so we can get pool id | ||
| const bool head_pool_found = | ||
| get_obj_head_ioctx(dpp, bucket_info, obj, &head_obj_ctx); |
There was a problem hiding this comment.
/ceph-15.2.16-99-g74a2b133/src/rgw/rgw_rados.cc: In member function ‘int RGWRados::check_disk_state(librados::v14_2_0::IoCtx, const RGWBucketInfo&, rgw_bucket_dir_entry&, rgw_bucket_dir_entry&, ceph::bufferlist&, optional_yield)’:
/ceph-15.2.16-99-g74a2b133/src/rgw/rgw_rados.cc:8953:24: error: ‘dpp’ was not declared in this scope
get_obj_head_ioctx(dpp, bucket_info, obj, &head_obj_ctx);
^~~
cbodley
approved these changes
May 9, 2022
The current code sets the pool id of bucket index entries to the bucket index pool rather than the data pool. This fixes that. Signed-off-by: J. Eric Ivancich <ivancich@redhat.com> (cherry picked from commit 4c2ac79) Conflicts: src/rgw/rgw_rados.cc Cherry-pick notes: - Conflict due to braces around if condition after change that weren't on Octopus - Octopus using dout vs. ldpp_dout
cfsnyder
force-pushed
the
wip-52991-octopus
branch
from
e571948
to
2eb9885
Compare
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.
backport tracker: https://tracker.ceph.com/issues/52991
backport of #43594
parent tracker: https://tracker.ceph.com/issues/52941
this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh