From: Kefu Chai <kchai@redhat.com>
Date: Sun, 28 Apr 2019 15:31:31 +0000 (+0800)
Subject: crimson/osd: silence -Wunused-variable warning
X-Git-Tag: v15.1.0~2803^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27809%2Fhead;p=ceph.git

crimson/osd: silence -Wunused-variable warning

silence warning like

/home/kchai/ceph/src/crimson/osd/heartbeat.cc:314:24: warning: unused
variable ‘peer’ [-Wunused-variable]
       auto& [peer, info] = item;
                        ^

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

diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc
index 4a1f04a77584..c983ebe6aff4 100644
--- a/src/crimson/osd/heartbeat.cc
+++ b/src/crimson/osd/heartbeat.cc
@@ -311,14 +311,14 @@ seastar::future<> Heartbeat::send_heartbeats()
       const auto now = clock::now();
       const auto deadline =
         now + std::chrono::seconds(local_conf()->osd_heartbeat_grace);
-      auto& [peer, info] = item;
+      auto& info = item.second;
       info.last_tx = now;
       if (clock::is_zero(info.first_tx)) {
         info.first_tx = now;
       }
       const utime_t sent_stamp{now};
-      auto [reply, added] = info.ping_history.emplace(sent_stamp,
-                                                      reply_t{deadline, 0});
+      [[maybe_unused]] auto [reply, added] =
+        info.ping_history.emplace(sent_stamp, reply_t{deadline, 0});
       std::vector<ceph::net::ConnectionRef> conns{info.con_front,
                                                   info.con_back};
       return seastar::parallel_for_each(std::move(conns),
diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 868522945bbf..a7a0daf09e9e 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -409,7 +409,7 @@ PG::find_best_info(const PG::peer_info_t& infos) const
   // when you find bugs!
   auto min_last_update_acceptable = eversion_t::max();
   epoch_t max_les = 0;
-  for (auto& [shard, info] : infos) {
+  for ([[maybe_unused]] auto& [shard, info] : infos) {
     if (max_les < info.history.last_epoch_started) {
       max_les = info.history.last_epoch_started;
     }
@@ -418,7 +418,7 @@ PG::find_best_info(const PG::peer_info_t& infos) const
       max_les = info.last_epoch_started;
     }
   }
-  for (auto& [shard, info] : infos) {
+  for ([[maybe_unused]] auto& [shard, info] : infos) {
     if (max_les <= info.last_epoch_started &&
         min_last_update_acceptable > info.last_update) {
       min_last_update_acceptable = info.last_update;