x
/
devstack-plugin-glusterfs
Code Issues Proposed changes

cleanup lvm when driver_type == glusterfs or glusterfs_nfs 

when doing ./unstack.sh, cleanup routine should delete volume and lvm.

Change-Id: I7c8594c0d0c85bab8758860948da10dd8ff90884
This commit is contained in:
whhan91 2019-07-26 10:16:25 +00:00 committed by WooHyung Han
parent 0654aaff47
commit 55ea4965ab
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
devstack/gluster-functions.sh
View File

@ -74,6 +74,34 @@ function _delete_gluster_shares {
done
}
function clean_manila_backend_glusterfs {
case "$GLUSTERFS_MANILA_DRIVER_TYPE" in
glusterfs|glusterfs-nfs)
_clean_manila_glusterfs_nfs
;;
*)
echo "no clean hook for GLUSTERFS_MANILA_DRIVER_TYPE=${GLUSTERFS_MANILA_DRIVER_TYPE}"
;;
esac
}
function _clean_manila_glusterfs_nfs {
_clean_thin_lv_gluster_vol manila-glusterfs-vol
clean_lvm_volume_group $GLUSTERFS_VG_NAME
}
function _clean_thin_lv_gluster_vol {
local vol_name=$1
sudo gluster --mode=script volume stop $vol_name
sudo gluster --mode=script volume delete $vol_name
sudo umount -f $MANILA_STATE_PATH/export/$vol_name
# lv will remove in clean_lvm_volume_group
}
# Cleanup GlusterFS
# Triggered from devstack/plugin.sh as part of devstack "clean"
function cleanup_glusterfs {
@ -99,6 +127,11 @@ function cleanup_glusterfs {
_delete_gluster_shares $NOVA_GLUSTERFS_SHARE
fi
# Cleaning up Manila GlusterFS share
if [ "$CONFIGURE_GLUSTERFS_MANILA" = "True" ]; then
clean_manila_backend_glusterfs
fi
if [[ -e ${GLUSTERFS_DISK_IMAGE} ]]; then
sudo rm -f ${GLUSTERFS_DISK_IMAGE}
fi
@ -109,6 +142,9 @@ function cleanup_glusterfs {
if egrep -q ${GLUSTERFS_DATA_DIR} /proc/mounts; then
sudo umount ${GLUSTERFS_DATA_DIR}
# Delete all glusterfs information
sudo rm -rf /var/lib/glusterd
fi
sudo rm -rf ${GLUSTERFS_DATA_DIR}