From: Sage Weil <sage@inktank.com>
Date: Thu, 26 Dec 2013 17:19:08 +0000 (-0800)
Subject: osd/ReplicatedPG: always encode snaps in finish_ctx
X-Git-Tag: v0.76~24^2~40
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=38fe575d56b8e5acc11dfdf84f2d7e74cb55dc36;p=ceph.git

osd/ReplicatedPG: always encode snaps in finish_ctx

On promote we use finish_ctx to build the final log entries, and need to
encode the snaps vector in that case.  (Normally this is done by
make_writeable or explicitly by the snap trimmer.)

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 2b9bb5cc70ee5..1119d2c992641 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4645,6 +4645,10 @@ void ReplicatedPG::finish_ctx(OpContext *ctx, int log_op_type)
 				    ctx->obs->oi.version,
 				    ctx->user_at_version, ctx->reqid,
 				    ctx->mtime));
+  if (soid.snap < CEPH_NOSNAP) {
+    dout(20) << __func__ << " encoding snaps " << ctx->new_obs.oi.snaps << dendl;
+    ::encode(ctx->new_obs.oi.snaps, ctx->log.back().snaps);
+  }
 
   // apply new object state.
   ctx->obc->obs = ctx->new_obs;