ReplicatedPG::recover_replicas: do not assume that missing objects are unfound

Fixes: #7618
Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index c95a7e59f70ba33613a2f98a49eb0680ffd05a3a..99ba926e5ad98040d666807dcfc671fe2990a397 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -9557,11 +9557,13 @@ int ReplicatedPG::recover_replicas(int max, ThreadPool::TPHandle &handle)
        continue;
       }
 
+      if (missing_loc.is_unfound(soid)) {
+       dout(10) << __func__ << ": " << soid << " still unfound" << dendl;
+       continue;
+      }
+
       if (pg_log.get_missing().is_missing(soid)) {
-       if (missing_loc.is_unfound(soid))
-         dout(10) << __func__ << ": " << soid << " still unfound" << dendl;
-       else
-         dout(10) << __func__ << ": " << soid << " still missing on primary" << dendl;
+       dout(10) << __func__ << ": " << soid << " still missing on primary" << dendl;
        continue;
       }