Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / roles / files / postgresql_server / pg-backup-file

diff --git a/modules/roles/files/postgresql_server/pg-backup-file b/modules/roles/files/postgresql_server/pg-backup-file
index ff2a493..9a432e5 100755 (executable)
--- 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
@@ -71,7 +72,10 @@ for target in $backuphost; do
 
                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