osd: move scrub no good auth check out of helper

This helps call out that this is an exceptional case and simplifies the
helper a bit.

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

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index 60cc40c9afb1f080a62e2a39fc375b45319826b0..4491b3eb4341f65d0bd8d67d02f8a205c8d86446 100644 (file)
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -453,17 +453,6 @@ map<pg_shard_t, ScrubMap *>::const_iterator
     if (i == j->second->objects.end()) {
       continue;
     }
-    if (auth == maps.end()) {
-      // Something is better than nothing
-      // TODO: something is NOT better than nothing, do something like
-      // unfound_lost if no valid copies can be found, or just mark unfound
-      auth = j;
-      dout(10) << __func__ << ": selecting osd " << j->first
-              << " for obj " << obj
-              << ", auth == maps.end()"
-              << dendl;
-      continue;
-    }
     if (i->second.read_error) {
       // scrub encountered read error, probably corrupt
       dout(10) << __func__ << ": rejecting osd " << j->first
@@ -541,6 +530,18 @@ void PGBackend::be_compare_scrubmaps(
        ++k) {
     map<pg_shard_t, ScrubMap *>::const_iterator auth =
       be_select_auth_object(*k, maps);
+    if (auth == maps.end()) {
+      // Something is better than nothing
+      // TODO: something is NOT better than nothing, do something like
+      // unfound_lost if no valid copies can be found, or just mark unfound
+      auth = j;
+      dout(10) << __func__ << ": selecting osd " << j->first
+              << " for obj " << *k
+              << ", something is better than nothing, FIXME"
+              << dendl;
+      continue;
+    }
+
     assert(auth != maps.end());
     set<pg_shard_t> cur_missing;
     set<pg_shard_t> cur_inconsistent;