From: Samuel Just <sam.just@inktank.com>
Date: Tue, 4 Mar 2014 06:22:39 +0000 (-0800)
Subject: ReplicatedPG::finish_ctx: use correct snapdir prior version in events
X-Git-Tag: v0.78~91
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3e219961a07b111cd25a9ab59c39a15c73c09f99;p=ceph.git

ReplicatedPG::finish_ctx: use correct snapdir prior version in events

Fixes: #7595
Reviewed-by: Greg Farnum <greg@inktank.com>
Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 3d4af48be46f9..6561429fb9ce1 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4979,7 +4979,7 @@ void ReplicatedPG::finish_ctx(OpContext *ctx, int log_op_type)
 	  ctx->release_snapset_obc = true;
 	  ctx->log.push_back(pg_log_entry_t(pg_log_entry_t::DELETE, snapoid,
 	      ctx->at_version,
-	      ctx->obs->oi.version,
+	      ctx->snapset_obc->obs.oi.version,
 	      0, osd_reqid_t(), ctx->mtime));
 	  if (pool.info.require_rollback()) {
 	    if (ctx->log.back().mod_desc.rmobject(ctx->at_version.version)) {
@@ -5006,7 +5006,7 @@ void ReplicatedPG::finish_ctx(OpContext *ctx, int log_op_type)
 	       << " in " << snapoid << dendl;
       ctx->log.push_back(pg_log_entry_t(pg_log_entry_t::MODIFY, snapoid,
 					ctx->at_version,
-					ctx->obs->oi.version,
+	                                eversion_t(),
 					0, osd_reqid_t(), ctx->mtime));
 
       ctx->snapset_obc = get_object_context(snapoid, true);