os/bluestore: rename some perf counters to better reflect their meaning.

This applies to bluestore_write_small_deferred and
bluestore_write_small_new counters.

In fact they apply to both big and small writes.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index ba73687728d323545b49f1e80b31a2487f53e773..ee521931bedbf8c48c1afc8bf020073d56110096 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -4672,15 +4672,15 @@ void BlueStore::_init_logger()
   b.add_u64_counter(l_bluestore_write_small_unused,
                    "bluestore_write_small_unused",
                    "Small writes into unused portion of existing blob");
-  b.add_u64_counter(l_bluestore_write_small_deferred,
-                   "bluestore_write_small_deferred",
-                   "Small overwrites using deferred");
+  b.add_u64_counter(l_bluestore_write_deferred,
+                   "bluestore_write_deferred",
+                   "Overwrites using deferred");
   b.add_u64_counter(l_bluestore_write_small_pre_read,
                    "bluestore_write_small_pre_read",
                    "Small writes that required we read some data (possibly "
                    "cached) to fill out the block");
-  b.add_u64_counter(l_bluestore_write_small_new, "bluestore_write_small_new",
-                   "Small write into new (sparse) blob");
+  b.add_u64_counter(l_bluestore_write_new, "bluestore_write_new",
+                   "Write into new blob");
 
   b.add_u64_counter(l_bluestore_txc, "bluestore_txc", "Transactions committed");
   b.add_u64_counter(l_bluestore_onode_reshard, "bluestore_onode_reshard",
@@ -13139,7 +13139,7 @@ void BlueStore::_do_write_small(
          b->dirty_blob().mark_used(le->blob_offset, le->length);
          txc->statfs_delta.stored() += le->length;
          dout(20) << __func__ << "  lex " << *le << dendl;
-         logger->inc(l_bluestore_write_small_deferred);
+         logger->inc(l_bluestore_write_deferred);
          return;
        }
        // try to reuse blob if we can
@@ -13836,7 +13836,7 @@ int BlueStore::_do_alloc_write(
     // queue io
     if (!g_conf()->bluestore_debug_omit_block_device_write) {
       if (l->length() <= prefer_deferred_size.load()) {
-       dout(20) << __func__ << " deferring small 0x" << std::hex
+       dout(20) << __func__ << " deferring 0x" << std::hex
                 << l->length() << std::dec << " write via deferred" << dendl;
        bluestore_deferred_op_t *op = _get_deferred_op(txc);
        op->op = bluestore_deferred_op_t::OP_WRITE;
@@ -13848,14 +13848,14 @@ int BlueStore::_do_alloc_write(
          });
         ceph_assert(r == 0);
        op->data = *l;
-       logger->inc(l_bluestore_write_small_deferred);
+       logger->inc(l_bluestore_write_deferred);
       } else {
        b->get_blob().map_bl(
          b_off, *l,
          [&](uint64_t offset, bufferlist& t) {
            bdev->aio_write(offset, t, &txc->ioc, false);
          });
-       logger->inc(l_bluestore_write_small_new);
+       logger->inc(l_bluestore_write_new);
       }
     }
   }

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index ba71ab0b69e8cc4bc949d3637faa6cd6ab8ea877..c613fc5113a65c79f9b2bbc5e32b353379b51ff4 100644 (file)
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -122,9 +122,9 @@ enum {
   l_bluestore_write_small,
   l_bluestore_write_small_bytes,
   l_bluestore_write_small_unused,
-  l_bluestore_write_small_deferred,
+  l_bluestore_write_deferred,
   l_bluestore_write_small_pre_read,
-  l_bluestore_write_small_new,
+  l_bluestore_write_new,
   l_bluestore_txc,
   l_bluestore_onode_reshard,
   l_bluestore_blob_split,