X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fpostgresql_server%2Fpg-backup-file;h=9a432e56b511cf8f1f15520222bd4aa36654506d;hb=7c041353f4da829d409830eba2e95946952e817f;hp=4b6f7d3d80f5931b066f81c22f148e3aee129384;hpb=ff762dfdfbfdb5f5eead0b998c01a6e8feeeac67;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/postgresql_server/pg-backup-file b/modules/roles/files/postgresql_server/pg-backup-file
index 4b6f7d3d8..9a432e56b 100755
--- a/modules/roles/files/postgresql_server/pg-backup-file
+++ b/modules/roles/files/postgresql_server/pg-backup-file
@@ -59,7 +59,8 @@ size="`stat -c '%s' "$file"`"
 checksum=""
 bn="`basename "$file"`"
 targetname="$cluster.$what.$bn"
-logtuple="($myhost,$targetname,$size,$checksum)"
+logtuple_start="($myhost,$targetname,$size"
+failures=""
 
 for target in $backuphost; do
 	if [ "${target#/}" != "$target" ]; then
@@ -69,9 +70,12 @@ for target in $backuphost; do
 		[ -n "$checksum" ] || checksum="`sha512sum "$file" | awk '{print $1}'`"
 		info "Archiving to $target: ($myhost,$targetname,$size,$checksum)"
 
-		ssh -C "$target" $ssh_options $myhost store-file pg "$targetname" "$size" "$checksum" < "$file"
+		ssh -C "$target" $ssh_options -o BatchMode=yes -o ServerAliveInterval=90 $myhost store-file pg "$targetname" "$size" "$checksum" < "$file"
 		if [ "$?" != 0 ]; then
-			croak "remote store for $logtuple failed."
+			failures="$failures $logtuple_start,$checksum,$target)"
 		fi
 	fi
 done
+if [ "$failures" != "" ]; then
+	croak "remote store for$failures failed."
+fi