From: Adam Kupczyk <akupczyk@ibm.com>
Date: Tue, 10 Jun 2025 15:14:44 +0000 (+0000)
Subject: test/store_test: Fix BluestorePerPoolOmapFixOnMount
X-Git-Tag: v20.0.0-pre.ibm~16^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=68e7d4e41766327bd3439d8349109095b5205936;p=ceph-ci.git

test/store_test: Fix BluestorePerPoolOmapFixOnMount

We called inject_legacy_omap() before waiting to commit
initial transaction that created the object.
The results is that sometimes the initial clean state
removed legacy omap signalling used by unittest.

Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit 3c9defab46e3ea7f9b9fbd05bdae9d6597687f0a)
---

diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index db4b509b3e7..38ce90a95b7 100644
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -10703,8 +10703,11 @@ TEST_P(StoreTest, BluestorePerPoolOmapFixOnMount)
     t.omap_setheader(cid, oid, h);
     t.touch(cid, oid2);
     t.omap_setheader(cid, oid2, h);
+    C_SaferCond c;
+    t.register_on_commit(&c);
     int r = queue_transaction(store, ch, std::move(t));
     ASSERT_EQ(r, 0);
+    c.wait();
   }
 
   // inject legacy omaps