objecter: minor cleanups #19994
Merged
objecter: minor cleanups #19994
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 |
tchaikov
reviewed
Jan 23, 2018
| @@ -708,10 +708,9 @@ void Objecter::_send_linger_ping(LingerOp *info) | |||
| o->target = info->target; | |||
| o->should_resend = false; | |||
| _send_op_account(o); | |||
| MOSDOp *m = _prepare_osd_op(o); | |||
There was a problem hiding this comment.
for the posterity, it might not look like a refactor as it claims because the message's tid is set using o->tid before "o->tid" is updated. but please note, Objecter::_send_op() always m->set_tid(op->tid) before sending the message.
There was a problem hiding this comment.
@runsisi since you are at this file, could you help remove the line of https://github.com/ceph/ceph/blob/master/src/osdc/Objecter.cc#L3309 ? as _prepare_osd_op() should take care of this already.
There was a problem hiding this comment.
yeah, removed it since _prepare_osd_op() has set the updated m->tid.
thanks~
added 2 commits
January 23, 2018 18:25
Signed-off-by: runsisi <runsisi@zte.com.cn>
it's more intuitive and consistent Signed-off-by: runsisi <runsisi@zte.com.cn>
runsisi
force-pushed
the
wip-objecter-cleanup
branch
from
0c2c25e
to
fc02286
Compare
tchaikov
approved these changes
Jan 23, 2018
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.
remove
Objecter::kick_requestswhich is unused and remove default arg forObjecter::_send_opSigned-off-by: runsisi runsisi@zte.com.cn