diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-09-09 13:20:29 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-09-23 22:54:59 -0700 |
| commit | 6e39cec352b08b5ac44678a7f95354733a5dcebe (patch) | |
| tree | a4584105d19a926692c8c2eb2309b4fe0a800540 | |
| parent | a8899efd90ae7800462971a202fb0317d53b8eb4 (diff) | |
| download | ceph-6e39cec352b08b5ac44678a7f95354733a5dcebe.tar.gz | |
ReplicatedBackend: track object contexts in Push/PullInfo
Signed-off-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedBackend.h | 3 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 19 |
2 files changed, 7 insertions, 15 deletions
diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h index 88323935e96..dca081b7f44 100644 --- a/src/osd/ReplicatedBackend.h +++ b/src/osd/ReplicatedBackend.h @@ -148,6 +148,7 @@ private: struct PushInfo { ObjectRecoveryProgress recovery_progress; ObjectRecoveryInfo recovery_info; + ObjectContextRef obc; void dump(Formatter *f) const { { @@ -168,6 +169,8 @@ private: struct PullInfo { ObjectRecoveryProgress recovery_progress; ObjectRecoveryInfo recovery_info; + ObjectContextRef head_ctx; + ObjectContextRef obc; void dump(Formatter *f) const { { diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index bef4592fb97..460d7d219c6 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -5941,6 +5941,7 @@ void ReplicatedBackend::prepare_pull( assert(!pulling.count(soid)); pull_from_peer[fromosd].insert(soid); PullInfo &pi = pulling[soid]; + pi.head_ctx = headctx; pi.recovery_info = op.recovery_info; pi.recovery_progress = op.recovery_progress; } @@ -6121,6 +6122,7 @@ void ReplicatedBackend::prep_push( get_parent()->begin_peer_recover(peer, soid); // take note. PushInfo &pi = pushing[soid][peer]; + pi.obc = obc; pi.recovery_info.size = obc->obs.oi.size; pi.recovery_info.copy_subset = data_subset; pi.recovery_info.clone_subset = clone_subsets; @@ -6328,21 +6330,8 @@ bool ReplicatedBackend::handle_pull_response( << dendl; if (first) { - bufferlist oibl; - if (pop.attrset.count(OI_ATTR)) { - oibl.push_back(pop.attrset[OI_ATTR]); - ::decode(pi.recovery_info.oi, oibl); - } else { - assert(0); - } - bufferlist ssbl; - if (pop.attrset.count(SS_ATTR)) { - ssbl.push_back(pop.attrset[SS_ATTR]); - ::decode(pi.recovery_info.ss, ssbl); - } else { - assert(pi.recovery_info.soid.snap != CEPH_NOSNAP && - pi.recovery_info.soid.snap != CEPH_SNAPDIR); - } + pi.obc = get_parent()->get_obc(pi.recovery_info.soid, pop.attrset); + pi.recovery_info.oi = pi.obc->obs.oi; } bool complete = pi.is_complete(); |