From: Samuel Just <sam.just@inktank.com>
Date: Mon, 17 Jun 2013 20:09:21 +0000 (-0700)
Subject: OSD: we need to check pg ?.0 for resurrection
X-Git-Tag: v0.65~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d46e6c3bff985be14e7c66caf3b7819bd6daf6fa;p=ceph.git

OSD: we need to check pg ?.0 for resurrection

Fixes: #5269
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 521e7f69b0b..f9a8bcbe8e3 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1767,10 +1767,12 @@ OSD::res_result OSD::_try_resurrect_pg(
   // find nearest ancestor
   DeletingStateRef df;
   pg_t cur(pgid);
-  while (cur.ps()) {
+  while (true) {
     df = service.deleting_pgs.lookup(pgid);
     if (df)
       break;
+    if (!cur.ps())
+      break;
     cur = cur.get_parent();
   }
   if (!df)