diff options
author | Samuel Just <sam.just@inktank.com> | 2013-07-18 19:25:14 -0700 |
---|---|---|
committer | Samuel Just <sam.just@inktank.com> | 2013-07-19 10:39:02 -0700 |
commit | 9f56a7b8bfcb63cb4fbbc0c9b8ff01de9e518c57 (patch) | |
tree | b44dc7f2d076725ac2f2055a23441f46efd67d21 | |
parent | d3e53cd66b0fc477f71cbd2c25113c4c9e404bc5 (diff) | |
download | ceph-9f56a7b8bfcb63cb4fbbc0c9b8ff01de9e518c57.tar.gz |
PG, ReplicatedPG: pass a transaction down to ReplicatedPG::on_change
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r-- | src/osd/PG.cc | 8 | ||||
-rw-r--r-- | src/osd/PG.h | 5 | ||||
-rw-r--r-- | src/osd/ReplicatedPG.cc | 2 | ||||
-rw-r--r-- | src/osd/ReplicatedPG.h | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 2a07887a2a3..0420665363a 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -4511,7 +4511,8 @@ void PG::start_flush(ObjectStore::Transaction *t, /* Called before initializing peering during advance_map */ void PG::start_peering_interval(const OSDMapRef lastmap, const vector<int>& newup, - const vector<int>& newacting) + const vector<int>& newacting, + ObjectStore::Transaction *t) { const OSDMapRef osdmap = get_osdmap(); @@ -4600,7 +4601,7 @@ void PG::start_peering_interval(const OSDMapRef lastmap, // pg->on_* - on_change(); + on_change(t); assert(!deleting); @@ -5237,7 +5238,8 @@ boost::statechart::result PG::RecoveryState::Reset::react(const AdvMap& advmap) pg->is_split(advmap.lastmap, advmap.osdmap)) { dout(10) << "up or acting affected, calling start_peering_interval again" << dendl; - pg->start_peering_interval(advmap.lastmap, advmap.newup, advmap.newacting); + pg->start_peering_interval(advmap.lastmap, advmap.newup, advmap.newacting, + context< RecoveryMachine >().get_cur_transaction()); } return discard_event(); } diff --git a/src/osd/PG.h b/src/osd/PG.h index e1f64dbc9fb..819c9c62f62 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -1703,7 +1703,8 @@ public: void start_peering_interval(const OSDMapRef lastmap, const vector<int>& newup, - const vector<int>& newacting); + const vector<int>& newacting, + ObjectStore::Transaction *t); void start_flush(ObjectStore::Transaction *t, list<Context *> *on_applied, list<Context *> *on_safe); @@ -1793,7 +1794,7 @@ public: virtual bool same_for_rep_modify_since(epoch_t e) = 0; virtual void on_role_change() = 0; - virtual void on_change() = 0; + virtual void on_change(ObjectStore::Transaction *t) = 0; virtual void on_activate() = 0; virtual void on_flushed() = 0; virtual void on_shutdown() = 0; diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 453fdacfb76..60b59738d53 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -6717,7 +6717,7 @@ void ReplicatedPG::on_activate() } } -void ReplicatedPG::on_change() +void ReplicatedPG::on_change(ObjectStore::Transaction *t) { dout(10) << "on_change" << dendl; diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 8f0cf6ec31c..8fc21a88068 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -1042,7 +1042,7 @@ public: void _finish_mark_all_unfound_lost(list<ObjectContext*>& obcs); void on_role_change(); - void on_change(); + void on_change(ObjectStore::Transaction *t); void on_activate(); void on_flushed(); void on_removal(ObjectStore::Transaction *t); |