From: Samuel Just <sam.just@inktank.com>
Date: Wed, 5 Mar 2014 21:16:18 +0000 (-0800)
Subject: ReplicatedPG::recover_replicas: do not assume that missing objects are unfound
X-Git-Tag: v0.78~80^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1381%2Fhead;p=ceph.git

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 c95a7e59f70b..99ba926e5ad9 100644
--- 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;
       }