diff options
| author | Sage Weil <sage@inktank.com> | 2013-06-13 07:39:02 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-13 10:53:06 -0700 |
| commit | 0193f88519869e41362e1aef1dfd0673f7579144 (patch) | |
| tree | 6e700c277a8de65e091dd056631bd6864ab0c9c6 | |
| parent | 962d118743638b334e5b9135198a612b4a6f1953 (diff) | |
| download | ceph-0193f88519869e41362e1aef1dfd0673f7579144.tar.gz | |
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>
| -rw-r--r-- | src/mon/MonClient.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index 48956aa85c5..1243376eb37 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) |