diff options
author | Csaba Henk <csaba@gluster.com> | 2011-04-21 16:43:49 +0000 |
---|---|---|
committer | Anand Avati <avati@gluster.com> | 2011-04-22 04:05:20 -0700 |
commit | 775323c1b2fa9a557d3ea74d57e843575f7b1278 (patch) | |
tree | 58ceec9deac4c3b947a58a025255720abba45223 /xlators/features/marker/utils/syncdaemon/master.py | |
parent | de809504282731332c9bc0fc7f7da5be34f206ce (diff) |
syncdaemon: have the monitor kill the worker if it does not connect in 60 sec
Signed-off-by: Csaba Henk <csaba@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
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
Diffstat (limited to 'xlators/features/marker/utils/syncdaemon/master.py')
-rw-r--r-- | xlators/features/marker/utils/syncdaemon/master.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xlators/features/marker/utils/syncdaemon/master.py b/xlators/features/marker/utils/syncdaemon/master.py index 35dc4ee06aa..76f924ed37a 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(): |