X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Ffiles%2Fbackup_server%2Fpostgres-make-base-backups;h=9a9d188037521bdfdf6f28e9fd2a77694b68fc16;hb=777473cba7299b91c7f2ac225ac5d2c15e407b65;hp=d9352bc78855e2e6670ccbf337c52e0e1ad7ab69;hpb=4c79a43803e0f13091ca289ee39ed8c63fee4bb2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/files/backup_server/postgres-make-base-backups b/modules/postgres/files/backup_server/postgres-make-base-backups
index d9352bc78..9a9d18803 100755
--- a/modules/postgres/files/backup_server/postgres-make-base-backups
+++ b/modules/postgres/files/backup_server/postgres-make-base-backups
@@ -36,6 +36,12 @@ if [ -z "$ROOTDIR" ]; then
 fi
 
 if [ -t 0 ]; then
+	verbose=1
+else
+	verbose=0
+fi
+
+if [ "$verbose" -gt 0 ]; then
 	console="--progress --verbose"
 else
 	console=""
@@ -50,13 +56,17 @@ while read host port username  cluster version; do
 	[ "${host#\#}" = "$host" ] || continue
 
 	label="$date-$host-$cluster-$version-backup"
-	[ -t 0 ] && echo "Doing $host:$port $version/$cluster: $label"
+	[ "$verbose" -gt 0 ] && echo "Doing $host:$port $version/$cluster: $label"
 
 	target="$cluster.BASE.$label.tar.gz"
 	tmp=$(tempfile -d "$ROOTDIR" -p "BASE-$host:$port-" -s ".tar.gz")
 	trap "rm -f '$tmp'" EXIT
 
 	/usr/lib/postgresql/"$version"/bin/pg_basebackup --format=tar --pgdata=- --label="$label" --host="$host" --port="$port" --username="$username" --no-password $console | pigz > "$tmp"
+	if ! [ "${PIPESTATUS[0]}" -eq 0 ]; then
+		echo >&2 "pg_basebackup failed with exit code ${PIPESTATUS[0]}"
+		exit 1
+	fi
 	mv "$tmp" "$ROOTDIR/${host%%.*}/$target"
 done << EOF
 chopin.debian.org	5432	debian-backup		dak		9.1