From a222e7a12bbd4d76ab7e0889af5c1162ea43a4bb Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 5 Mar 2014 13:16:18 -0800 Subject: [PATCH] ReplicatedPG::recover_replicas: do not assume that missing objects are unfound Fixes: #7618 Signed-off-by: Samuel Just --- src/osd/ReplicatedPG.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index c95a7e59f70..99ba926e5ad 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; }