osd: populate last_epoch_split during build_initial_pg_history #16519
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
xiexingguo
reviewed
Jul 24, 2017
src/osd/PrimaryLogPG.cc
Outdated
| @@ -1848,7 +1848,8 @@ void PrimaryLogPG::do_op(OpRequestRef& op) | |||
| << std::hex << head.get_hash() << std::dec << dendl; | |||
| osd->clog->warn() << info.pgid.pgid << " does not contain " << head | |||
| << " op " << *m; | |||
| assert(!cct->_conf->osd_debug_misdirected_ops); | |||
| assert(!cct->_conf->osd_debug_misdirected_ops || | |||
| m->get_epoch() < info.history.last_epoch_split); | |||
There was a problem hiding this comment.
does not compile, s/m->get_epoch()/m->get_map_epoch()/
jdurgin
approved these changes
Jul 24, 2017
gregsfortytwo
requested changes
Jul 24, 2017
If we get a pg create and have to generate the pg_history_t fields, populate the last_epoch_split field too. This is needed discard ops sent from before the last split. Specifically, PG::can_discard_op() looks at it when the client has the RESEND_ON_SPLIT feature bit. If we don't discard, we may run afoul of assertions later (e.g., that the object belongs to the PG at all) or potentially process an op out of order. Fixes: http://tracker.ceph.com/issues/20754 Signed-off-by: Sage Weil <sage@redhat.com>
|
You're right.. I thought this was before that check but it's not. core reveals that the last_epoch_split was 0 (should be 80). Pushed a new fix. |
jdurgin
approved these changes
Jul 24, 2017
gregsfortytwo
approved these changes
Jul 24, 2017
|
jenkins test this please |
|
Does this PR will avoid the assert? if the send epoch across the boundary when pg split, it should be detected and resend, right? |
|
The client will already resend; this PR fixes it so that we properly ignore the op sent before the split. |
|
@liewegas This explains my kernel client paste from last week: https://pastebin.com/B3Tvx2kG. Should have pressed on, I guess ;) |
|
Oh, good!
|
liewegas
changed the title
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.
If the request was sent before a split then this isn't actually a bug.
Fixes: http://tracker.ceph.com/issues/20754
Signed-off-by: Sage Weil sage@redhat.com