From: Sage Weil <sage@redhat.com>
Date: Sat, 26 Mar 2016 20:13:42 +0000 (-0400)
Subject: Merge pull request #8291 from xiexingguo/xxg-wip-fixhistorymerge
X-Git-Tag: v10.1.1~98
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c972d0cd42e4acfa7405c1204affd7cef39aa5dd;p=ceph.git

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>
---

c972d0cd42e4acfa7405c1204affd7cef39aa5dd
diff --cc src/osd/PG.cc
index 588f5b1668c6,13bb8d097118..c4a62d4930cb
--- a/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)