From: Kefu Chai <kchai@redhat.com>
Date: Thu, 10 Dec 2020 09:06:00 +0000 (+0800)
Subject: mon/Monitor: remove unused variable
X-Git-Tag: v16.1.0~203^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=152d655fbf291d5e657513e2b2fa5ac99f34b665;p=ceph.git

mon/Monitor: remove unused variable

and add error handling

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index d28e21a746f7..c2198638de24 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -5378,11 +5378,13 @@ void Monitor::get_all_versions(std::map<string, list<string> > &versions)
 
 void Monitor::get_versions(std::map<string, list<string> > &versions)
 {
-  int i = 0;
   for (auto& [rank, metadata] : mon_metadata) {
     auto q = metadata.find("ceph_version_short");
+    if (q == metadata.end()) {
+      // not likely
+      continue;
+    }
     versions[q->second].push_back(string("mon.") + monmap->get_name(rank));
-    i = i + 1;
   }
 }