From e3f0cb022d60f34a461de2140c1edc235ad5ef9c Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Wed, 25 Oct 2023 18:46:51 +0300 Subject: [PATCH] test/store_test: make use of refresh_perf_counters() call. And get rid off sleep() ones. Signed-off-by: Igor Fedotov (cherry picked from commit b50755e3a1bccdc45768bf42c603b765b0eaeee8) --- src/test/objectstore/store_test.cc | 46 +++++++++++------------------- 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 6cdd6fa6dc4..01d104104e4 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -7259,14 +7259,13 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwrite) { } { // We need to issue a read to trigger cache stat update that refresh - // perf counters. additionally we need to wait some time for mempool - // thread to update stats. - sleep(1); + // perf counters. bufferlist bl, expected; r = store->read(ch, hoid, 0, block_size, bl); ASSERT_EQ(r, (int)block_size); expected.append(string(block_size, 'b')); ASSERT_TRUE(bl_eq(expected, bl)); + store->refresh_perf_counters(); ASSERT_EQ(logger->get(l_bluestore_blobs), 1u); ASSERT_EQ(logger->get(l_bluestore_extents), 2u); } @@ -7284,14 +7283,13 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwrite) { } { // We need to issue a read to trigger cache stat update that refresh - // perf counters. additionally we need to wait some time for mempool - // thread to update stats. - sleep(1); + // perf counters. bufferlist bl, expected; r = store->read(ch, hoid, 0, block_size, bl); ASSERT_EQ(r, (int)block_size); expected.append(string(block_size, 'b')); ASSERT_TRUE(bl_eq(expected, bl)); + store->refresh_perf_counters(); ASSERT_EQ(logger->get(l_bluestore_blobs), 1u); ASSERT_EQ(logger->get(l_bluestore_extents), 2u); } @@ -7307,11 +7305,6 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwrite) { ASSERT_EQ(r, 0); } { - // we need to wait some time for mempool - // thread to update stats to be able to check blob/extent numbers from - // perf counters. - sleep(1); - bufferlist bl, expected; r = store->read(ch, hoid, 0, block_size, bl); ASSERT_EQ(r, (int)block_size); @@ -7354,6 +7347,7 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwrite) { expected.append(string(block_size * 2, 'e')); ASSERT_TRUE(bl_eq(expected, bl)); } + store->refresh_perf_counters(); ASSERT_EQ(logger->get(l_bluestore_blobs), 1u); ASSERT_EQ(logger->get(l_bluestore_extents), 1u); @@ -8537,15 +8531,14 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwriteReverse) { } { // We need to issue a read to trigger cache stat update that refresh - // perf counters. additionally we need to wait some time for mempool - // thread to update stats. - sleep(1); + // perf counters. bufferlist bl, expected; r = store->read(ch, hoid, block_size * 9, block_size * 2, bl); ASSERT_EQ(r, (int)block_size * 2); expected.append(string(block_size, 'b')); expected.append(string(block_size, 'a')); ASSERT_TRUE(bl_eq(expected, bl)); + store->refresh_perf_counters(); ASSERT_EQ(logger->get(l_bluestore_blobs), 1u); ASSERT_EQ(logger->get(l_bluestore_extents), 1u); } @@ -8564,9 +8557,7 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwriteReverse) { } { // We need to issue a read to trigger cache stat update that refresh - // perf counters. additionally we need to wait some time for mempool - // thread to update stats. - sleep(1); + // perf counters. bufferlist bl, expected; r = store->read(ch, hoid, block_size * 7, block_size * 3, bl); ASSERT_EQ(r, (int)block_size * 3); @@ -8574,6 +8565,7 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwriteReverse) { expected.append(string(block_size, 0)); expected.append(string(block_size, 'b')); ASSERT_TRUE(bl_eq(expected, bl)); + store->refresh_perf_counters(); ASSERT_EQ(logger->get(l_bluestore_blobs), 1u); ASSERT_EQ(logger->get(l_bluestore_extents), 2u); } @@ -8591,9 +8583,7 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwriteReverse) { } { // We need to issue a read to trigger cache stat update that refresh - // perf counters. additionally we need to wait some time for mempool - // thread to update stats. - sleep(1); + // perf counters. bufferlist bl, expected; r = store->read(ch, hoid, block_size * 11, block_size * 3, bl); ASSERT_EQ(r, (int)block_size * 3); @@ -8601,6 +8591,7 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwriteReverse) { expected.append(string(block_size, 0)); expected.append(string(block_size, 'd')); ASSERT_TRUE(bl_eq(expected, bl)); + store->refresh_perf_counters(); ASSERT_EQ(logger->get(l_bluestore_blobs), 1u); ASSERT_EQ(logger->get(l_bluestore_extents), 3u); } @@ -8620,9 +8611,7 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwriteReverse) { } { // We need to issue a read to trigger cache stat update that refresh - // perf counters. additionally we need to wait some time for mempool - // thread to update stats. - sleep(1); + // perf counters. bufferlist bl, expected; r = store->read(ch, hoid, block_size * 17, block_size * 3, bl); ASSERT_EQ(r, (int)block_size * 3); @@ -8630,6 +8619,7 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwriteReverse) { expected.append(string(block_size, 0)); expected.append(string(block_size, 'e')); ASSERT_TRUE(bl_eq(expected, bl)); + store->refresh_perf_counters(); ASSERT_EQ(logger->get(l_bluestore_blobs), 2u); ASSERT_EQ(logger->get(l_bluestore_extents), 5u); } @@ -8648,9 +8638,7 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwriteReverse) { } { // We need to issue a read to trigger cache stat update that refresh - // perf counters. additionally we need to wait some time for mempool - // thread to update stats. - sleep(1); + // perf counters. bufferlist bl, expected; r = store->read(ch, hoid, block_size * 16, block_size * 4, bl); ASSERT_EQ(r, (int)block_size * 4); @@ -8659,6 +8647,7 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnOverwriteReverse) { expected.append(string(block_size, 'f')); expected.append(string(block_size, 'e')); ASSERT_TRUE(bl_eq(expected, bl)); + store->refresh_perf_counters(); ASSERT_EQ(logger->get(l_bluestore_blobs), 2u); ASSERT_EQ(logger->get(l_bluestore_extents), 4u); } @@ -8723,9 +8712,7 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnSmallOverwrite) { } { // We need to issue a read to trigger cache stat update that refresh - // perf counters. additionally we need to wait some time for mempool - // thread to update stats. - sleep(1); + // perf counters. bufferlist bl, expected; r = store->read(ch, hoid, 0, block_size * 3, bl); ASSERT_EQ(r, (int)block_size * 3); @@ -8736,6 +8723,7 @@ TEST_P(StoreTestSpecificAUSize, BlobReuseOnSmallOverwrite) { expected.append(string(block_size, 'a')); ASSERT_TRUE(bl_eq(expected, bl)); + store->refresh_perf_counters(); ASSERT_EQ(logger->get(l_bluestore_blobs), 1u); ASSERT_EQ(logger->get(l_bluestore_extents), 3u); } -- 2.39.5