monc: clean up mon pick code slightly

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 0cc51cb94b303b444bb353667a077a0f6ebd8340..110270d7cebc89ab614063a1777a42b80d208830 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -509,9 +509,6 @@ void MDS::handle_mds_beacon(MMDSBeacon *m)
           << " seq " << m->get_seq() << dendl;
   version_t seq = m->get_seq();
 
-  // make note of which mon 
-  monc->note_mon_leader(m->get_source().num());
-
   // update lab
   if (beacon_seq_stamp.count(seq)) {
     assert(beacon_seq_stamp[seq] > beacon_last_acked_stamp);

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 2ffae69e523cec4f57f7bf9dd08eb8ebbbdf56d9..dc8d7a50a9011f989daa39db7dfceeed438d5e35 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -303,7 +303,7 @@ void MonClient::_pick_new_mon()
 {
   if (cur_mon >= 0)
     messenger->mark_down(monmap.get_inst(cur_mon).addr);
-  cur_mon = monmap.pick_mon(true);
+  cur_mon = rand() % monmap.size();
   dout(10) << "_pick_new_mon picked mon" << cur_mon << dendl;
 }
 
@@ -354,8 +354,7 @@ void MonClient::tick()
     if (now > sub_renew_after)
       _renew_subs();
 
-    int oldmon = monmap.pick_mon();
-    messenger->send_keepalive(monmap.mon_inst[oldmon]);
+    messenger->send_keepalive(monmap.mon_inst[cur_mon]);
   }
 
   timer.add_event_after(10.0, new C_Tick(this));

diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 81df9efaacc8c00e8f5a34dfc69690412bbcbc6c..802b2839ce9e6d028ac60e28b034bb2d89e11066 100644 (file)
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -155,10 +155,6 @@ public:
     Mutex::Locker l(monc_lock);
     _send_mon_message(m);
   }
-  void note_mon_leader(int m) {
-    Mutex::Locker l(monc_lock);
-    monmap.last_mon = m;
-  }
   void reopen_session() {
     Mutex::Locker l(monc_lock);
     _reopen_session();