From: Xinze Chi Date: Fri, 15 Sep 2017 08:03:09 +0000 (+0800) Subject: osd: using get_rmissing instread of missing as the judgement X-Git-Tag: v13.0.1~712^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17752%2Fhead;p=ceph.git osd: using get_rmissing instread of missing as the judgement the below code using peer_missing iterator Signed-off-by: Xinze Chi --- diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 25ff18696ba..c5a35cbd0f1 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -728,7 +728,7 @@ void PrimaryLogPG::maybe_force_recovery() // find the oldest missing object version_t min_version = pg_log.get_log().head.version; hobject_t soid; - if (!pg_log.get_missing().get_items().empty()) { + if (!pg_log.get_missing().get_rmissing().empty()) { min_version = pg_log.get_missing().get_rmissing().begin()->first; soid = pg_log.get_missing().get_rmissing().begin()->second; } @@ -739,7 +739,7 @@ void PrimaryLogPG::maybe_force_recovery() if (*it == get_primary()) continue; pg_shard_t peer = *it; if (peer_missing.count(peer) && - !peer_missing[peer].get_items().empty()) { + !peer_missing[peer].get_rmissing().empty()) { const auto& min_obj = peer_missing[peer].get_rmissing().begin(); dout(20) << __func__ << " peer " << peer << " min_version " << min_obj->first << " oid " << min_obj->second << dendl;