From: Samuel Just <sjust@redhat.com>
Date: Fri, 23 Jan 2015 17:07:44 +0000 (-0800)
Subject: ReplicatedPG::hit_set_persist: update ssc->snapset as well
X-Git-Tag: v0.93~164^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3536%2Fhead;p=ceph.git

ReplicatedPG::hit_set_persist: update ssc->snapset as well

This is a hack.  The correct answer is to adapt this method and
finish_ctx to allow this method to use finish_ctx.  This is complicated
by the presence of the hit set trims in the same repop, so for now, we
kick the can down the road a bit.

Fixes: 10616
Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index fa8d1dffadd..5acd805f8bb 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -11796,7 +11796,9 @@ void ReplicatedPG::hit_set_persist()
   obc->obs.oi.set_data_digest(bl.crc32c(-1));
 
   ctx->new_obs = obc->obs;
-  ctx->new_snapset.head_exists = true;
+
+  obc->ssc->snapset.head_exists = true;
+  ctx->new_snapset = obc->ssc->snapset;
 
   ctx->delta_stats.num_objects++;
   ctx->delta_stats.num_objects_hit_set_archive++;