patrick/zfs_autobackup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use persistent connections for 600 seconds (10min)

Browse Source
This commit is contained in:
Marius van Witzenburg
2018-04-05 09:23:39 +02:00
parent 62178e424e
commit ba89dc8bb2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zfs_autobackup
View File

@ -38,7 +38,7 @@ def run(cmd, input=None, ssh_to="local", tab_split=False, valid_exitcodes=[ 0 ],
#use ssh? #use ssh?
if ssh_to != "local": if ssh_to != "local":
encoded_cmd.extend(["ssh", ssh_to]) encoded_cmd.extend([ "ssh", "-o", "ControlMaster=auto", "-o", "ControlPersist=600s", "-o", "ControlPath=~/.ssh/control-master-%r@%h:%p", ssh_to ])
if args.ssh_cipher: if args.ssh_cipher:
encoded_cmd.extend(["-c", args.ssh_cipher]) encoded_cmd.extend(["-c", args.ssh_cipher])
if args.compress: if args.compress:
@ -263,7 +263,7 @@ def zfs_transfer(ssh_source, source_filesystem, first_snapshot, second_snapshot,
source_cmd=[] source_cmd=[]
if ssh_source != "local": if ssh_source != "local":
source_cmd.extend([ "ssh", ssh_source ]) source_cmd.extend([ "ssh", "-o", "ControlMaster=auto", "-o", "ControlPersist=600s", "-o", "ControlPath=~/.ssh/control-master-%r@%h:%p", ssh_source ])
if args.ssh_cipher: if args.ssh_cipher:
source_cmd.extend(["-c", args.ssh_cipher]) source_cmd.extend(["-c", args.ssh_cipher])
if args.compress: if args.compress:
@ -302,7 +302,7 @@ def zfs_transfer(ssh_source, source_filesystem, first_snapshot, second_snapshot,
target_cmd=[] target_cmd=[]
if ssh_target != "local": if ssh_target != "local":
target_cmd.extend([ "ssh", ssh_target ]) target_cmd.extend([ "ssh", "-o", "ControlMaster=auto", "-o", "ControlPersist=600s", "-o", "ControlPath=~/.ssh/control-master-%r@%h:%p", ssh_target ])
if args.ssh_cipher: if args.ssh_cipher:
target_cmd.extend(["-c", args.ssh_cipher]) target_cmd.extend(["-c", args.ssh_cipher])
if args.compress: if args.compress: