shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-10 00:58:17 +03:00
Code Releases Wiki Activity

bug #2960: TM actions use CLONE instead of PERSISTENT

Browse Source
This commit is contained in:
Ruben S. Montero 2014-07-08 23:52:38 +02:00
parent 2b5164b195
commit 64cf127ea7
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tm_mad/ceph/cpds
View File

@ -59,16 +59,16 @@ while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element"
done < <(onevm show -x $VM_ID| $XPATH \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT)
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE)
RBD_SRC="${XPATH_ELEMENTS[j++]}"
PERSISTENT="${XPATH_ELEMENTS[j++]}"
CLONE="${XPATH_ELEMENTS[j++]}"
#-------------------------------------------------------------------------------
# Copy Image back to the datastore
#-------------------------------------------------------------------------------
if [ "$PERSISTENT" = "YES" ]; then
if [ "$CLONE" = "NO" ]; then
RBD_DST="${RBD_SRC}"
else
RBD_DST="${RBD_SRC}-${VM_ID}-${DISK_ID}"

12
src/tm_mad/ceph/delete
View File

@ -67,15 +67,17 @@ while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element"
done < <(onevm show -x $VM_ID| $XPATH \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT)
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE)
SRC="${XPATH_ELEMENTS[j++]}"
PERSISTENT="${XPATH_ELEMENTS[j++]}"
CLONE="${XPATH_ELEMENTS[j++]}"
# Exit if persistent
[ -n "$PERSISTENT" ] && exit 0
# No need to delete no cloned images
if [ "$CLONE" = "NO" ]; then
exit 0
fi
# non persistent, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
# cloned, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
RBD_SRC="${SRC}-${VM_ID}-${DISK_ID}"
RBD_SNAP="${VM_ID}-${DISK_ID}"

12
src/tm_mad/ceph/mvds
View File

@ -59,15 +59,17 @@ while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element"
done < <(onevm show -x $VM_ID| $XPATH \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT)
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE)
RBD_SRC="${XPATH_ELEMENTS[j++]}"
PERSISTENT="${XPATH_ELEMENTS[j++]}"
CLONE="${XPATH_ELEMENTS[j++]}"
# Exit if persistent
[ -n "$PERSISTENT" ] && exit 0
# No need to copy back to datastore no cloned images
if [ "$CLONE" = "NO" ]; then
exit 0
fi
# non persistent, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
# cloned, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
RBD_DST="${RBD_SRC}-${VM_ID}-${DISK_ID}"
RBD_SNAP="${VM_ID}-${DISK_ID}"