From: Samuel Just <sam.just@inktank.com>
Date: Fri, 18 Apr 2014 22:14:33 +0000 (-0700)
Subject: PG,PGLog: update hit_set during peering
X-Git-Tag: v0.80-rc1~13^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16eccdd31343b518e6a687613622db52f6e97e96;p=ceph.git

PG,PGLog: update hit_set during peering

Fixes: #8124
Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7dd0acae8c2b..a02871793596 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1536,6 +1536,7 @@ void PG::activate(ObjectStore::Transaction& t,
 	pi.last_complete = info.last_update;
 	pi.last_backfill = hobject_t();
 	pi.history = info.history;
+	pi.hit_set = info.hit_set;
 	pi.stats.stats.clear();
 
 	m = new MOSDPGLog(
@@ -6591,6 +6592,7 @@ boost::statechart::result PG::RecoveryState::Stray::react(const MInfoRec& infoev
     ObjectStore::Transaction* t = context<RecoveryMachine>().get_cur_transaction();
     pg->rewind_divergent_log(*t, infoevt.info.last_update);
     pg->info.stats = infoevt.info.stats;
+    pg->info.hit_set = infoevt.info.hit_set;
   }
   
   assert(infoevt.info.last_update == pg->info.last_update);
diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index c58a1c45793e..c3addd78728c 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -552,6 +552,7 @@ void PGLog::merge_log(ObjectStore::Transaction& t,
   }
   if (info.last_backfill.is_max())
     info.stats = oinfo.stats;
+  info.hit_set = oinfo.hit_set;
 
   // do we have divergent entries to throw out?
   if (olog.head < log.head) {