From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 18 Mar 2019 10:45:03 +0000 (+0800)
Subject: mon/MonClient: log mon name instead of rank
X-Git-Tag: v15.0.0~143^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e9b8acd91ab651021ac77ba7f91dfe253d479c4;p=ceph.git

mon/MonClient: log mon name instead of rank

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index f514e7370f034..7ca17f31b2e2c 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -385,17 +385,17 @@ void MonClient::handle_monmap(MMonMap *m)
     ldout(cct,10) << " can't identify which mon we were connected to" << dendl;
     _reopen_session();
   } else {
-    int new_rank = monmap.get_rank(m->get_source_addr());
-    if (new_rank < 0) {
-      ldout(cct, 10) << "mon." << new_rank << " at " << m->get_source_addrs()
+    auto new_name = monmap.get_name(con_addrs);
+    if (new_name.empty()) {
+      ldout(cct, 10) << "mon." << old_name << " at " << con_addrs
 		     << " went away" << dendl;
       // can't find the mon we were talking to (above)
       _reopen_session();
     } else if (messenger->should_use_msgr2() &&
-	       monmap.get_addrs(new_rank).has_msgr2() &&
+	       monmap.get_addrs(new_name).has_msgr2() &&
 	       !con_addrs.has_msgr2()) {
-      ldout(cct,1) << " mon." << new_rank << " has (v2) addrs "
-		   << monmap.get_addrs(new_rank) << " but i'm connected to "
+      ldout(cct,1) << " mon." << new_name << " has (v2) addrs "
+		   << monmap.get_addrs(new_name) << " but i'm connected to "
 		   << con_addrs << ", reconnecting" << dendl;
       _reopen_session();
     }