From: Sage Weil <sage@inktank.com>
Date: Thu, 13 Jun 2013 14:39:02 +0000 (-0700)
Subject: mon/MonClient: mark_down during get_monmap_privately() shutdown
X-Git-Tag: v0.66~90^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F356%2Fhead;p=ceph.git

mon/MonClient: mark_down during get_monmap_privately() shutdown

We explicitly mark_down() and clear cur_con when shutting down; do the same
for get_monmap_privately() to ensure that the reset event doesn't make us
do something silly (like, in this case, call _reopen_session() again).

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

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 48956aa85c5b..1243376eb370 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -143,6 +143,8 @@ int MonClient::get_monmap_privately()
   }
 
   if (temp_msgr) {
+    messenger->mark_down(cur_con);
+    cur_con.reset(NULL);
     monc_lock.Unlock();
     messenger->shutdown();
     if (smessenger)