From: Kefu Chai <kchai@redhat.com>
Date: Wed, 12 Oct 2016 09:07:15 +0000 (+0800)
Subject: mon/MonClient: remove unnecessary helper functions
X-Git-Tag: v12.0.1~412^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c3cca96d93890f0fda0e2674d788460787834caf;p=ceph-ci.git

mon/MonClient: remove unnecessary helper functions

refactor _reopen_session() by removing wrapper around it.

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

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 029bf51134b..5b2057adfcf 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -567,19 +567,17 @@ void MonClient::_send_mon_message(Message *m)
   }
 }
 
-void MonClient::_reopen_session(int rank, string name)
+void MonClient::_reopen_session(int rank)
 {
   assert(monc_lock.is_locked());
-  ldout(cct, 10) << __func__ << " rank " << rank << " name " << name << dendl;
+  ldout(cct, 10) << __func__ << " rank " << rank << dendl;
 
   active_con.reset();
   pending_cons.clear();
 
   _start_hunting();
-  
-  if (name.length()) {
-    _add_conn(monmap.get_rank(name));
-  } else if (rank >= 0) {
+
+  if (rank >= 0) {
     _add_conn(rank);
   } else {
     _add_conns();
@@ -931,7 +929,7 @@ void MonClient::_send_command(MonCommand *r)
       _finish_command(r, -ENOENT, "mon rank dne");
       return;
     }
-    _reopen_session(r->target_rank, string());
+    _reopen_session(r->target_rank);
     return;
   }
 
@@ -946,7 +944,7 @@ void MonClient::_send_command(MonCommand *r)
       _finish_command(r, -ENOENT, "mon dne");
       return;
     }
-    _reopen_session(-1, r->target_name);
+    _reopen_session(monmap.get_rank(r->target_name));
     return;
   }
 
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 3e3a10a744c..264f8cb5c49 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -204,10 +204,7 @@ private:
   void _start_hunting();
   void _finish_hunting();
   void _finish_auth(int auth_err);
-  void _reopen_session(int rank, string name);
-  void _reopen_session() {
-    _reopen_session(-1, string());
-  }
+  void _reopen_session(int rank = -1);
   MonConnection& _add_conn(unsigned rank);
   void _add_conns();
   void _send_mon_message(Message *m);