From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Aug 2014 22:30:30 +0000 (-0700)
Subject: mon/MonClient: ensure !cur_con == cur_mon.empty()
X-Git-Tag: v0.86~213^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b944085f46663ba72232d326d1e6e1dd3a3cee7;p=ceph.git

mon/MonClient: ensure !cur_con == cur_mon.empty()

Keep these in sync.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 0c64e93bb68..46ffa5c8508 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -153,6 +153,7 @@ int MonClient::get_monmap_privately()
     if (cur_con) {
       cur_con->mark_down();
       cur_con.reset(NULL);
+      cur_mon.clear();
     }
     monc_lock.Unlock();
     messenger->shutdown();
@@ -165,7 +166,6 @@ int MonClient::get_monmap_privately()
 
   hunting = true;  // reset this to true!
   cur_mon.clear();
-
   cur_con.reset(NULL);
 
   if (!monmap.fsid.is_zero())
@@ -424,6 +424,7 @@ void MonClient::shutdown()
   if (cur_con)
     cur_con->mark_down();
   cur_con.reset(NULL);
+  cur_mon.clear();
 
   monc_lock.Unlock();
 }