shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

feature #4139: create .monitor in qcow2 and shared tm's

Browse Source
This commit is contained in:
Javi Fontan 2016-04-28 14:28:04 +02:00
parent 468eadd51d
commit 12f367297a
4 changed files with 72 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tm_mad/qcow2/clone
View File

@ -70,13 +70,24 @@ while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element"
done < <(onevm show -x $VMID| $XPATH \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SIZE \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/ORIGINAL_SIZE)
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/ORIGINAL_SIZE \
/VM/HISTORY_RECORDS/HISTORY[last\(\)]/TM_MAD)
SIZE="${XPATH_ELEMENTS[j++]}"
ORIGINAL_SIZE="${XPATH_ELEMENTS[j++]}"
TM_MAD="${XPATH_ELEMENTS[j++]}"
if [ "$TM_MAD" = "ssh" ]; then
MONITOR="monitor"
else
MONITOR=""
fi
ssh_make_path $DST_HOST $DST_DIR
#-------------------------------------------------------------------------------
# Create DST path
#-------------------------------------------------------------------------------
ssh_make_path $DST_HOST $DST_DIR $MONITOR
#-------------------------------------------------------------------------------
# Clone (cp) SRC into DST

25
src/tm_mad/qcow2/ln
View File

@ -38,6 +38,7 @@ fi
. $TMCOMMON
DRIVER_PATH=$(dirname $0)
#-------------------------------------------------------------------------------
# Set dst path and dir
@ -55,10 +56,32 @@ SRC_PATH="${DST_DS_PATH}${SRC_ARG_PATH##$SRC_DS_PATH}"
SNAP_DIR="${SRC_PATH}.snap"
SNAP_NAME="$(basename $SNAP_DIR)"
#-------------------------------------------------------------------------------
# Get Image information
#-------------------------------------------------------------------------------
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
unset i j XPATH_ELEMENTS
while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element"
done < <(onevm show -x $VMID| $XPATH \
/VM/HISTORY_RECORDS/HISTORY[last\(\)]/TM_MAD)
TM_MAD="${XPATH_ELEMENTS[j++]}"
if [ "$TM_MAD" = "ssh" ]; then
MONITOR="monitor"
else
MONITOR=""
fi
#-------------------------------------------------------------------------------
# Create DST path
#-------------------------------------------------------------------------------
ssh_make_path $DST_HOST $DST_DIR
ssh_make_path $DST_HOST $DST_DIR $MONITOR
#-------------------------------------------------------------------------------
# Link (ln) SRC into DST

11
src/tm_mad/shared/clone
View File

@ -68,17 +68,24 @@ while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element"
done < <(onevm show -x $VMID| $XPATH \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SIZE \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/ORIGINAL_SIZE)
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/ORIGINAL_SIZE \
/VM/HISTORY_RECORDS/HISTORY[last\(\)]/TM_MAD)
SIZE="${XPATH_ELEMENTS[j++]}"
ORIGINAL_SIZE="${XPATH_ELEMENTS[j++]}"
TM_MAD="${XPATH_ELEMENTS[j++]}"
if [ "$TM_MAD" = "ssh" ]; then
MONITOR="monitor"
else
MONITOR=""
fi
#-------------------------------------------------------------------------------
# Create DST path
#-------------------------------------------------------------------------------
ssh_make_path $DST_HOST $DST_DIR
ssh_make_path $DST_HOST $DST_DIR $MONITOR
#-------------------------------------------------------------------------------
# Clone (cp) SRC into DST

27
src/tm_mad/shared/ln
View File

@ -38,6 +38,7 @@ fi
. $TMCOMMON
DRIVER_PATH=$(dirname $0)
#-------------------------------------------------------------------------------
# Set dst path and dir
@ -53,10 +54,34 @@ SRC_DS_PATH="$(dirname $(dirname $SRC_ARG_PATH))"
SRC_PATH="${DST_DS_PATH}${SRC_ARG_PATH##$SRC_DS_PATH}"
#-------------------------------------------------------------------------------
# Get Image information
#-------------------------------------------------------------------------------
DISK_ID=$(basename ${DST_PATH} | cut -d. -f2)
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
unset i j XPATH_ELEMENTS
while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element"
done < <(onevm show -x $VMID| $XPATH \
/VM/HISTORY_RECORDS/HISTORY[last\(\)]/TM_MAD)
TM_MAD="${XPATH_ELEMENTS[j++]}"
if [ "$TM_MAD" = "ssh" ]; then
MONITOR="monitor"
else
MONITOR=""
fi
#-------------------------------------------------------------------------------
# Create DST path
#-------------------------------------------------------------------------------
ssh_make_path $DST_HOST $DST_DIR
ssh_make_path $DST_HOST $DST_DIR $MONITOR
#-------------------------------------------------------------------------------
# Link (ln) SRC into DST