mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-21 14:50:08 +03:00
Feature #4708: stop execution of the drivers if a command in a pipe
fails
This commit is contained in:
parent
dedd18f9b5
commit
e4ba4da388
@ -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}')
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -89,7 +89,7 @@ if [ -n "$CEPH_CONF" ]; then
|
||||
fi
|
||||
|
||||
SNAP_CREATE_CMD=$(cat <<EOF
|
||||
set -e
|
||||
set -e -o pipefail
|
||||
|
||||
RBD="${RBD}"
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -43,7 +43,7 @@ fi
|
||||
. $TMCOMMON
|
||||
|
||||
CMD=$(cat <<EOF
|
||||
set -ex
|
||||
set -ex -o pipefail
|
||||
$SUDO $SYNC
|
||||
$SUDO $LVSCAN
|
||||
|
||||
|
@ -43,7 +43,7 @@ fi
|
||||
. $TMCOMMON
|
||||
|
||||
CMD=$(cat <<EOF
|
||||
set -ex
|
||||
set -ex -o pipefail
|
||||
$SUDO $SYNC
|
||||
$SUDO $LVSCAN
|
||||
|
||||
|
@ -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}"
|
||||
|
||||
|
@ -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}"
|
||||
|
||||
|
@ -125,7 +125,7 @@ DOC="$DOC
|
||||
</domainsnapshot>"
|
||||
|
||||
CMD=$(cat <<EOT
|
||||
set -ex
|
||||
set -ex -o pipefail
|
||||
|
||||
mkdir -p "${SNAP_DIR}"
|
||||
|
||||
|
@ -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}"
|
||||
|
@ -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
|
||||
|
@ -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}"
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user