New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mon: optracker's initiated_at timestamp should not be NULL #12826

Merged
merged 1 commit into from Jan 11, 2017

Conversation

Projects
None yet
3 participants
@LiumxNL
Contributor

LiumxNL commented Jan 9, 2017

mon may track a self-initiated message, recv_stamp remains unset
so using ceph_clock_now() instead to make optracker happy

Signed-off-by: Mingxin Liu mingxin@xsky.com

@LiumxNL

This comment has been minimized.

Contributor

LiumxNL commented Jan 9, 2017

@tchaikov pls review, thanks!

@@ -86,7 +86,8 @@ struct MonOpRequest : public TrackedOp {
op_type_t op_type;
MonOpRequest(Message *req, OpTracker *tracker) :
TrackedOp(tracker, req->get_recv_stamp()),
TrackedOp(tracker,
req->get_recv_stamp() ? req->get_recv_stamp() : ceph_clock_now(g_ceph_context)),

This comment has been minimized.

@yuyuyu101

yuyuyu101 Jan 9, 2017

Member

ceph_clock_now now deprecates argument. plz don't pass g_ceph_context

@@ -86,7 +86,8 @@ struct MonOpRequest : public TrackedOp {
op_type_t op_type;
MonOpRequest(Message *req, OpTracker *tracker) :
TrackedOp(tracker, req->get_recv_stamp()),
TrackedOp(tracker,
req->get_recv_stamp() ? req->get_recv_stamp() : ceph_clock_now()),

This comment has been minimized.

@tchaikov

tchaikov Jan 9, 2017

Contributor

you are actually using the operator double as operator bool. could you instead use is_zero() instead? and wrap the line at 80 chars.

@tchaikov tchaikov added the mon label Jan 9, 2017

mon: we may track a self-initiated message, recv_stamp remain unset
so using ceph_clock_now() instead to make optracker happy

Signed-off-by: Mingxin Liu <mingxin@xsky.com>
@LiumxNL

This comment has been minimized.

Contributor

LiumxNL commented Jan 10, 2017

@tchaikov updated

@tchaikov tchaikov self-assigned this Jan 10, 2017

@tchaikov tchaikov added the needs-qa label Jan 10, 2017

@tchaikov

This comment has been minimized.

@tchaikov tchaikov merged commit 55c5fdd into ceph:master Jan 11, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment