messages/MOSDOp: clear reqid inc for v6 encoding#8299
Merged
liewegas merged 1 commit intoceph:masterfrom Mar 27, 2016
Merged
Conversation
src/messages/MOSDOp.h
Outdated
| ::encode(fake_reqid, payload); | ||
| } else { | ||
| ::encode(reqid, payload); | ||
| } |
Member
There was a problem hiding this comment.
Doesn't this need to use the actual reqid, not just fill in the inc?
Member
Author
There was a problem hiding this comment.
This is the reqid == osd_reqid_t path...
Member
There was a problem hiding this comment.
d'oh. Something about this this whole setup was confusing me previously, but I agree it looks good now.
For the new v7 encoding, we put the client incarnation in the reqid so that we can have it at the beginning of the encoding. However, we do *not* want to do this for the v6 encoding, as that version of get_reqid() will return reqid if it is not == osd_reqid_t(). Fixes: ceph#15230 Signed-off-by: Sage Weil <sage@redhat.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
For the new v7 encoding, we put the client incarnation in the reqid so that
we can have it at the beginning of the encoding. However, we do not
want to do this for the v6 encoding, as that version of get_reqid() will
return reqid if it is not == osd_reqid_t(). Previously we were setting
the field in the constructor, but since it's specific to the v7 encoding,
put it there (in encode_payload()) instead.
Fixes: #15230
Signed-off-by: Sage Weil sage@redhat.com