From e4ba4da388211a293de354a129445f4fb3289256 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 12 Aug 2016 10:51:56 +0200
Subject: [PATCH] Feature #4708: stop execution of the drivers if a command in
 a pipe fails

---
 src/datastore_mad/remotes/ceph/cp | 2 +-
 src/datastore_mad/remotes/fs/mkfs | 2 +-
 src/mad/sh/scripts_common.sh      | 2 +-
 src/tm_mad/ceph/clone             | 2 +-
 src/tm_mad/ceph/snap_create       | 2 +-
 src/tm_mad/ceph/snap_create_live  | 2 +-
 src/tm_mad/common/mkimage         | 2 +-
 src/tm_mad/fs_lvm/clone           | 2 +-
 src/tm_mad/fs_lvm/mv              | 2 +-
 src/tm_mad/fs_lvm/postmigrate     | 2 +-
 src/tm_mad/fs_lvm/premigrate      | 2 +-
 src/tm_mad/qcow2/ln               | 2 +-
 src/tm_mad/qcow2/snap_create      | 2 +-
 src/tm_mad/qcow2/snap_create_live | 2 +-
 src/tm_mad/shared/snap_create     | 2 +-
 src/tm_mad/ssh/mv                 | 2 +-
 src/tm_mad/ssh/snap_create        | 2 +-
 src/vmm_mad/remotes/kvm/restore   | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/datastore_mad/remotes/ceph/cp b/src/datastore_mad/remotes/ceph/cp
