RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

SimpleMessenger: allow multiple calls to shutdown

Browse Source 
Fixes a case where radostool crashed on an error shutdown.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
This commit is contained in:
Colin Patrick McCabe 2011-05-27 14:04:36 -07:00
parent 8490b784cf
commit 4ddf8df804
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/msg/SimpleMessenger.cc
View File

@ -2586,6 +2586,10 @@ int SimpleMessenger::send_keepalive(const entity_inst_t& dest)
void SimpleMessenger::wait()
{
lock.Lock();
if (!started) {
lock.Unlock();
return;
}
while (!destination_stopped) {
dout(10) << "wait: still active" << dendl;
wait_cond.Wait(lock);
@ -2608,6 +2612,7 @@ void SimpleMessenger::wait()
reaper_stop = true;
lock.Unlock();
reaper_thread.join();
reaper_started = false;
dout(20) << "wait: stopped reaper thread" << dendl;
}