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 48956aa85c5b3b9d847ea9a2beaa81714ddfc7cc..1243376eb370ad7b07dbb503342cbe1e55ca6a4d 100644 (file)
--- 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)