Merge pull request #1381 from ceph/wip-7618

ReplicatedPG::recover_replicas: do not assume that missing objects are u...

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Samuel Just 2014-03-05 15:31:57 -08:00
commit b563a7c7d6

View File

@ -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;
}