RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-30 15:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10875 from athanatos/wip-16908

Browse Source 
Revert "osd/ReplicatedPG: for sync-read it don't cacl l_osd_op_r_prep…

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
This commit is contained in:
Samuel Just 2016-08-30 09:56:59 -07:00 committed by GitHub
commit 5eb32c9e17
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osd/ReplicatedPG.cc
View File

@ -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);
}
}