From 785bf0fcbfb69efa8dd97340c8ee0079bb5ad55e Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 21 Jan 2011 13:01:20 -0800 Subject: [PATCH] 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 --- src/osd/ReplicatedPG.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 3959b6658f785..4aa34ce56ce95 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++; } -- 2.39.5