From: Kefu Chai <kchai@redhat.com>
Date: Thu, 10 Sep 2020 11:49:13 +0000 (+0800)
Subject: crimson/osd: use structured binding in loop
X-Git-Tag: v16.1.0~1125^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=69260a60b7f76442d72a70c381d79357467be94e;p=ceph.git

crimson/osd: use structured binding in loop

use alias for accessing the elements for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/osd_operations/compound_peering_request.cc b/src/crimson/osd/osd_operations/compound_peering_request.cc
index 989c067d60d..e55760096e4 100644
--- a/src/crimson/osd/osd_operations/compound_peering_request.cc
+++ b/src/crimson/osd/osd_operations/compound_peering_request.cc
@@ -64,23 +64,23 @@ std::vector<OperationRef> handle_pg_create(
   Ref<MOSDPGCreate2> m)
 {
   std::vector<OperationRef> ret;
-  for (auto &p : m->pgs) {
-    const spg_t &pgid = p.first;
-    const auto &[created, created_stamp] = p.second;
+  for (auto& [pgid, when] : m->pgs) {
+    const auto &[created, created_stamp] = when;
     auto q = m->pg_extra.find(pgid);
     ceph_assert(q != m->pg_extra.end());
+    auto& [history, pi] = q->second;
     logger().debug(
       "{}: {} e{} @{} "
       "history {} pi {}",
       __func__, pgid, created, created_stamp,
-      q->second.first, q->second.second);
-    if (!q->second.second.empty() &&
-	m->epoch < q->second.second.get_bounds().second) {
+      history, pi);
+    if (!pi.empty() &&
+	m->epoch < pi.get_bounds().second) {
       logger().error(
         "got pg_create on {} epoch {}  "
         "unmatched past_intervals {} (history {})",
         pgid, m->epoch,
-        q->second.second, q->second.first);
+        pi, history);
     } else {
       auto op = osd.get_shard_services().start_operation<PeeringSubEvent>(
 	  state,
@@ -93,12 +93,7 @@ std::vector<OperationRef> handle_pg_create(
 	  m->epoch,
 	  NullEvt(),
 	  true,
-	  new PGCreateInfo(
-	    pgid,
-	    m->epoch,
-	    q->second.first,
-	    q->second.second,
-	    true)).first;
+	  new PGCreateInfo(pgid, m->epoch, history, pi, true)).first;
       ret.push_back(op);
     }
   }