From d46e6c3bff985be14e7c66caf3b7819bd6daf6fa Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 17 Jun 2013 13:09:21 -0700 Subject: [PATCH] OSD: we need to check pg ?.0 for resurrection Fixes: #5269 Signed-off-by: Samuel Just Reviewed-by: Sage Weil Reviewed-by: Greg Farnum --- src/osd/OSD.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 521e7f69b0b9d..f9a8bcbe8e378 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) -- 2.39.5