test/fio: fix build failure caused by sequencer replacement.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>

diff --git a/src/test/fio/fio_ceph_objectstore.cc b/src/test/fio/fio_ceph_objectstore.cc
index 5f4414903a5e5c8a8d50760866f2489429aa89b9..d6250044d3f51f429ce0d3a44e3a6e39e63b5f20 100644 (file)
--- a/src/test/fio/fio_ceph_objectstore.cc
+++ b/src/test/fio/fio_ceph_objectstore.cc
@@ -142,7 +142,7 @@ static std::vector<fio_option> ceph_options{
 struct Collection {
   spg_t pg;
   coll_t cid;
-  ObjectStore::Sequencer sequencer;
+  ObjectStore::CollectionHandle ch;
   // Can't use mutex directly in vectors hence dynamic allocation
 
   ceph::unique_ptr<std::mutex> lock;
@@ -153,13 +153,32 @@ struct Collection {
   // use big pool ids to avoid clashing with existing collections
   static constexpr int64_t MIN_POOL_ID = 0x0000ffffffffffff;
 
-  Collection(const spg_t& pg)
-    : pg(pg), cid(pg), sequencer(stringify(pg)),
+  Collection(const spg_t& pg, ObjectStore::CollectionHandle _ch)
+    : pg(pg), cid(pg), ch(_ch),
         lock(new std::mutex) {
-    sequencer.shard_hint = pg;
   }
 };
 
+int destroy_collections(
+  std::unique_ptr<ObjectStore>& os,
+  std::vector<Collection>& collections)
+{
+  ObjectStore::Transaction t;
+  bool failed = false;
+  // remove our collections
+  for (auto& coll : collections) {
+    ghobject_t pgmeta_oid(coll.pg.make_pgmeta_oid());
+    t.remove(coll.cid, pgmeta_oid);
+    t.remove_collection(coll.cid);
+    int r = os->apply_transaction(coll.ch, std::move(t));
+    if (r && !failed) {
+      derr << "Engine cleanup failed with " << cpp_strerror(-r) << dendl;
+      failed = true;
+    }
+  }
+  return 0;
+}
+
 int init_collections(std::unique_ptr<ObjectStore>& os,
                      uint64_t pool,
                      std::vector<Collection>& collections,
@@ -170,41 +189,32 @@ int init_collections(std::unique_ptr<ObjectStore>& os,
 
   const int split_bits = cbits(count - 1);
 
-  ObjectStore::Transaction t;
   for (uint32_t i = 0; i < count; i++) {
     auto pg = spg_t{pg_t{i, pool}};
-    collections.emplace_back(pg);
+    coll_t cid(pg);
+
+    bool exists = os->collection_exists(cid);
+    auto ch = exists ?
+      os->open_collection(cid) :
+      os->create_new_collection(cid) ;
 
+    collections.emplace_back(pg, ch);
+
+    ObjectStore::Transaction t;
     auto& coll = collections.back();
-    if (!os->collection_exists(coll.cid)) {
+    if (!exists) {
       t.create_collection(coll.cid, split_bits);
       ghobject_t pgmeta_oid(coll.pg.make_pgmeta_oid());
       t.touch(coll.cid, pgmeta_oid);
+      int r = os->apply_transaction(coll.ch, std::move(t));
+      if (r) {
+       derr << "Engine init failed with " << cpp_strerror(-r) << dendl;
+       destroy_collections(os, collections);
+       return r;
+      }
     }
   }
-  ObjectStore::Sequencer sequencer("Engine init");
-  int r = os->apply_transaction(&sequencer, std::move(t));
-  if (r)
-    derr << "Engine init failed with " << cpp_strerror(-r) << dendl;
-  return r;
-}
-
-int destroy_collections(
-  std::unique_ptr<ObjectStore>& os,
-  std::vector<Collection>& collections)
-{
-  ObjectStore::Transaction t;
-  // remove our collections
-  for (auto& coll : collections) {
-    ghobject_t pgmeta_oid(coll.pg.make_pgmeta_oid());
-    t.remove(coll.cid, pgmeta_oid);
-    t.remove_collection(coll.cid);
-  }
-  ObjectStore::Sequencer sequencer("Engine cleanup");
-  int r = os->apply_transaction(&sequencer, std::move(t));
-  if (r)
-    derr << "Engine cleanup failed with " << cpp_strerror(-r) << dendl;
-  return r;
+  return 0;
 }
 
 /// global engine state shared between all jobs within the process. this
@@ -401,38 +411,35 @@ Job::Job(Engine* engine, const thread_data* td)
 
     objects.emplace_back(f->file_name, coll);
     auto& oid = objects.back().oid;
-
     t.touch(coll.cid, oid);
     t.truncate(coll.cid, oid, file_size);
-  }
-
-  // apply the entire transaction synchronously
-  ObjectStore::Sequencer sequencer("job init");
-  int r = engine->os->apply_transaction(&sequencer, std::move(t));
-  if (r) {
-    engine->deref();
-    throw std::system_error(r, std::system_category(), "job init");
+    int r = engine->os->apply_transaction(coll.ch, std::move(t));
+    if (r) {
+      engine->deref();
+      throw std::system_error(r, std::system_category(), "job init");
+    }
   }
 }
 
 Job::~Job()
 {
   if (unlink) {
-    destroy_collections(engine->os, collections);
     ObjectStore::Transaction t;
+    bool failed = false;
     // remove our objects
     for (auto& obj : objects) {
       t.remove(obj.coll.cid, obj.oid);
+      int r = engine->os->apply_transaction(obj.coll.ch, std::move(t));
+      if (r && !failed) {
+       derr << "job cleanup failed with " << cpp_strerror(-r) << dendl;
+       failed = true;
+      }
     }
-    ObjectStore::Sequencer sequencer("job cleanup");
-    int r = engine->os->apply_transaction(&sequencer, std::move(t));
-    if (r)
-      derr << "job cleanup failed with " << cpp_strerror(-r) << dendl;
+    destroy_collections(engine->os, collections);
   }
   engine->deref();
 }
 
-
 int fio_ceph_os_setup(thread_data* td)
 {
   // if there are multiple jobs, they must run in the same process against a
@@ -528,7 +535,7 @@ int fio_ceph_os_queue(thread_data* td, io_u* u)
 
     map<string,bufferptr> attrset;
     map<string, bufferlist> omaps;
-    // enqueue a write transaction on the collection's sequencer
+    // enqueue a write transaction on the collection's handle
     ObjectStore::Transaction t;
     char ver_key[64];
 
@@ -636,7 +643,7 @@ int fio_ceph_os_queue(thread_data* td, io_u* u)
       ghobject_t pgmeta_oid(coll.pg.make_pgmeta_oid());
       t.omap_setkeys(coll.cid, pgmeta_oid, omaps);
     }
-    os->queue_transaction(&coll.sequencer,
+    os->queue_transaction(coll.ch,
                           std::move(t),
                           nullptr,
                           new UnitComplete(u));
@@ -646,7 +653,7 @@ int fio_ceph_os_queue(thread_data* td, io_u* u)
   if (u->ddir == DDIR_READ) {
     // ObjectStore reads are synchronous, so make the call and return COMPLETED
     bufferlist bl;
-    int r = os->read(coll.cid, object.oid, u->offset, u->xfer_buflen, bl);
+    int r = os->read(coll.ch, object.oid, u->offset, u->xfer_buflen, bl);
     if (r < 0) {
       u->error = r;
       td_verror(td, u->error, "xfer");