From c58c8990d9949e7de52f1022c26bbd9fa4fe9a85 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 15 Nov 2013 14:34:55 -0800 Subject: [PATCH] PGBackend: allow queue_transaction to specify an op Signed-off-by: Samuel Just --- src/osd/PGBackend.h | 5 ++++- src/osd/ReplicatedPG.h | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h index f2c67f113d6..30804fdbc41 100644 --- a/src/osd/PGBackend.h +++ b/src/osd/PGBackend.h @@ -93,7 +93,10 @@ GenContext *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 &get_actingbackfill() = 0; virtual std::string gen_dbg_prefix() const = 0; diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 0364827fc0d..0626008dea0 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 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(); -- 2.47.3