Merge pull request ceph#12695 from hjwsm1989/mark-unfound-lost

osd/PrimaryLogPG: optimal pick_newest_available Reviewed-by: Sage Weil <[email protected]>
att · Jan 9, 2017 · 4ca7757 · 4ca7757
2 parents 0a3a8cd + 891c099
commit 4ca7757
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
@@ -9743,9 +9743,10 @@ void PrimaryLogPG::sub_op_remove(OpRequestRef op)
 eversion_t PrimaryLogPG::pick_newest_available(const hobject_t& oid)
 {
   eversion_t v;
-
-  assert(pg_log.get_missing().is_missing(oid));
-  v = pg_log.get_missing().get_items().find(oid)->second.have;
+  pg_missing_item pmi;
+  bool is_missing = pg_log.get_missing().is_missing(oid, &pmi);
+  assert(is_missing);
+  v = pmi.have;
   dout(10) << "pick_newest_available " << oid << " " << v << " on osd." << osd->whoami << " (local)" << dendl;
 
   assert(!actingbackfill.empty());