From: Samuel Just Date: Fri, 21 Jan 2011 21:01:20 +0000 (-0800) Subject: ReplicatedPG: fix snap_trimmer log version bug X-Git-Tag: v0.24.2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=785bf0fcbfb69efa8dd97340c8ee0079bb5ad55e;p=ceph.git ReplicatedPG: fix snap_trimmer log version bug Previously, ctx->at_version would be the same as ctx->obs->oi.version leading to the log entry having prior_version == version. This bug was introduced in d1b85e06fb5ce1cfd5bbc74ba639811b92033909. Signed-off-by: Samuel Just --- diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 3959b6658f78..4aa34ce56ce9 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -674,7 +674,7 @@ bool ReplicatedPG::snap_trimmer() t->collection_add(coll_t(info.pgid, newsnaps[newsnaps.size()-1]), coll_t(info.pgid), coid); } - ctx->log.push_back(Log::Entry(Log::Entry::MODIFY, coid, ctx->at_version, ctx->obs->oi.version, + ctx->log.push_back(Log::Entry(Log::Entry::MODIFY, coid, coi.version, coi.prior_version, osd_reqid_t(), ctx->mtime)); ctx->at_version.version++; }