From: Samuel Just <sam.just@inktank.com>
Date: Wed, 5 Mar 2014 23:51:10 +0000 (-0800)
Subject: ReplicatedPG::wait_for_degraded_object: only recover if found
X-Git-Tag: v0.78~76^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1387%2Fhead;p=ceph.git

ReplicatedPG::wait_for_degraded_object: only recover if found

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index d031256261a5..8a1d7b19f7c1 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -459,6 +459,11 @@ void ReplicatedPG::wait_for_degraded_object(const hobject_t& soid, OpRequestRef
 	    << soid 
 	    << ", already recovering"
 	    << dendl;
+  } else if (missing_loc.is_unfound(soid)) {
+    dout(7) << "degraded "
+	    << soid
+	    << ", still unfound, waiting"
+	    << dendl;
   } else {
     dout(7) << "degraded " 
 	    << soid