From: Samuel Just <sam.just@inktank.com>
Date: Thu, 28 Aug 2014 22:32:22 +0000 (-0700)
Subject: PG: wait until we've build the missing set to discover_all_missing
X-Git-Tag: v0.80.6~4^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb9e65bd9292e2ee03a260cc98aa6715008e6682;p=ceph.git

PG: wait until we've build the missing set to discover_all_missing

Fixes: #9179
Backport: firefly
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 970d9830a3a6e8568337c660fb8b4c4a60a2b3bf)

Conflicts:
	src/osd/PG.cc
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 3e6d7070ec4..9a4d7c612d0 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1487,12 +1487,6 @@ void PG::activate(ObjectStore::Transaction& t,
   } else {
     dout(10) << "activate - not complete, " << missing << dendl;
     pg_log.activate_not_complete(info);
-    if (is_primary()) {
-      dout(10) << "activate - starting recovery" << dendl;
-      osd->queue_for_recovery(this);
-      if (have_unfound())
-	discover_all_missing(query_map);
-    }
   }
     
   log_weirdness();
@@ -1655,6 +1649,11 @@ void PG::activate(ObjectStore::Transaction& t,
       }
 
       build_might_have_unfound();
+
+      dout(10) << "activate - starting recovery" << dendl;
+      osd->queue_for_recovery(this);
+      if (have_unfound())
+	discover_all_missing(query_map);
     }
 
     // degraded?