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

Merge branch 'bug-1635'

Browse Source
This commit is contained in:
Ruben S. Montero 2012-11-09 00:03:47 +01:00
commit db88543c59
4 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tm_mad/common/delete
View File

@ -36,16 +36,12 @@ fi
. $TMCOMMON
#-------------------------------------------------------------------------------
# Return if deleting a disk, we will delete them when removing the
# Return if deleting a disk, we will delete them when removing the
# remote_system_ds directory for the VM (remotely)
#-------------------------------------------------------------------------------
DST_PATH=`arg_path $DST`
DST_HOST=`arg_host $DST`
if [ `is_disk $DST_PATH` -eq 1 ]; then
exit 0
fi
log "Deleting $DST_PATH"
ssh_exec_and_log $DST_HOST "rm -rf $DST_PATH" "Error deleting $DST_PATH"

3
src/tm_mad/iscsi/delete
View File

@ -124,6 +124,9 @@ DELETE_CMD=$(cat <<EOF
# remove lv
$SUDO $LVREMOVE -f $VG_NAME/$TARGET_LV_NAME
# remove link
rm -f $DST_PATH
EOF
)

3
src/tm_mad/lvm/delete
View File

@ -43,6 +43,9 @@ DST_HOST=`arg_host $DST`
DELETE_CMD=$(cat <<EOF
DEV=\$(readlink $DST_PATH)
$SUDO $LVREMOVE -f \$DEV
# remove link
rm -f $DST_PATH
EOF
)

49
src/tm_mad/vmfs/delete
View File

@ -16,6 +16,26 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
function vifs_rmdir {
DIR_TO_RM="$1"
FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID/$DIR_TO_RM | \
grep -v "Content Listing"|grep -Fv "--------"|egrep -v "^[[:space:]]*$"`
for file in $FILES_TO_ERASE; do
exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$DIR_TO_RM/$file" \
"Cannot delete [$DSID]$VMID/$dir/$file in $DST_HOST"
done
exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$dir" \
"Cannot delete [$DSID]$VMID in $DST_HOST"
}
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# DELETE <host:remote_system_ds/disk.i|host:remote_system_ds/> vmid dsid
# - host is the target host to deploy the VM
# - remote_system_ds is the path for the system datastore in the host
@ -40,6 +60,8 @@ fi
. $TMCOMMON
DST_PATH=`arg_path $DST`
DST_HOST=`arg_host $DST`
@ -60,27 +82,20 @@ vmfs_set_up
# remote_system_ds directory for the VM (remotely)
#-------------------------------------------------------------------------------
if [ `is_disk $DST_PATH` -eq 1 ]; then
exit 0
fi
log "Deleting $DST_PATH"
if [ "$USE_SSH" == "yes" ]; then
ssh_exec_and_log $DST_HOST "rm -rf $DST_PATH" "Error deleting $DST_PATH"
ssh_exec_and_log $DST_HOST "rm -rf $DST_PATH" "Error deleting $DST_PATH"
else
DIRS_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"`
for dir in $DIRS_TO_ERASE; do
FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID/$dir|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"`
for file in $FILES_TO_ERASE; do
exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$dir/$file" \
"Cannot delete [$DSID]$VMID/$dir/$file in $DST_HOST"
done
exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$dir" \
"Cannot delete [$DSID]$VMID in $DST_HOST"
done
exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID" \
"Cannot delete [$DSID]$VMID in $DST_HOST"
if [ `is_disk $DST_PATH` -eq 1 ]; then
vifs_rmdir $(basename $DST_PATH)
else
DIRS_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID|grep -v "Content Listing"|grep -Fv "--------"|egrep -v "^[[:space:]]*$"`
for dir in $DIRS_TO_ERASE; do
vifs_rmdir $dir
done
fi
fi
exit 0