Merge pull request #10875 from athanatos/wip-16908

Revert "osd/ReplicatedPG: for sync-read it don't cacl l_osd_op_r_prep… Reviewed-by: Greg Farnum <gfarnum@redhat.com>
ceph · Aug 30, 2016 · 5eb32c9 · 5eb32c9
2 parents 545b65a + b4f4c42
commit 5eb32c9
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
@@ -2139,13 +2139,12 @@ void ReplicatedPG::do_op(OpRequestRef& op)
   execute_ctx(ctx);
   utime_t prepare_latency = ceph_clock_now(cct);
   prepare_latency -= op->get_dequeued_time();
+  osd->logger->tinc(l_osd_op_prepare_lat, prepare_latency);
   if (op->may_read() && op->may_write()) {
-    osd->logger->tinc(l_osd_op_prepare_lat, prepare_latency);
     osd->logger->tinc(l_osd_op_rw_prepare_lat, prepare_latency);
-  } else if (!ctx->pending_async_reads.empty() && op->may_read()) {
+  } else if (op->may_read()) {
     osd->logger->tinc(l_osd_op_r_prepare_lat, prepare_latency);
   } else if (op->may_write() || op->may_cache()) {
-    osd->logger->tinc(l_osd_op_prepare_lat, prepare_latency);
     osd->logger->tinc(l_osd_op_w_prepare_lat, prepare_latency);
   }
 }