summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-01-21 19:08:26 +0100
committerSage Weil <sage@newdream.net>2011-01-21 19:08:26 +0100
commitaaed6eb3d066144c1e661cc004767afc356f6b37 (patch)
tree624da831dbad56863ba60d8ed3ebabf576a74561
parentmonclient: fix locking (diff)
downloadceph-aaed6eb3d066144c1e661cc004767afc356f6b37.tar.xz
ceph-aaed6eb3d066144c1e661cc004767afc356f6b37.zip
msgr: always start reaper
If we didn't explicitly bind (i.e. are a client), then we don't start the accepter. That's fine. But the reaper thread start was also conditional, when it shouldn't be; otherwise the client can't clean up old Pipes (and their sockets). Fixes: #732 Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--src/msg/SimpleMessenger.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 4601e92d0b5..db742404251 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -2410,12 +2410,11 @@ int SimpleMessenger::start(bool nodaemon)
}
// go!
- if (did_bind) {
+ if (did_bind)
accepter.start();
- reaper_started = true;
- reaper_thread.create();
- }
+ reaper_started = true;
+ reaper_thread.create();
return 0;
}