Merge pull request #8291 from xiexingguo/xxg-wip-fixhistorymerge

osd: more fixes for incorrectly dirtying info; resend reply for duplicated scrub-reserve req

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/osd/PG.cc
index 588f5b1668c67e2c97c803a6662577ffd92b9a1b,13bb8d097118f13c28a3616d8b71b063d4a5a0b2..c4a62d4930cb53f4ad851edaa9654a6dac12247f
--- 1/src/osd/PG.cc
--- 2/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -6505,13 -6493,13 +6505,15 @@@ PG::RecoveryState::Recovered::Recovered
    // DEGRADED | UNDERSIZED is appropriate.
    assert(!pg->actingbackfill.empty());
    if (pg->get_osdmap()->get_pg_size(pg->info.pgid.pgid) <=
-       pg->actingbackfill.size())
+       pg->actingbackfill.size()) {
      pg->state_clear(PG_STATE_DEGRADED);
+     pg->publish_stats_to_osd();
+   }
  
    // adjust acting set?  (e.g. because backfill completed...)
 -  if (pg->acting != pg->up && !pg->choose_acting(auth_log_shard))
 +  bool history_les_bound = false;
 +  if (pg->acting != pg->up && !pg->choose_acting(auth_log_shard,
 +                                               &history_les_bound))
      assert(pg->want_acting.size());
  
    if (context< Active >().all_replicas_activated)