osd: fix waiting_for_peered vs flushing #17759
Merged
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
|
retest this please. |
|
retest this please |
liewegas
changed the title
jdurgin
approved these changes
Sep 20, 2017
|
retest this please. |
the ceph-disk.sh test constantly fails . |
liewegas
changed the title
liewegas
force-pushed
the
wip-21407
branch
2 times, most recently
from
5c9b955
to
1b8267c
Compare
on_flush() requeues waiting_for_peered, but we flush twice on the primary during peering, and we don't want to requeue the first one (when we have the master pg log merged). Fix by moving waiting_for_peered to waiting_for_flush if we aren't already flush on _activate_committed. If we get an op and are peered but not flushed, queue ops there. (We can simplify this check a bit since pgbackend inactive message handling doesn't care about flushed or not flushed.) When flushed, we requeue waiting_for_flush. The waiting_for_flush, waiting_for_peered, and waiting_for_active lists are all mutually exclusive, so this mostly serves to clarify what we are waiting for (not to keep items separate). And it means that on_flushed() will only requeue things that were waiting for it specifically. Fixes: http://tracker.ceph.com/issues/21407 Signed-off-by: Sage Weil <sage@redhat.com>
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.
on_flush() requeues waiting_for_peered, but we flush twice on the
primary during peering, and we don't want to requeue the first one
(when we have the master pg log merged).
Fix by moving waiting_for_peered to waiting_for_flush if we aren't
already flush on _activate_committed. If we get an op and are
peered but not flushed, queue ops there. (We can simplify this
check a bit since pgbackend inactive message handling doesn't care
about flushed or not flushed.) When flushed, we requeue
waiting_for_flush.
The waiting_for_flush, waiting_for_peered, and waiting_for_active
lists are all mutually exclusive, so this mostly serves to
clarify what we are waiting for (not to keep items separate). And
it means that on_flushed() will only requeue things that were
waiting for it specifically.
Fixes: http://tracker.ceph.com/issues/21407
Signed-off-by: Sage Weil sage@redhat.com