From: Sage Weil <sage@newdream.net>
Date: Mon, 19 Jul 2010 20:39:18 +0000 (-0700)
Subject: osd: fix subop version in snaptrimmer
X-Git-Tag: v0.21~90
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f7cc6e8f9d992d7dfb90a5be615aebb30b3d63fd;p=ceph.git

osd: fix subop version in snaptrimmer

The at_version should end equal to last_update, not +1.
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 11b8d8c8507e..c5108faf4008 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -852,8 +852,6 @@ bool ReplicatedPG::snap_trimmer()
 	ctx->snapset_obc->obs.exists = false;
 
 	t->remove(coll_t::build_pg_coll(info.pgid), snapoid);
-
-	ctx->at_version.version++;
       } else {
 	dout(10) << coid << " updating snapset on " << snapoid << dendl;
 	ctx->log.push_back(Log::Entry(Log::Entry::MODIFY, snapoid, ctx->at_version, 
@@ -869,8 +867,6 @@ bool ReplicatedPG::snap_trimmer()
 	bl.clear();
 	::encode(ctx->snapset_obc->obs.oi, bl);
 	t->setattr(coll_t::build_pg_coll(info.pgid), snapoid, OI_ATTR, bl);
-
-	ctx->at_version.version++;
       }
 
       log_op(ctx->log, eversion_t(), ctx->local_t);