]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cls::journal: async client_unregister
authorMykola Golub <mgolub@mirantis.com>
Sat, 27 Feb 2016 10:20:49 +0000 (12:20 +0200)
committerMykola Golub <mgolub@mirantis.com>
Sat, 27 Feb 2016 10:33:04 +0000 (12:33 +0200)
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
src/cls/journal/cls_journal_client.cc
src/cls/journal/cls_journal_client.h

index 32959642eafe9922aa77316002d20acf36b1f1ea..2566800611a64e0333a8b8b12af40356415cfb94 100644 (file)
@@ -291,11 +291,17 @@ void client_update(librados::ObjectWriteOperation *op,
 
 int client_unregister(librados::IoCtx &ioctx, const std::string &oid,
                        const std::string &id) {
-  bufferlist inbl;
-  ::encode(id, inbl);
+  librados::ObjectWriteOperation op;
+  client_unregister(&op, id);
+  return ioctx.operate(oid, &op);
+}
 
-  bufferlist outbl;
-  return ioctx.exec(oid, "journal", "client_unregister", inbl, outbl);
+void client_unregister(librados::ObjectWriteOperation *op,
+                      const std::string &id) {
+
+  bufferlist bl;
+  ::encode(id, bl);
+  op->exec("journal", "client_unregister", bl);
 }
 
 void client_commit(librados::ObjectWriteOperation *op, const std::string &id,
index 37b0143b2ee6de61b8472592a0dfcfbb8139d374..9aa00af4514031da71f56bbbb1d41478cc6e7c5b 100644 (file)
@@ -52,6 +52,8 @@ void client_update(librados::ObjectWriteOperation *op,
 
 int client_unregister(librados::IoCtx &ioctx, const std::string &oid,
                       const std::string &id);
+void client_unregister(librados::ObjectWriteOperation *op,
+                      const std::string &id);
 
 void client_commit(librados::ObjectWriteOperation *op, const std::string &id,
                    const cls::journal::ObjectSetPosition &commit_position);