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 7dd0acae8c2b5f20919e24652f0cc675eec5ed7d..a028717935967525b022dfff2f66b1a3a103735f 100644 (file)
--- 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 c58a1c45793e54e36658d0231d0288efee531054..c3addd78728c72488243b940ea6500351d4bbdc7 100644 (file)
--- 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) {