Permalink
Browse files

2006-03-09 Rached Ben Mustapha <rached@benmur.net>

        * lib/upload-methods.sh:
          + Added support for the ServerAliveInterval ssh option. It is
          unconditional for now, but we should check if all supported version
          of ssh support it. This helps when the "building file list" step of
          rsync takes a loooong time (high I/O load for example), and the
          connection is closed because of non-activity. It is currently
          hardcoded to 60s, which seems like a good compromise.



git-svn-id: svn://svn.backup-manager.org/backup-manager/trunk@346 2e458433-d701-0410-9826-f9b593394a3c
  • Loading branch information...
1 parent 7a97ffd commit 71e7386ac99aa1c4af98f2db307f29a32523f410 benmur committed Mar 9, 2006
Showing with 12 additions and 2 deletions.
  1. +10 −0 ChangeLog
  2. +2 −2 lib/upload-methods.sh
View
@@ -1,3 +1,13 @@
+2006-03-09 Rached Ben Mustapha <rached@benmur.net>
+
+ * lib/upload-methods.sh:
+ + Added support for the ServerAliveInterval ssh option. It is
+ unconditional for now, but we should check if all supported version
+ of ssh support it. This helps when the "building file list" step of
+ rsync takes a loooong time (high I/O load for example), and the
+ connection is closed because of non-activity. It is currently
+ hardcoded to 60s, which seems like a good compromise.
+
2006-02-08 Alexis Sukrieh <sukria@backup-manager.org>
* NEWS:
@@ -107,7 +107,7 @@ _exec_rsync_command()
logfile=$(mktemp /tmp/bm-rsync.XXXXXX)
if [ "$UID" != 0 ]; then
if ! ${rsync} ${rsync_options} \
- -e "ssh -o BatchMode=yes -i ${BM_UPLOAD_SSH_KEY}" ${directory} \
+ -e "ssh -o BatchMode=yes -o ServerAliveInterval=60 -i ${BM_UPLOAD_SSH_KEY}" ${directory} \
${BM_UPLOAD_SSH_USER}@${host}:$BM_UPLOAD_RSYNC_DESTINATION/${RSYNC_SUBDIR}/\
>/dev/null 2>$logfile; then
error "Upload of \$directory with rsync failed; check \$logfile."
@@ -116,7 +116,7 @@ _exec_rsync_command()
fi
else
if ! su $BM_UPLOAD_SSH_USER -c "${rsync} ${rsync_options} \
- -e \"ssh -o BatchMode=yes -i ${BM_UPLOAD_SSH_KEY}\" ${directory} \
+ -e \"ssh -o BatchMode=yes -o ServerAliveInterval=60 -i ${BM_UPLOAD_SSH_KEY}\" ${directory} \
${BM_UPLOAD_SSH_USER}@${host}:$BM_UPLOAD_RSYNC_DESTINATION/${RSYNC_SUBDIR}/" \
>/dev/null 2>$logfile; then
error "Upload of \$directory with rsync failed; check \$logfile."

0 comments on commit 71e7386

Please sign in to comment.