From: Igor Fedotov Date: Fri, 13 Aug 2021 12:04:06 +0000 (+0300) Subject: os/bluestore: cleanup around deferred_write perf counters. X-Git-Tag: v17.1.0~405^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f58485f0eb206a3bce5cfff8c9def75bb3f41ebb;p=ceph.git os/bluestore: cleanup around deferred_write perf counters. Better naming and description. Signed-off-by: Igor Fedotov --- diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index d08e127bb833..868690a419a9 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -5057,16 +5057,18 @@ void BlueStore::_init_logger() b.add_u64_counter(l_bluestore_write_new, "write_new", "Write into new blob"); - b.add_u64_counter(l_bluestore_write_deferred, - "write_deferred", - "Total deferred writes submitted"); - b.add_u64_counter(l_bluestore_write_deferred_bytes, - "write_deferred_bytes", - "Total bytes submitted as deferred writes"); - b.add_u64_counter(l_bluestore_deferred_write_ops, "write_deferred_ops", - "Sum for deferred write op"); - b.add_u64_counter(l_bluestore_deferred_write_bytes, "write_deferred_bytes", - "Sum for deferred write bytes", "def", 0, unit_t(UNIT_BYTES)); + b.add_u64_counter(l_bluestore_issued_deferred_writes, + "issued_deferred_writes", + "Total deferred writes issued"); + b.add_u64_counter(l_bluestore_issued_deferred_write_bytes, + "issued_deferred_write_bytes", + "Total bytes in issued deferred writes"); + b.add_u64_counter(l_bluestore_submitted_deferred_writes, + "submitted_deferred_writes", + "Total deferred writes submitted to disk"); + b.add_u64_counter(l_bluestore_submitted_deferred_write_bytes, + "submitted_deferred_write_bytes", + "Total bytes submitted to disk by deferred writes"); //**************************************** // compressions stats @@ -13316,8 +13318,8 @@ bluestore_deferred_op_t *BlueStore::_get_deferred_op( txc->deferred_txn = new bluestore_deferred_transaction_t; } txc->deferred_txn->ops.push_back(bluestore_deferred_op_t()); - logger->inc(l_bluestore_write_deferred); - logger->inc(l_bluestore_write_deferred_bytes, len); + logger->inc(l_bluestore_issued_deferred_writes); + logger->inc(l_bluestore_issued_deferred_write_bytes, len); return &txc->deferred_txn->ops.back(); } @@ -13432,8 +13434,8 @@ void BlueStore::_deferred_submit_unlock(OpSequencer *osr) << start << "~" << bl.length() << " crc " << bl.crc32c(-1) << std::dec << dendl; 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()); + logger->inc(l_bluestore_submitted_deferred_writes); + logger->inc(l_bluestore_submitted_deferred_write_bytes, bl.length()); int r = bdev->aio_write(start, bl, &b->ioc, false); ceph_assert(r == 0); } diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index 447fb0a19fdc..83077522f365 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -136,10 +136,10 @@ enum { l_bluestore_write_penalty_read_ops, l_bluestore_write_new, - l_bluestore_write_deferred, - l_bluestore_write_deferred_bytes, - l_bluestore_deferred_write_ops, - l_bluestore_deferred_write_bytes, + l_bluestore_issued_deferred_writes, + l_bluestore_issued_deferred_write_bytes, + l_bluestore_submitted_deferred_writes, + l_bluestore_submitted_deferred_write_bytes, //**************************************** // compressions stats diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 4e7d1ea15fd8..1eedf1a70c36 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -7510,8 +7510,8 @@ TEST_P(StoreTestSpecificAUSize, DeferredOnBigOverwrite) { sleep(2); ASSERT_EQ(logger->get(l_bluestore_write_big), 1u); ASSERT_EQ(logger->get(l_bluestore_write_big_deferred), 1u); - ASSERT_EQ(logger->get(l_bluestore_write_deferred), 1u); - ASSERT_EQ(logger->get(l_bluestore_write_deferred_bytes), block_size); + ASSERT_EQ(logger->get(l_bluestore_issued_deferred_writes), 1u); + ASSERT_EQ(logger->get(l_bluestore_issued_deferred_write_bytes), block_size); { struct store_statfs_t statfs; @@ -7574,8 +7574,8 @@ TEST_P(StoreTestSpecificAUSize, DeferredOnBigOverwrite2) { ASSERT_EQ(logger->get(l_bluestore_write_big_bytes), bl.length()); ASSERT_EQ(logger->get(l_bluestore_write_big_blobs), 3u); ASSERT_EQ(logger->get(l_bluestore_write_big_deferred), 0u); - ASSERT_EQ(logger->get(l_bluestore_write_deferred), 0u); - ASSERT_EQ(logger->get(l_bluestore_write_deferred_bytes), 0); + ASSERT_EQ(logger->get(l_bluestore_issued_deferred_writes), 0u); + ASSERT_EQ(logger->get(l_bluestore_issued_deferred_write_bytes), 0); } logger->reset(); @@ -7593,8 +7593,8 @@ TEST_P(StoreTestSpecificAUSize, DeferredOnBigOverwrite2) { ASSERT_EQ(logger->get(l_bluestore_write_big_bytes), bl.length()); ASSERT_EQ(logger->get(l_bluestore_write_big_blobs), 3u); ASSERT_EQ(logger->get(l_bluestore_write_big_deferred), 1u); - ASSERT_EQ(logger->get(l_bluestore_write_deferred), 1u); - ASSERT_EQ(logger->get(l_bluestore_write_deferred_bytes), 57344); + ASSERT_EQ(logger->get(l_bluestore_issued_deferred_writes), 1u); + ASSERT_EQ(logger->get(l_bluestore_issued_deferred_write_bytes), 57344); } { @@ -7653,8 +7653,8 @@ TEST_P(StoreTestSpecificAUSize, DeferredOnBigOverwrite3) { ASSERT_EQ(logger->get(l_bluestore_write_big_bytes), bl.length()); ASSERT_EQ(logger->get(l_bluestore_write_big_blobs), 64u); ASSERT_EQ(logger->get(l_bluestore_write_big_deferred), 0u); - ASSERT_EQ(logger->get(l_bluestore_write_deferred), 0u); - ASSERT_EQ(logger->get(l_bluestore_write_deferred_bytes), 0u); + ASSERT_EQ(logger->get(l_bluestore_issued_deferred_writes), 0u); + ASSERT_EQ(logger->get(l_bluestore_issued_deferred_write_bytes), 0u); } logger->reset(); { @@ -7671,8 +7671,8 @@ TEST_P(StoreTestSpecificAUSize, DeferredOnBigOverwrite3) { ASSERT_EQ(logger->get(l_bluestore_write_big_bytes), bl.length()); ASSERT_EQ(logger->get(l_bluestore_write_big_blobs), 65u); ASSERT_EQ(logger->get(l_bluestore_write_big_deferred), 1u); - ASSERT_EQ(logger->get(l_bluestore_write_deferred), 1u); - ASSERT_EQ(logger->get(l_bluestore_write_deferred_bytes), 61440); + ASSERT_EQ(logger->get(l_bluestore_issued_deferred_writes), 1u); + ASSERT_EQ(logger->get(l_bluestore_issued_deferred_write_bytes), 61440); } { ObjectStore::Transaction t;