From 055b5104a0937471603a44d95bae02084203c45d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 2 Dec 2008 10:43:36 -0800 Subject: [PATCH] osd: always get old_version; include in debug output --- src/osd/ReplicatedPG.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index c3ba3782f9246..6880b94de56a7 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -863,7 +863,9 @@ void ReplicatedPG::prepare_clone(ObjectStore::Transaction& t, bufferlist& logbl, snapset.clone_overlap[coid.oid.snap].insert(0, old_size); // log clone - dout(10) << "cloning to " << coid << " v " << at_version << " snaps=" << snaps << dendl; + dout(10) << "cloning v " << old_version + << " to " << coid << " v " << at_version + << " snaps=" << snaps << dendl; Log::Entry cloneentry(PG::Log::Entry::CLONE, coid.oid, at_version, old_version, reqid); cloneentry.snaps = snapsbl; add_log_entry(cloneentry, logbl); @@ -1528,12 +1530,13 @@ void ReplicatedPG::op_modify(MOSDOp *op) snapc.seq = op->get_snap_seq(); snapc.snaps = op->get_snaps(); - SnapSet snapset; eversion_t old_version; + osd->store->getattr(info.pgid.to_coll(), poid, "version", + &old_version, sizeof(old_version)); + + SnapSet snapset; if (poid.oid.snap == CEPH_NOSNAP) { bufferlist bl; - osd->store->getattr(info.pgid.to_coll(), poid, "version", - &old_version, sizeof(old_version)); int r = osd->store->getattr(info.pgid.to_coll(), poid, "snapset", bl); if (r >= 0) { bufferlist::iterator p = bl.begin(); -- 2.39.5