Remove --timeout option to rsync from synchronize defaults
The current 10-second default timeout for rsync seems to be behind issue #6809. As a workaround for the underlying issue in rsync when different versions are used on the source and destination sides, don't include the timeout option unless the user specifies a timeout > 0.
This commit is contained in:
parent
71a870a6be
commit
a8d9470938
1 changed files with 5 additions and 3 deletions
|
@ -124,7 +124,7 @@ options:
|
|||
rsync_timeout:
|
||||
description:
|
||||
- Specify a --timeout for the rsync command in seconds.
|
||||
default: 10
|
||||
default: 0
|
||||
required: false
|
||||
set_remote_user:
|
||||
description:
|
||||
|
@ -215,7 +215,7 @@ def main():
|
|||
owner = dict(type='bool'),
|
||||
group = dict(type='bool'),
|
||||
set_remote_user = dict(default='yes', type='bool'),
|
||||
rsync_timeout = dict(type='int', default=10),
|
||||
rsync_timeout = dict(type='int', default=0),
|
||||
rsync_opts = dict(type='list')
|
||||
),
|
||||
supports_check_mode = True
|
||||
|
@ -243,7 +243,9 @@ def main():
|
|||
group = module.params['group']
|
||||
rsync_opts = module.params['rsync_opts']
|
||||
|
||||
cmd = '%s --delay-updates -FF --compress --timeout=%s' % (rsync, rsync_timeout)
|
||||
cmd = '%s --delay-updates -FF --compress' % rsync
|
||||
if rsync_timeout:
|
||||
cmd = cmd + ' --timeout=%s' % rsync_timeout
|
||||
if module.check_mode:
|
||||
cmd = cmd + ' --dry-run'
|
||||
if delete:
|
||||
|
|
Loading…
Reference in a new issue