From: Samuel Just <sam.just@inktank.com>
Date: Fri, 15 Nov 2013 22:34:55 +0000 (-0800)
Subject: PGBackend: allow queue_transaction to specify an op
X-Git-Tag: v0.78~286^2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c58c8990d9949e7de52f1022c26bbd9fa4fe9a85;p=ceph.git

PGBackend: allow queue_transaction to specify an op

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index f2c67f113d63..30804fdbc41d 100644
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -93,7 +93,10 @@
        GenContext<ThreadPool::TPHandle&> *c) = 0;
 
      virtual void send_message(int to_osd, Message *m) = 0;
-     virtual void queue_transaction(ObjectStore::Transaction *t) = 0;
+     virtual void queue_transaction(
+       ObjectStore::Transaction *t,
+       OpRequestRef op = OpRequestRef()
+       ) = 0;
      virtual epoch_t get_epoch() = 0;
      virtual const vector<int> &get_actingbackfill() = 0;
      virtual std::string gen_dbg_prefix() const = 0;
diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 0364827fc0d8..0626008dea0e 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -282,8 +282,10 @@ public:
   void send_message(int to_osd, Message *m) {
     osd->send_message_osd_cluster(to_osd, m, get_osdmap()->get_epoch());
   }
-  void queue_transaction(ObjectStore::Transaction *t) {
-    osd->store->queue_transaction(osr.get(), t);
+  void queue_transaction(ObjectStore::Transaction *t, OpRequestRef op) {
+    list<ObjectStore::Transaction *> tls;
+    tls.push_back(t);
+    osd->store->queue_transaction(osr.get(), t, 0, 0, 0, op);
   }
   epoch_t get_epoch() {
     return get_osdmap()->get_epoch();