diff options
| author | Csaba Henk <csaba@redhat.com> | 2012-02-29 10:21:09 +0100 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-03-01 09:26:53 -0800 |
| commit | 316e694d53f20a76ee36654a9a865a493800dc3c (patch) | |
| tree | d0c7d5505974609a27103816a18fbc9dd3a2bcf6 | |
| parent | 326a7d04260c15f1b6e201621438844f8747b963 (diff) | |
geo-rep / syncdaemon: make the timeout for establishing the connection to slave configurable
It can be set through the connection-timeout tunable but we keep it hidden,
intended as a workaround for some special scenarios not for general use.
Change-Id: I31f9fa3873afa7babc2106ee34484123a01bdc57
BUG: 789078
Signed-off-by: Csaba Henk <csaba@redhat.com>
Reviewed-on: http://review.gluster.com/2839
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
| -rw-r--r-- | xlators/features/marker/utils/syncdaemon/gsyncd.py | 1 | ||||
| -rw-r--r-- | xlators/features/marker/utils/syncdaemon/monitor.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xlators/features/marker/utils/syncdaemon/gsyncd.py b/xlators/features/marker/utils/syncdaemon/gsyncd.py index f145cbc6d..343bb8cb0 100644 --- a/xlators/features/marker/utils/syncdaemon/gsyncd.py +++ b/xlators/features/marker/utils/syncdaemon/gsyncd.py @@ -162,6 +162,7 @@ def main_i(): op.add_option('--rsync-command', metavar='CMD', default='rsync') op.add_option('--rsync-extra', metavar='ARGS', default='-S', help=SUPPRESS_HELP) op.add_option('--timeout', metavar='SEC', type=int, default=120) + op.add_option('--connection-timeout', metavar='SEC', type=int, default=60, help=SUPPRESS_HELP) op.add_option('--sync-jobs', metavar='N', type=int, default=3) op.add_option('--turns', metavar='N', type=int, default=0, help=SUPPRESS_HELP) op.add_option('--allow-network', metavar='IPS', default='') diff --git a/xlators/features/marker/utils/syncdaemon/monitor.py b/xlators/features/marker/utils/syncdaemon/monitor.py index 9536f3e26..981643ec0 100644 --- a/xlators/features/marker/utils/syncdaemon/monitor.py +++ b/xlators/features/marker/utils/syncdaemon/monitor.py @@ -75,7 +75,7 @@ class Monitor(object): if os.WIFEXITED(s): return os.WEXITSTATUS(s) return 1 - conn_timeout = 60 + conn_timeout = int(gconf.connection_timeout) while ret in (0, 1): logging.info('-' * conn_timeout) logging.info('starting gsyncd worker') |