diff --git a/src/datastore_mad/remotes/fs/snap_delete b/src/datastore_mad/remotes/fs/snap_delete index bbd0c0e478..a94ea4a24f 100755 --- a/src/datastore_mad/remotes/fs/snap_delete +++ b/src/datastore_mad/remotes/fs/snap_delete @@ -22,14 +22,19 @@ ID=$2 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh DATASTORES=/var/lib/one/datastores + LIB_LOCATION=/usr/lib/one else TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh DATASTORES=$ONE_LOCATION/var/datastores + LIB_LOCATION=$ONE_LOCATION/lib fi . $TMCOMMON +. $LIB_LOCATION/sh/scripts_common.sh + DRIVER_PATH=$(dirname $0) +source ${DRIVER_PATH}/../libfs.sh # -------- Get image and datastore arguments from OpenNebula core ------------ @@ -42,9 +47,11 @@ unset i j XPATH_ELEMENTS while IFS= read -r -d '' element; do XPATH_ELEMENTS[i++]="$element" -done < <($XPATH /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \ +done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \ + /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \ /DS_DRIVER_ACTION_DATA/IMAGE/TARGET_SNAPSHOT) +BRIDGE_LIST="${XPATH_ELEMENTS[j++]}" DISK_SRC="${XPATH_ELEMENTS[j++]}" SNAP_ID="${XPATH_ELEMENTS[j++]}" @@ -55,5 +62,15 @@ SYSTEM_DS_PATH=$(dirname ${SRC_PATH}) SNAP_DIR="${DISK_SRC}.snap" SNAP_PATH="${SNAP_DIR}/${SNAP_ID}" -rm ${SNAP_PATH} +if [ -n "$BRIDGE_LIST" ]; then + log "Delete remote snapshot $SNAP_PATH" + DST_HOST=`get_destination_host $ID` + ssh_exec_and_log "$DST_HOST" "rm $SNAP_PATH" \ + "Error deleting snapshot $SNAP_PATH" +else + log "Delete local snapshot $SNAP_PATH" + + exec_and_log "rm ${SNAP_PATH}" \ + "Error deleting snapshot $SNAP_PATH" +fi diff --git a/src/datastore_mad/remotes/fs/snap_flatten b/src/datastore_mad/remotes/fs/snap_flatten index 1fa9223a30..c8db4340c0 100755 --- a/src/datastore_mad/remotes/fs/snap_flatten +++ b/src/datastore_mad/remotes/fs/snap_flatten @@ -22,14 +22,19 @@ ID=$2 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh DATASTORES=/var/lib/one/datastores + LIB_LOCATION=/usr/lib/one else TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh DATASTORES=$ONE_LOCATION/var/datastores + LIB_LOCATION=$ONE_LOCATION/lib fi . $TMCOMMON +. $LIB_LOCATION/sh/scripts_common.sh + DRIVER_PATH=$(dirname $0) +source ${DRIVER_PATH}/../libfs.sh # -------- Get image and datastore arguments from OpenNebula core ------------ @@ -42,10 +47,12 @@ unset i j XPATH_ELEMENTS while IFS= read -r -d '' element; do XPATH_ELEMENTS[i++]="$element" -done < <($XPATH /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \ +done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \ + /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \ /DS_DRIVER_ACTION_DATA/IMAGE/TARGET_SNAPSHOT \ /DS_DRIVER_ACTION_DATA/DATASTORE/TM_MAD ) +BRIDGE_LIST="${XPATH_ELEMENTS[j++]}" DISK_SRC="${XPATH_ELEMENTS[j++]}" SNAP_ID="${XPATH_ELEMENTS[j++]}" TM_MAD="${XPATH_ELEMENTS[j++]}" @@ -61,10 +68,42 @@ SNAP_DIR="${DISK_PATH}.snap" SNAP_PATH="${SNAP_DIR}/${SNAP_ID}" if [ "$TM_MAD" = "qcow2" ]; then - qemu-img convert -O qcow2 ${SNAP_PATH} ${DISK_PATH}.tmp - mv "${DISK_PATH}.tmp" "${DISK_PATH}" -else - mv ${SNAP_PATH} ${DISK_PATH} -fi + if [ -n "$BRIDGE_LIST" ]; then + DST_HOST=`get_destination_host $ID` -rm -rf ${SNAP_DIR} + ssh_exec_and_log "$DST_HOST" "qemu-img convert -O qcow2 ${SNAP_PATH} ${DISK_PATH}.tmp" \ + "Error flattening ${SNAP_PATH}" + + ssh_exec_and_log "$DST_HOST" "mv ${DISK_PATH}.tmp ${DISK_PATH}" \ + "Error moving to ${DISK_PATH}" + + ssh_exec_and_log "$DST_HOST" "rm -rf ${SNAP_DIR}" \ + "Error removing ${SNAP_DIR}" + else + exec_and_log "qemu-img convert -O qcow2 ${SNAP_PATH} ${DISK_PATH}.tmp" \ + "Error flattening ${SNAP_PATH}" + + exec_and_log "mv ${DISK_PATH}.tmp ${DISK_PATH}" \ + "Error moving to ${DISK_PATH}" + + exec_and_log "rm -rf ${SNAP_DIR}" \ + "Error removing ${SNAP_DIR}" + fi + +else + if [ -n "$BRIDGE_LIST" ]; then + DST_HOST=`get_destination_host $ID` + + ssh_exec_and_log "$DST_HOST" "mv ${SNAP_PATH} ${DISK_PATH}" \ + "Error moving snapshot ${SNAP_PATH}" + + ssh_exec_and_log "$DST_HOST" "rm -rf ${SNAP_DIR}" \ + "Error removing ${SNAP_DIR}" + else + exec_and_log "mv ${SNAP_PATH} ${DISK_PATH}" \ + "Error moving snapshot ${SNAP_PATH}" + + exec_and_log "rm -rf ${SNAP_DIR}" \ + "Error removing ${SNAP_DIR}" + fi +fi diff --git a/src/datastore_mad/remotes/fs/snap_revert b/src/datastore_mad/remotes/fs/snap_revert index 4b06799501..56c7e276de 100755 --- a/src/datastore_mad/remotes/fs/snap_revert +++ b/src/datastore_mad/remotes/fs/snap_revert @@ -22,14 +22,19 @@ ID=$2 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh DATASTORES=/var/lib/one/datastores + LIB_LOCATION=/usr/lib/one else TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh DATASTORES=$ONE_LOCATION/var/datastores + LIB_LOCATION=$ONE_LOCATION/lib fi . $TMCOMMON +. $LIB_LOCATION/sh/scripts_common.sh + DRIVER_PATH=$(dirname $0) +source ${DRIVER_PATH}/../libfs.sh # -------- Get image and datastore arguments from OpenNebula core ------------ @@ -42,10 +47,12 @@ unset i j XPATH_ELEMENTS while IFS= read -r -d '' element; do XPATH_ELEMENTS[i++]="$element" -done < <($XPATH /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \ +done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \ + /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \ /DS_DRIVER_ACTION_DATA/IMAGE/TARGET_SNAPSHOT \ /DS_DRIVER_ACTION_DATA/DATASTORE/TM_MAD ) +BRIDGE_LIST="${XPATH_ELEMENTS[j++]}" DISK_SRC="${XPATH_ELEMENTS[j++]}" SNAP_ID="${XPATH_ELEMENTS[j++]}" TM_MAD="${XPATH_ELEMENTS[j++]}" @@ -58,12 +65,46 @@ SNAP_DIR="${DISK_SRC}.snap" SNAP_PATH="${SNAP_DIR}/${SNAP_ID}" if [ "$TM_MAD" = "qcow2" ]; then - ACTIVE_SNAP_ID=$(ls ${SNAP_DIR} | sort -n | tail -n 1) - ACTIVE_SNAP_PATH="${SNAP_DIR}/${ACTIVE_SNAP_ID}" + SNAP_ID_SCRIPT=$(cat <&1) + ACTIVE_SNAP_PATH="${SNAP_DIR}/${ACTIVE_SNAP_ID}" + + ssh_exec_and_log "$DST_HOST" "rm $ACTIVE_SNAP_PATH" \ + "Error deleting $ACTIVE_SNAP_PATH" + + ssh_exec_and_log "$DST_HOST" "qemu-img create -f qcow2 -b $SNAP_PATH $ACTIVE_SNAP_PATH" \ + "Error reverting snapshot to $SNAP_PATH" + else + ACTIVE_SNAP_ID=$(monitor_and_log "$SNAP_ID_SCRIPT" "Error get active snapshot ID" 2>&1) + ACTIVE_SNAP_PATH="${SNAP_DIR}/${ACTIVE_SNAP_ID}" + + exec_and_log "rm ${ACTIVE_SNAP_PATH}" \ + "Error deleting $ACTIVE_SNAP_PATH" + + exec_and_log "qemu-img create -f qcow2 -b ${SNAP_PATH} ${ACTIVE_SNAP_PATH}" \ + "Error reverting snapshot to $SNAP_PATH" + fi else - mv ${SNAP_PATH} ${DISK_SRC} -fi + if [ -n "$BRIDGE_LIST" ]; then + DST_HOST=`get_destination_host $ID` + ssh_exec_and_log "$DST_HOST" "cp -f ${SNAP_PATH} ${DISK_SRC}.tmp" \ + "Error copying snapshot $SNAP_PATH" + + ssh_exec_and_log "$DST_HOST" "mv ${DISK_SRC}.tmp ${DISK_SRC}" \ + "Error moving to $DISK_SRC" + else + exec_and_log "cp -f ${SNAP_PATH} ${DISK_SRC}.tmp" \ + "Error copying snapshot $SNAP_PATH" + + exec_and_log "mv ${DISK_SRC}.tmp ${DISK_SRC}" \ + "Error moving to $DISK_SRC" + fi +fi