]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd: refactor PrimaryLogPG::earliest_peer_backfill().
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Wed, 26 Feb 2020 17:05:23 +0000 (18:05 +0100)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Thu, 27 Feb 2020 15:37:27 +0000 (16:37 +0100)
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/osd/PrimaryLogPG.cc

index 8e5b0c2dea93fe25a7bba8919228b40ad8d1face..eeb5a69e0d882fdfaf3d8ece6ba0deafd106e0f3 100644 (file)
@@ -12920,15 +12920,10 @@ uint64_t PrimaryLogPG::recover_replicas(uint64_t max, ThreadPool::TPHandle &hand
 hobject_t PrimaryLogPG::earliest_peer_backfill() const
 {
   hobject_t e = hobject_t::get_max();
-  for (set<pg_shard_t>::const_iterator i = get_backfill_targets().begin();
-       i != get_backfill_targets().end();
-       ++i) {
-    pg_shard_t peer = *i;
-    map<pg_shard_t, BackfillInterval>::const_iterator iter =
-      peer_backfill_info.find(peer);
+  for (const pg_shard_t& peer : get_backfill_targets()) {
+    const auto iter = peer_backfill_info.find(peer);
     ceph_assert(iter != peer_backfill_info.end());
-    if (iter->second.begin < e)
-      e = iter->second.begin;
+    e = std::min(e, iter->second.begin);
   }
   return e;
 }