Merge pull request #12826 from LiumxNL/fix-op-tracker-initiate

mon: optracker's initiated_at timestamp should not be NULL Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Jan 11, 2017 · 55c5fdd · 55c5fdd
2 parents ab9d375 + ecb967a
commit 55c5fdd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/mon/MonOpRequest.h b/src/mon/MonOpRequest.h
@@ -86,7 +86,9 @@ 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().is_zero() ?
+      req->get_recv_stamp() : ceph_clock_now()),
     request(req),
     session(NULL),
     con(NULL),