os/bluestore: fix spillover test case

Fixes: https://tracker.ceph.com/issues/46055
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit d5f315b740746cc5de14753c1b96390c8fcb0372)

 Conflicts:
	src/test/objectstore/store_test.cc - trivial

diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index 3a45b6f0140428b053f3858bd07820c9c8bfc925..269fd8fde6ce285f78a5560baa3f26a29890bcad 100644 (file)
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -8239,6 +8239,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);
 
@@ -8252,7 +8253,6 @@ void doManySetAttr(ObjectStore* store,
     cerr << "failure querying " << std::endl;
   }
   std::cout << std::string(out.c_str(), out.length()) << std::endl;
-  do_check_fn(store);
   test_obj.shutdown();
 }
 
@@ -8272,6 +8272,7 @@ TEST_P(StoreTestSpecificAUSize, SpilloverTest) {
 
       BlueStore* bstore = dynamic_cast<BlueStore*> (_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
@@ -8300,6 +8301,7 @@ TEST_P(StoreTestSpecificAUSize, SpilloverFixedTest) {
 
       BlueStore* bstore = dynamic_cast<BlueStore*> (_store);
       ceph_assert(bstore);
+      bstore->compact();
       const PerfCounters* logger = bstore->get_bluefs_perf_counters();
       ASSERT_EQ(0, logger->get(l_bluefs_slow_used_bytes));
     }
@@ -8325,6 +8327,7 @@ TEST_P(StoreTestSpecificAUSize, SpilloverFixed2Test) {
 
       BlueStore* bstore = dynamic_cast<BlueStore*> (_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
     }