From 5869591b82155e51429be247537fa8531b9ae4d3 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 29 Jun 2011 15:31:49 -0700 Subject: [PATCH] ReplicatedPG: fix snaps decode in recover_primary Signed-off-by: Samuel Just --- src/osd/ReplicatedPG.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 1bff3b93ab156..dd88b5224df37 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -910,6 +910,7 @@ ReplicatedPG::RepGather *ReplicatedPG::trim_object(const sobject_t &coid, ctx->log.push_back(Log::Entry(Log::Entry::MODIFY, coid, coi.version, coi.prior_version, osd_reqid_t(), ctx->mtime)); + ::encode(coi, ctx->log.back().snaps); ctx->at_version.version++; } @@ -4482,7 +4483,9 @@ int ReplicatedPG::recover_primary(int max) object_info_t oi(headobc->obs.oi); oi.version = latest->version; oi.prior_version = latest->prior_version; - ::decode(oi.snaps, latest->snaps); + bufferlist::iterator i = latest->snaps.begin(); + ::decode(oi.snaps, i); + assert(oi.snaps.size() > 0); oi.copy_user_bits(headobc->obs.oi); _make_clone(*t, head, soid, &oi); -- 2.39.5