nautilus: core: Make dumping of reservation info congruent between scrub and recovery #31444
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
smithfarm
changed the title
dzafman
requested review from
neha-ojha and
tchaikov
and removed request for
neha-ojha
|
@dzafman this needs a rebase |
Signed-off-by: David Zafman <dzafman@redhat.com> (cherry picked from commit b98950e)
Signed-off-by: David Zafman <dzafman@redhat.com> (cherry picked from commit 8dffd68)
This is similar to how recovery reservations are split between local and remote. It was the case that scrubs_pending was used for reservations at the replicas as well as at the primary while requesting reservations from the replicas. There was no need for scrubs_pending to turn into scrubs_active at the primary as nothing treated that value as special. scrubber.active = true when scrubbing is actually going. Now scurbber.local_reserved indicates scrubs_local incremented Now scrubber.remote_reserved indicates scrubs_remote incremented Fixes: https://tracker.ceph.com/issues/41669 Signed-off-by: David Zafman <dzafman@redhat.com> (cherry picked from commit b3e1c58) Conflicts: src/osd/OSD.cc (lock differences) src/osd/OSD.h (lock differences) src/osd/PG.cc (re-applied changes due to code location diff)
Signed-off-by: David Zafman <dzafman@redhat.com>
|
@neha-ojha Rebased |
neha-ojha
approved these changes
Nov 14, 2019
tchaikov
approved these changes
Nov 17, 2019
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/41785
possibly a backport of #30192
parent tracker: https://tracker.ceph.com/issues/41669
updated using ceph-backport.sh version 15.0.0.6869