index 1fd75d3c2a..bda056bcc5 100755
--- a/src/datastore_mad/remotes/ceph/cp
+++ b/src/datastore_mad/remotes/ceph/cp
@@ -139,7 +139,7 @@ if [ "$RBD_FORMAT" = "2" ]; then
 fi
 
 REGISTER_CMD=$(cat <<EOF
-    set -e
+    set -e -o pipefail
 
     FORMAT=\$($QEMU_IMG info $TMP_DST | grep "^file format:" | awk '{print \$3}')
 
diff --git a/src/datastore_mad/remotes/fs/mkfs b/src/datastore_mad/remotes/fs/mkfs
index eda1a82695..beda64e4d0 100755
--- a/src/datastore_mad/remotes/fs/mkfs
+++ b/src/datastore_mad/remotes/fs/mkfs
@@ -77,7 +77,7 @@ fi
 MKFS_CMD=`mkfs_command $DST $FSTYPE $SIZE`
 
 REMOTE_REGISTER_CMD=$(cat <<EOF
-    set -e
+    set -e -o pipefail
     export PATH=/usr/sbin:/sbin:\$PATH
 
     mkdir -p $BASE_PATH
diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh
index b2681cc5e6..4f9e7f6909 100644
--- a/src/mad/sh/scripts_common.sh
+++ b/src/mad/sh/scripts_common.sh
@@ -415,7 +415,7 @@ EOF
 function ssh_make_path
 {
     SSH_EXEC_ERR=`$SSH $1 bash -s 2>&1 1>/dev/null <<EOF
-set -e
+set -e -o pipefail
 if [ ! -d $2 ]; then
    mkdir -p $2
 
diff --git a/src/tm_mad/ceph/clone b/src/tm_mad/ceph/clone
index c4232ed573..0f33c7256d 100755
--- a/src/tm_mad/ceph/clone
+++ b/src/tm_mad/ceph/clone
@@ -95,7 +95,7 @@ CLONE_CMD=$(cat <<EOF
 
     rbd_make_snap $SRC_PATH
 
-    set -e
+    set -e -o pipefail
 
     if [ "\$(rbd_format $SRC_PATH)" = "2" ]; then
         $RBD clone "$SRC_PATH@snap" $RBD_DST
diff --git a/src/tm_mad/ceph/snap_create b/src/tm_mad/ceph/snap_create
index c31dac063c..63f651da8e 100755
--- a/src/tm_mad/ceph/snap_create
+++ b/src/tm_mad/ceph/snap_create
@@ -89,7 +89,7 @@ if [ -n "$CEPH_CONF" ]; then
 fi
 
 SNAP_CREATE_CMD=$(cat <<EOF
-    set -e
+    set -e -o pipefail
 
     RBD="${RBD}"
 
diff --git a/src/tm_mad/ceph/snap_create_live b/src/tm_mad/ceph/snap_create_live
index be736ee359..d07ae5c850 100755
--- a/src/tm_mad/ceph/snap_create_live
+++ b/src/tm_mad/ceph/snap_create_live
@@ -92,7 +92,7 @@ if [ -n "$CEPH_CONF" ]; then
 fi
 
 SNAP_CREATE_CMD=$(cat <<EOF
-    set -e
+    set -e -o pipefail
 
     if virsh -c $LIBVIRT_URI domfsfreeze $DEPLOY_ID ; then
         trap "virsh -c $LIBVIRT_URI domfsthaw $DEPLOY_ID" EXIT TERM INT HUP
diff --git a/src/tm_mad/common/mkimage b/src/tm_mad/common/mkimage
index 9396517379..43c296c88e 100755
--- a/src/tm_mad/common/mkimage
+++ b/src/tm_mad/common/mkimage
@@ -54,7 +54,7 @@ ssh_make_path $DST_HOST $DST_DIR
 MKFS_CMD=`mkfs_command $DST_PATH $FSTYPE $SIZE`
 
 MKSCRIPT=$(cat <<EOF
-set -e
+set -e -o pipefail
 export PATH=/usr/sbin:/sbin:\$PATH
 $MKFS_CMD
 EOF
diff --git a/src/tm_mad/fs_lvm/clone b/src/tm_mad/fs_lvm/clone
index d334f44ff0..0f1e4890bb 100755
--- a/src/tm_mad/fs_lvm/clone
+++ b/src/tm_mad/fs_lvm/clone
@@ -91,7 +91,7 @@ VG_NAME="vg-one-$DS_SYS_ID"
 DEV="/dev/${VG_NAME}/${LV_NAME}"
 
 CLONE_CMD=$(cat <<EOF
-    set -e
+    set -e -o pipefail
     mkdir -p $DST_DIR
 
     $SUDO $LVCREATE -L${SIZE}M -n $LV_NAME $VG_NAME
diff --git a/src/tm_mad/fs_lvm/mv b/src/tm_mad/fs_lvm/mv
index 480bcb4403..3785b08337 100755
--- a/src/tm_mad/fs_lvm/mv
+++ b/src/tm_mad/fs_lvm/mv
@@ -54,7 +54,7 @@ SRC_VM_DIR=`basename $SRC_PATH`
 # Activate the disk in the target host
 if [ `is_disk $DST_PATH` -eq 1 ]; then
     CMD=$(cat <<EOF
-        set -ex
+        set -ex -o pipefail
         if [ -L "$DST_PATH" ]; then
             DEVICE=\$(readlink "$DST_PATH")
             $SUDO $SYNC
diff --git a/src/tm_mad/fs_lvm/postmigrate b/src/tm_mad/fs_lvm/postmigrate
index f216d427ad..7fc68c42b3 100755
--- a/src/tm_mad/fs_lvm/postmigrate
+++ b/src/tm_mad/fs_lvm/postmigrate
@@ -43,7 +43,7 @@ fi
 . $TMCOMMON
 
 CMD=$(cat <<EOF
-    set -ex
+    set -ex -o pipefail
     $SUDO $SYNC
     $SUDO $LVSCAN
 
diff --git a/src/tm_mad/fs_lvm/premigrate b/src/tm_mad/fs_lvm/premigrate
index 0e4038f0ec..aab6b2e1c0 100755
--- a/src/tm_mad/fs_lvm/premigrate
+++ b/src/tm_mad/fs_lvm/premigrate
@@ -43,7 +43,7 @@ fi
 . $TMCOMMON
 
 CMD=$(cat <<EOF
-    set -ex
+    set -ex -o pipefail
     $SUDO $SYNC
     $SUDO $LVSCAN
 
diff --git a/src/tm_mad/qcow2/ln b/src/tm_mad/qcow2/ln
index 79d3c6c25b..82a7ce872e 100755
--- a/src/tm_mad/qcow2/ln
+++ b/src/tm_mad/qcow2/ln
@@ -94,7 +94,7 @@ if [ "$type" == "application/x-iso9660-image" ]; then
     CMD="ln -sf ${SRC_PATH} ${DST_PATH}"
 else
     CMD=$(cat <<EOT
-set -ex
+set -ex -o pipefail
 
 mkdir -p "${SNAP_DIR}"
 
diff --git a/src/tm_mad/qcow2/snap_create b/src/tm_mad/qcow2/snap_create
index 60c24b3f80..6465846b91 100755
--- a/src/tm_mad/qcow2/snap_create
+++ b/src/tm_mad/qcow2/snap_create
@@ -79,7 +79,7 @@ SNAP_PATH="${SNAP_DIR}/${NEXT_SNAP_ID}"
 SNAP_PATH_SHORT="${SNAP_DIR_SHORT}/${NEXT_SNAP_ID}"
 
 SNAP_CMD=$(cat <<EOT
-set -ex
+set -ex -o pipefail
 
 mkdir -p "${SNAP_DIR}"
 
diff --git a/src/tm_mad/qcow2/snap_create_live b/src/tm_mad/qcow2/snap_create_live
index 4fa0978360..1b7cfcd08f 100755
--- a/src/tm_mad/qcow2/snap_create_live
+++ b/src/tm_mad/qcow2/snap_create_live
@@ -125,7 +125,7 @@ DOC="$DOC
 </domainsnapshot>"
 
 CMD=$(cat <<EOT
-set -ex
+set -ex -o pipefail
 
 mkdir -p "${SNAP_DIR}"
 
diff --git a/src/tm_mad/shared/snap_create b/src/tm_mad/shared/snap_create
index c41675c628..433edf4339 100755
--- a/src/tm_mad/shared/snap_create
+++ b/src/tm_mad/shared/snap_create
@@ -74,7 +74,7 @@ SNAP_PATH_RELATIVE=$(basename ${SNAP_PATH})
 CURRENT_PATH=${DISK_PATH}
 
 CMD=$(cat <<EOT
-set -ex
+set -ex -o pipefail
 
 if [ ! -d "${SNAP_DIR}" ]; then
     mkdir "${SNAP_DIR}"
diff --git a/src/tm_mad/ssh/mv b/src/tm_mad/ssh/mv
index 793b414e0f..69fa32858b 100755
--- a/src/tm_mad/ssh/mv
+++ b/src/tm_mad/ssh/mv
@@ -72,7 +72,7 @@ ssh_exec_and_log "$DST_HOST" "rm -rf '$DST_PATH'" \
     "Error removing target path to prevent overwrite errors"
 
 TAR_SSH=$(cat <<EOF
-set -e
+set -e -o pipefail
 
 $TAR -C $SRC_DS_DIR --sparse -cf - $SRC_VM_DIR | $SSH $DST_HOST '$TAR -C $DST_DIR --sparse -xf -'
 rm -rf $SRC_PATH
diff --git a/src/tm_mad/ssh/snap_create b/src/tm_mad/ssh/snap_create
index 4b8baa5a81..508ebe756f 100755
--- a/src/tm_mad/ssh/snap_create
+++ b/src/tm_mad/ssh/snap_create
@@ -69,7 +69,7 @@ SNAP_PATH_RELATIVE=$(basename ${SNAP_PATH})
 CURRENT_PATH=${DISK_PATH}
 
 CMD=$(cat <<EOT
-set -ex
+set -ex -o pipefail
 
 if [ ! -d "${SNAP_DIR}" ]; then
     mkdir "${SNAP_DIR}"
diff --git a/src/vmm_mad/remotes/kvm/restore b/src/vmm_mad/remotes/kvm/restore
index d06a170702..739101e8fb 100755
--- a/src/vmm_mad/remotes/kvm/restore
+++ b/src/vmm_mad/remotes/kvm/restore
@@ -57,7 +57,7 @@ DS_LOCATION=$(dirname $(dirname $(dirname $FILE)))
 DS_LOCATION_NON_DOUBLE_SLASH=$(echo "$DS_LOCATION" | sed 's|//|/|g')
 
 RECALCULATE_CMD=$(cat <<EOF
-set -e
+set -e -o pipefail
 
 # extract the xml from the checkpoint