nautilus: os/bluestore: list obj which equals to pend #44981
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
aclamk
approved these changes
Feb 14, 2022
trociny
approved these changes
Feb 14, 2022
neha-ojha
reviewed
Feb 15, 2022
ifed01
force-pushed
the
wip-ifed-fix-clist-pend-nau
branch
from
98df975
to
de4af9e
Compare
trociny
reviewed
Feb 16, 2022
| @@ -30,6 +30,7 @@ | |||
| #include "include/stringify.h" | |||
| #include "include/str_map.h" | |||
| #include "include/util.h" | |||
| #include "include/scope_guard.h" | |||
There was a problem hiding this comment.
nit: You seem to add this to a wrong commit. I would expect to see this in "os/bluestore: use scope_guard to log latency". And it is probably worth mentioning in the log message conflicts section.
There was a problem hiding this comment.
nit: You seem to add this to a wrong commit. I would expect to see this in "os/bluestore: use scope_guard to log latency". And it is probably worth mentioning in the log message conflicts section.
yep, fixed. Thanks!
simpler this way, and avoid using `goto`. Signed-off-by: Kefu Chai <tchaikov@gmail.com> (cherry picked from commit 715a838) Conflicts: src/os/bluestoreBlueStore.cc no header loaded to define make_scoped_guard
otherwise we could have failures like scrub : stat mismatch, got 3/4 objects, 1/2 clones, 3/4 dirty, 3/4 omap, 0/0 pinned, 0/0 hit_set_archive, 0/0 whiteouts, 49/56 bytes, 0/0 manifest objects, 0/0 hit_set_archive bytes." where the numbers of scrubbed object, clones, dirty and omap are always less than the total number of corresponding numbers, if the PG contains object(s) whose hash happens to be 0xffffffff. in this change, if the calculated hash of the upper bound is greater than the maximum possible number represented by uint32_t, in addition to setting the hash of the upper bound hobj to 0xffffffff, we also set the nspace of hobj of the upper bound to "\xff", so that the upper bound is greater than an hobj whose hash happens to be 0xfffffff. please note, the nspace of "\xff" is not an ascii string, so it's not likely to be less than a real-world nspace of an hobj. with this new *greater* upper bound, we are able to include the previous missing hobj when listing the objects in a PG. so the scrub won't be annoyed when the number of objects does not match. Fixes: https://tracker.ceph.com/issues/52705 Signed-off-by: Mykola Golub <mykola.golub@clyso.com> Signed-off-by: Kefu Chai <tchaikov@gmail.com> (cherry picked from commit ffab13b) Conflicts: src/os/bluestore/BlueStore.cc - trivial, different get_coll_range func signature formatting
ifed01
force-pushed
the
wip-ifed-fix-clist-pend-nau
branch
from
de4af9e
to
672331a
Compare
neha-ojha
approved these changes
Feb 16, 2022
|
jenkins test make check |
1 similar comment
|
jenkins test make check |
|
@neha-ojha - do you think I can proceed with the merge? make check failures look unrelated and I doubt we're planning to have QA run for Nautilus... |
|
@yuriw were you able to do a successful nautilus run, the last time you tried? |
|
jenkins retest this please |
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.
Just in case - let's backport this to Nautilus...
backport tracker: https://tracker.ceph.com/issues/52771
backport of #43289
parent tracker: https://tracker.ceph.com/issues/52705
Signed-off-by: Igor Fedotov igor.fedotov@croit.io
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 dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox