From: Sage Weil <sage@redhat.com>
Date: Tue, 14 Mar 2017 20:47:48 +0000 (-0400)
Subject: os/bluestore: fix perfcounters for deferred io
X-Git-Tag: v12.0.1~12^2~11
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=81e8682be13810a67dccbef3e98ea8037a18851f;p=ceph-ci.git

os/bluestore: fix perfcounters for deferred io

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 853d512bddb..77558f017e2 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -7776,6 +7776,7 @@ void BlueStore::_deferred_try_submit(OpSequencer *osr)
     txc->log_state_latency(logger, l_bluestore_state_deferred_queued_lat);
     txc->state = TransContext::STATE_DEFERRED_AIO_WAIT;
     for (auto opi = wt.ops.rbegin(); opi != wt.ops.rend(); ++opi) {
+      assert(opi->op == bluestore_deferred_op_t::OP_WRITE);
       const auto& op = *opi;
       uint64_t bl_offset = 0;
       for (auto e : op.extents) {
@@ -7792,6 +7793,8 @@ void BlueStore::_deferred_try_submit(OpSequencer *osr)
 	  bl.substr_of(op.data, bl_offset + j.get_start() - e.offset,
 		       j.get_len());
 	  if (!g_conf->bluestore_debug_omit_block_device_write) {
+	    logger->inc(l_bluestore_deferred_write_ops);
+	    logger->inc(l_bluestore_deferred_write_bytes, bl.length());
 	    int r = bdev->aio_write(j.get_start(), bl, &last->ioc, false);
 	    assert(r == 0);
 	  }