From 0193f88519869e41362e1aef1dfd0673f7579144 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 13 Jun 2013 07:39:02 -0700 Subject: [PATCH] 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 --- src/mon/MonClient.cc | 2 ++ 1 file changed, 2 insertions(+) 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) -- 2.47.3