]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: use ceph_clock_now if message is self-generated 17345/head
authorhuangjun <huangjun@xsky.com>
Mon, 28 Aug 2017 14:52:37 +0000 (22:52 +0800)
committerSage Weil <sage@redhat.com>
Tue, 29 Aug 2017 13:40:46 +0000 (09:40 -0400)
Signed-off-by: huangjun <huangjun@xsky.com>
(cherry picked from commit 56e8031dac7ee65d54e831e7e372e8771fa0f94a)

src/mon/MonOpRequest.h

index a5000efe44e23bcc418cb6f5175f4c62a045ff56..7a43bff2f60256335c77e6248c1cfcb3979e4eb7 100644 (file)
@@ -88,7 +88,7 @@ private:
   MonOpRequest(Message *req, OpTracker *tracker) :
     TrackedOp(tracker,
       req->get_recv_stamp().is_zero() ?
-      req->get_recv_stamp() : ceph_clock_now()),
+      ceph_clock_now() : req->get_recv_stamp()),
     request(req),
     session(NULL),
     con(NULL),