From 775323c1b2fa9a557d3ea74d57e843575f7b1278 Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Thu, 21 Apr 2011 16:43:49 +0000 Subject: syncdaemon: have the monitor kill the worker if it does not connect in 60 sec Signed-off-by: Csaba Henk Signed-off-by: Anand Avati BUG: 2736 (gsyncd hangs if crash occurs in the non-main thread) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2736 --- xlators/features/marker/utils/syncdaemon/master.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'xlators/features/marker/utils/syncdaemon/master.py') diff --git a/xlators/features/marker/utils/syncdaemon/master.py b/xlators/features/marker/utils/syncdaemon/master.py index 35dc4ee06..76f924ed3 100644 --- a/xlators/features/marker/utils/syncdaemon/master.py +++ b/xlators/features/marker/utils/syncdaemon/master.py @@ -87,6 +87,9 @@ class GMaster(object): self.terminate = False def crawl_loop(self): + ffd = getattr(gconf, 'feedback_fd', None) + if ffd: + os.close(int(ffd)) timo = int(gconf.timeout or 0) if timo > 0: def keep_alive(): -- cgit