backup should fail if xbcloud fails

Author: egegunes

build/backup/backup.sh

@@ -69,7 +69,7 @@ function request_streaming() {
 	--sst "xtrabackup-v2:$LOCAL_IP:4444/xtrabackup_sst//1" \
 	--extended-exit-codes \
 	--wait-for-recv-script-exit \
-	--recv-script="/usr/bin/run_backup.sh"
+	--recv-script="/opt/percona/backup/run_backup.sh"
 	GARBD_EXIT_CODE=$?
 
 	case ${GARBD_EXIT_CODE} in

build/backup/run_backup.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
-set -o errexit
 set -o xtrace
+set -o errexit
+set -o pipefail
 set -m
 
 LIB_PATH='/opt/percona/backup/lib/pxc'
@@ -125,15 +126,29 @@ backup_s3() {
 	fi
 	vault_store /tmp/${SST_INFO_NAME}
 
+	# this xbcloud command will fail with backup is incomplete
+	# it's expected since we only upload sst_info
+	set +o pipefail
 	# shellcheck disable=SC2086
 	xbstream -C /tmp -c ${SST_INFO_NAME} $XBSTREAM_EXTRA_ARGS \
-		| xbcloud put --storage=s3 --parallel="$(grep -c processor /proc/cpuinfo)" --md5 $XBCLOUD_ARGS --s3-bucket="$S3_BUCKET" "$S3_BUCKET_PATH.$SST_INFO_NAME" 2>&1 \
+		| xbcloud put --storage=s3 \
+			--md5 \
+			--parallel="$(grep -c processor /proc/cpuinfo)" \
+			$XBCLOUD_ARGS \
+			--s3-bucket="$S3_BUCKET" \
+			"$S3_BUCKET_PATH.$SST_INFO_NAME" 2>&1 \
 		| (grep -v "error: http request failed: Couldn't resolve host name" || exit 1)
+	set -o pipefail
 
 	if ((SST_FAILED == 0)); then
 		# shellcheck disable=SC2086
 		socat -u "$SOCAT_OPTS" stdio \
-			| xbcloud put --storage=s3 --parallel="$(grep -c processor /proc/cpuinfo)" --md5 $XBCLOUD_ARGS --s3-bucket="$S3_BUCKET" "$S3_BUCKET_PATH" 2>&1 \
+			| xbcloud put --storage=s3 \
+				--md5 \
+				--parallel="$(grep -c processor /proc/cpuinfo)" \
+				$XBCLOUD_ARGS \
+				--s3-bucket="$S3_BUCKET" \
+				"$S3_BUCKET_PATH" 2>&1 \
 			| (grep -v "error: http request failed: Couldn't resolve host name" || exit 1) &
 		wait $!
 	fi
@@ -170,16 +185,27 @@ backup_azure() {
 	fi
 	vault_store /tmp/${SST_INFO_NAME}
 
+	# this xbcloud command will fail with backup is incomplete
+	# it's expected since we only upload sst_info
+	set +o pipefail
 	# shellcheck disable=SC2086
 	xbstream -C /tmp -c ${SST_INFO_NAME} $XBSTREAM_EXTRA_ARGS \
-		| xbcloud put --storage=azure --parallel="$(grep -c processor /proc/cpuinfo)" $XBCLOUD_ARGS "$BACKUP_PATH.$SST_INFO_NAME" 2>&1 \
+		| xbcloud put --storage=azure \
+			--parallel="$(grep -c processor /proc/cpuinfo)" \
+			$XBCLOUD_ARGS \
+			"$BACKUP_PATH.$SST_INFO_NAME" 2>&1 \
 		| (grep -v "error: http request failed: Couldn't resolve host name" || exit 1)
+	set -o pipefail
 
 	if ((SST_FAILED == 0)); then
 		# shellcheck disable=SC2086
 		socat -u "$SOCAT_OPTS" stdio \
-			| xbcloud put --storage=azure --parallel="$(grep -c processor /proc/cpuinfo)" $XBCLOUD_ARGS "$BACKUP_PATH" 2>&1 \
-			| (grep -v "error: http request failed: Couldn't resolve host name" || exit 1)
+			| xbcloud put --storage=azure \
+				--parallel="$(grep -c processor /proc/cpuinfo)" \
+				$XBCLOUD_ARGS \
+				"$BACKUP_PATH" 2>&1 \
+		| (grep -v "error: http request failed: Couldn't resolve host name" || exit 1) &
+		wait $!
 	fi
 }