From: Sage Weil <sage@newdream.net>
Date: Tue, 17 Nov 2009 18:46:32 +0000 (-0800)
Subject: monc: small cleanup
X-Git-Tag: v0.18~104
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fcc234a8a09f2dbc1124934acf6fa6775892ebf1;p=ceph.git

monc: small cleanup

avoid unnec finish_hunting call on get_monmap_privately
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 2bdaff201a13..87cffa18132f 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -207,16 +207,19 @@ void MonClient::handle_monmap(MMonMap *m)
   dout(10) << "handle_monmap " << *m << dendl;
   monc_lock.Lock();
 
-  _finish_hunting();
-
   bufferlist::iterator p = m->monmapbl.begin();
   ::decode(monmap, p);
 
+  dout(10) << " got monmap " << monmap.epoch << dendl;
+
   _sub_got("monmap", monmap.get_epoch());
 
   map_cond.Signal();
   want_monmap = false;
 
+  if (cur_mon >= 0)
+    _finish_hunting();
+
   monc_lock.Unlock();
   delete m;
 }