From: Jianpeng Ma Date: Fri, 24 Apr 2015 06:47:28 +0000 (+0800) Subject: librbd: remove the perfcounter l_librbd_aio_rd/write/discard_*. X-Git-Tag: v9.0.1~22^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9d07069acddd7dfe2848433898aa71d1e8e562dd;p=ceph.git librbd: remove the perfcounter l_librbd_aio_rd/write/discard_*. Now for non-aio read/write/discard, the internal implementation used the related aio function. So we don't differentiate the aio perfcounter from non-aio for read/write/discard operations. Signed-off-by: Jianpeng Ma --- diff --git a/src/librbd/AioCompletion.cc b/src/librbd/AioCompletion.cc index 8c38e1c95c4a..1e8f98cb8674 100644 --- a/src/librbd/AioCompletion.cc +++ b/src/librbd/AioCompletion.cc @@ -70,11 +70,11 @@ namespace librbd { elapsed = ceph_clock_now(ictx->cct) - start_time; switch (aio_type) { case AIO_TYPE_READ: - ictx->perfcounter->tinc(l_librbd_aio_rd_latency, elapsed); break; + ictx->perfcounter->tinc(l_librbd_rd_latency, elapsed); break; case AIO_TYPE_WRITE: - ictx->perfcounter->tinc(l_librbd_aio_wr_latency, elapsed); break; + ictx->perfcounter->tinc(l_librbd_wr_latency, elapsed); break; case AIO_TYPE_DISCARD: - ictx->perfcounter->tinc(l_librbd_aio_discard_latency, elapsed); break; + ictx->perfcounter->tinc(l_librbd_discard_latency, elapsed); break; case AIO_TYPE_FLUSH: ictx->perfcounter->tinc(l_librbd_aio_flush_latency, elapsed); break; default: diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc index 3286fd81eb96..0e6e190920c8 100644 --- a/src/librbd/ImageCtx.cc +++ b/src/librbd/ImageCtx.cc @@ -254,15 +254,6 @@ namespace librbd { plb.add_u64_counter(l_librbd_discard_bytes, "discard_bytes", "Discarded data"); plb.add_time_avg(l_librbd_discard_latency, "discard_latency", "Discard latency"); plb.add_u64_counter(l_librbd_flush, "flush", "Flushes"); - plb.add_u64_counter(l_librbd_aio_rd, "aio_rd", "Async reads"); - plb.add_u64_counter(l_librbd_aio_rd_bytes, "aio_rd_bytes", "Data size in async reads"); - plb.add_time_avg(l_librbd_aio_rd_latency, "aio_rd_latency", "Latency of async reads"); - plb.add_u64_counter(l_librbd_aio_wr, "aio_wr", "Async writes"); - plb.add_u64_counter(l_librbd_aio_wr_bytes, "aio_wr_bytes", "Data size in async writes"); - plb.add_time_avg(l_librbd_aio_wr_latency, "aio_wr_latency", "Latency of async writes"); - plb.add_u64_counter(l_librbd_aio_discard, "aio_discard", "Async discards"); - plb.add_u64_counter(l_librbd_aio_discard_bytes, "aio_discard_bytes", "Data size in async discards"); - plb.add_time_avg(l_librbd_aio_discard_latency, "aio_discard_latency", "Latency of async discards"); plb.add_u64_counter(l_librbd_aio_flush, "aio_flush", "Async flushes"); plb.add_time_avg(l_librbd_aio_flush_latency, "aio_flush_latency", "Latency of async flushes"); plb.add_u64_counter(l_librbd_snap_create, "snap_create", "Snap creations"); diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index f1b568126a87..bb2413632108 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -3444,11 +3444,9 @@ reprotect_and_return_err: ssize_t read(ImageCtx *ictx, uint64_t ofs, size_t len, char *buf, int op_flags) { - utime_t start_time, elapsed; ssize_t ret; ldout(ictx->cct, 20) << "read " << ictx << " off = " << ofs << " len = " << len << dendl; - start_time = ceph_clock_now(ictx->cct); vector > extents; extents.push_back(make_pair(ofs, len)); @@ -3456,10 +3454,6 @@ reprotect_and_return_err: if (ret < 0) return ret; - elapsed = ceph_clock_now(ictx->cct) - start_time; - ictx->perfcounter->tinc(l_librbd_rd_latency, elapsed); - ictx->perfcounter->inc(l_librbd_rd); - ictx->perfcounter->inc(l_librbd_rd_bytes, ret); return ret; } @@ -3490,11 +3484,9 @@ reprotect_and_return_err: ssize_t write(ImageCtx *ictx, uint64_t off, size_t len, const char *buf, int op_flags) { - utime_t start_time, elapsed; ldout(ictx->cct, 20) << "write " << ictx << " off = " << off << " len = " << len << dendl; - start_time = ceph_clock_now(ictx->cct); Mutex mylock("librbd::write::mylock"); Cond cond; bool done; @@ -3526,20 +3518,14 @@ reprotect_and_return_err: return ret; } - elapsed = ceph_clock_now(ictx->cct) - start_time; - ictx->perfcounter->tinc(l_librbd_wr_latency, elapsed); - ictx->perfcounter->inc(l_librbd_wr); - ictx->perfcounter->inc(l_librbd_wr_bytes, mylen); return mylen; } int discard(ImageCtx *ictx, uint64_t off, uint64_t len) { - utime_t start_time, elapsed; ldout(ictx->cct, 20) << "discard " << ictx << " off = " << off << " len = " << len << dendl; - start_time = ceph_clock_now(ictx->cct); Mutex mylock("librbd::discard::mylock"); Cond cond; bool done; @@ -3571,10 +3557,6 @@ reprotect_and_return_err: return ret; } - elapsed = ceph_clock_now(ictx->cct) - start_time; - ictx->perfcounter->inc(l_librbd_discard_latency, elapsed); - ictx->perfcounter->inc(l_librbd_discard); - ictx->perfcounter->inc(l_librbd_discard_bytes, mylen); return mylen; } @@ -3845,8 +3827,8 @@ reprotect_and_return_err: c->finish_adding_requests(ictx->cct); c->put(); - ictx->perfcounter->inc(l_librbd_aio_wr); - ictx->perfcounter->inc(l_librbd_aio_wr_bytes, clip_len); + ictx->perfcounter->inc(l_librbd_wr); + ictx->perfcounter->inc(l_librbd_wr_bytes, clip_len); return r; } @@ -3990,8 +3972,6 @@ reprotect_and_return_err: c->finish_adding_requests(ictx->cct); c->put(); - ictx->perfcounter->inc(l_librbd_aio_discard); - ictx->perfcounter->inc(l_librbd_aio_discard_bytes, clip_len); return r; } @@ -4157,8 +4137,8 @@ reprotect_and_return_err: c->finish_adding_requests(ictx->cct); c->put(); - ictx->perfcounter->inc(l_librbd_aio_rd); - ictx->perfcounter->inc(l_librbd_aio_rd_bytes, buffer_ofs); + ictx->perfcounter->inc(l_librbd_rd); + ictx->perfcounter->inc(l_librbd_rd_bytes, buffer_ofs); return ret; } diff --git a/src/librbd/internal.h b/src/librbd/internal.h index 36ca6b96db72..bd7ce0df3fff 100644 --- a/src/librbd/internal.h +++ b/src/librbd/internal.h @@ -28,15 +28,6 @@ enum { l_librbd_discard_latency, l_librbd_flush, - l_librbd_aio_rd, // read ops - l_librbd_aio_rd_bytes, // bytes read - l_librbd_aio_rd_latency, - l_librbd_aio_wr, - l_librbd_aio_wr_bytes, - l_librbd_aio_wr_latency, - l_librbd_aio_discard, - l_librbd_aio_discard_bytes, - l_librbd_aio_discard_latency, l_librbd_aio_flush, l_librbd_aio_flush_latency,