Merge branch 'bug-2263'

src/datastore_mad/remotes/ceph/monitor

@@ -59,7 +59,7 @@ fi
 # ------------ Compute datastore usage -------------
 
 MONITOR_SCRIPT=$(cat <<EOF
-$SUDO $RADOS df | $AWK '{
+$SUDO $RADOS $DF | $AWK '{
     if (\$1 == "total") {
 
         space = int(\$3/1024)

src/datastore_mad/remotes/iscsi/monitor

@@ -59,11 +59,13 @@ fi
 # ------------ Compute datastore usage -------------
 
 MONITOR_SCRIPT=$(cat <<EOF
+set -e
+
 VG_OPTS="--units M -C --noheadings --nosuffix $VG_NAME"
 
-TOTAL_MB=\$(sudo vgdisplay -o vg_size \$VG_OPTS | tr -d ' ')
-FREE_MB=\$(sudo vgdisplay -o vg_free \$VG_OPTS | tr -d ' ')
-USED_MB=\$(awk "BEGIN {print \$TOTAL_MB - \$FREE_MB}")
+TOTAL_MB=\$($SUDO $VGDISPLAY -o vg_size \$VG_OPTS | $TR -d ' ')
+FREE_MB=\$($SUDO $VGDISPLAY -o vg_free \$VG_OPTS | $TR -d ' ')
+USED_MB=\$($AWK "BEGIN {print \$TOTAL_MB - \$FREE_MB}")
 
 echo "USED_MB=\$USED_MB"
 echo "TOTAL_MB=\$TOTAL_MB"

src/datastore_mad/remotes/iscsi/rm

@@ -64,6 +64,8 @@ DEV="/dev/$VG_NAME/$LV_NAME"
 IQN="$BASE_IQN:$DST_HOST.$VG_NAME.$LV_NAME"
 
 RM_COMMAND=$(cat <<EOF
+    set -e
+
     TID=\$($SUDO $(tgtadm_get_tid_for_iqn "$IQN"))
 
     $SUDO $(tgtadm_target_delete "\$TID")

src/datastore_mad/remotes/lvm/monitor

@@ -58,11 +58,13 @@ fi
 # ------------ Compute datastore usage -------------
 
 MONITOR_SCRIPT=$(cat <<EOF
+set -e
+
 VG_OPTS="--units M -C --noheadings --nosuffix $VG_NAME"
 
-TOTAL_MB=\$(sudo vgdisplay -o vg_size \$VG_OPTS | tr -d ' ')
-FREE_MB=\$(sudo vgdisplay -o vg_free \$VG_OPTS | tr -d ' ')
-USED_MB=\$(awk "BEGIN {print \$TOTAL_MB - \$FREE_MB}")
+TOTAL_MB=\$($SUDO $VGDISPLAY -o vg_size \$VG_OPTS | $TR -d ' ')
+FREE_MB=\$($SUDO $VGDISPLAY -o vg_free \$VG_OPTS | $TR -d ' ')
+USED_MB=\$($AWK "BEGIN {print \$TOTAL_MB - \$FREE_MB}")
 
 echo "USED_MB=\$USED_MB"
 echo "TOTAL_MB=\$TOTAL_MB"

src/datastore_mad/remotes/vmfs/monitor

@@ -55,12 +55,14 @@ HOST=`get_destination_host $ID`
 # ------------ Compute datastore usage -------------
 
 MONITOR_SCRIPT=$(cat <<EOF
-USED_MB=\$(du -sLm ${BASE_PATH%/} 2>/dev/null | cut -f1)
+set -e
 
-DF_STR=\$(df -m | grep ${BASE_PATH%/} | sed 's/ \+/:/g')
+USED_MB=\$($DU -sLm ${BASE_PATH%/} 2>/dev/null | $CUT -f1)
 
-TOTAL_MB=\$(echo \$DF_STR | cut -d':' -f 2)
-FREE_MB=\$(echo \$DF_STR | cut -d':' -f 4)
+DF_STR=\$($DF -m | grep ${BASE_PATH%/} | $SED 's/ \+/:/g')
+
+TOTAL_MB=\$(echo \$DF_STR | $CUT -d':' -f 2)
+FREE_MB=\$(echo \$DF_STR | $CUT -d':' -f 4)
 
 echo "USED_MB=\$USED_MB"
 echo "TOTAL_MB=\$TOTAL_MB"

src/mad/sh/scripts_common.sh

@@ -23,6 +23,7 @@ BASH=bash
 CUT=cut
 DATE=date
 DD=dd
+DF=df
 DU=du
 GREP=grep
 ISCSIADM=iscsiadm
@@ -49,6 +50,8 @@ TAR=tar
 TGTADM=tgtadm
 TGTADMIN=tgt-admin
 TGTSETUPLUN=tgt-setup-lun-one
+TR=tr
+VGDISPLAY=vgdisplay
 VMKFSTOOLS=vmkfstools
 WGET=wget
 
@@ -308,6 +311,8 @@ function mkfs_command {
 function ssh_exec_and_log
 {
     SSH_EXEC_ERR=`$SSH $1 sh -s 2>&1 1>/dev/null <<EOF
+export LANG=C
+export LC_ALL=C
 $2
 EOF`
     SSH_EXEC_RC=$?
@@ -329,6 +334,8 @@ EOF`
 function ssh_monitor_and_log
 {
     SSH_EXEC_OUT=`$SSH $1 sh -s 2>/dev/null <<EOF
+export LANG=C
+export LC_ALL=C
 $2
 EOF`
     SSH_EXEC_RC=$?

src/tm_mad/common/mkimage

@@ -53,8 +53,9 @@ ssh_make_path $DST_HOST $DST_DIR
 
 CREATE_IMAGE="$DD if=/dev/zero of=$DST_PATH bs=1 count=1 seek=${SIZE}M"
 MKFS_CMD=`mkfs_command $DST_PATH $FSTYPE $SIZE`
- 
+
 MKSCRIPT=$(cat <<EOF
+set -e
 export PATH=/usr/sbin:/sbin:\$PATH
 $CREATE_IMAGE
 $MKFS_CMD

src/tm_mad/lvm/cpds

@@ -53,6 +53,8 @@ LV_NAME=$(echo $DST_PATH|cut -d. -f2)
 TARGET_DEV=/dev/$VG_NAME/$LV_NAME
 
 DUMP_CMD=$(cat <<EOF
+    set -e
+
     DEV=\$(readlink $SRC_PATH)
     SIZE=\$($SUDO $LVS \$DEV --noheadings --nosuffix --units m -o lv_size \
             | tr -d ' ')