From d5f315b740746cc5de14753c1b96390c8fcb0372 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Thu, 18 Jun 2020 20:00:41 +0300 Subject: [PATCH] os/bluestore: fix spillover test case Fixes: https://tracker.ceph.com/issues/46055 Signed-off-by: Igor Fedotov --- src/test/objectstore/store_test.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index f5d11b4b11f2..2ebd56c26253 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -8671,6 +8671,7 @@ void doManySetAttr(ObjectStore* store, test_obj.wait_for_done(); std::cout << "done" << std::endl; + do_check_fn(store); AdminSocket* admin_socket = g_ceph_context->get_admin_socket(); ceph_assert(admin_socket); @@ -8685,7 +8686,6 @@ void doManySetAttr(ObjectStore* store, } else { std::cout << std::string(out.c_str(), out.length()) << std::endl; } - do_check_fn(store); test_obj.shutdown(); } @@ -8705,6 +8705,7 @@ TEST_P(StoreTestSpecificAUSize, SpilloverTest) { BlueStore* bstore = dynamic_cast (_store); ceph_assert(bstore); + bstore->compact(); const PerfCounters* logger = bstore->get_bluefs_perf_counters(); //experimentally it was discovered that this case results in 400+MB spillover //using lower 300MB threshold just to be safe enough @@ -8733,6 +8734,7 @@ TEST_P(StoreTestSpecificAUSize, SpilloverFixedTest) { BlueStore* bstore = dynamic_cast (_store); ceph_assert(bstore); + bstore->compact(); const PerfCounters* logger = bstore->get_bluefs_perf_counters(); ASSERT_EQ(0, logger->get(l_bluefs_slow_used_bytes)); } @@ -8758,6 +8760,7 @@ TEST_P(StoreTestSpecificAUSize, SpilloverFixed2Test) { BlueStore* bstore = dynamic_cast (_store); ceph_assert(bstore); + bstore->compact(); const PerfCounters* logger = bstore->get_bluefs_perf_counters(); ASSERT_LE(logger->get(l_bluefs_slow_used_bytes), 300 * 1024 * 1024); // see SpilloverTest for 300MB choice rationale } -- 2.47.3