]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: using get_rmissing instread of missing as the judgement 17752/head
authorXinze Chi <xinze@xsky.com>
Fri, 15 Sep 2017 08:03:09 +0000 (16:03 +0800)
committerXinze Chi <xinze@xsky.com>
Thu, 28 Sep 2017 06:50:07 +0000 (14:50 +0800)
the below code using peer_missing iterator

Signed-off-by: Xinze Chi <xinze@xsky.com>
src/osd/PrimaryLogPG.cc

index 25ff18696ba6c7c87b00d7ccb2f303efa999978e..c5a35cbd0f165ef52000bd51061a5e0f7ad487c4 100644 (file)
@@ -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;