Skip to content

Commit d53bedc

Browse files
John GriffithDean Troyer
John Griffith
authored and
Dean Troyer
committed
Enhance tgt cleanup in unstack.sh
 *Check that tgt driver is in good state when we start if not try to just restart it *Remove targets based on iqn entries in persist files *Remove the persist files themeselves *Stop the tgt service Updated to use *_STATE_DIR vars Change-Id: I3ba9f2b8c099c7f290696760527fe2147d9b1d38
1 parent 6cab01c commit d53bedc

1 file changed

Lines changed: 38 additions & 4 deletions

File tree

‎unstack.sh‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ source $TOP_DIR/functions
1818
# Load local configuration
1919
source $TOP_DIR/stackrc
2020

21+
# Destination path for service data
22+
DATA_DIR=${DATA_DIR:-${DEST}/data}
23+
24+
# Get project function libraries
25+
source $TOP_DIR/lib/cinder
26+
source $TOP_DIR/lib/n-vol
27+
2128
# Determine what system we are running on. This provides ``os_VENDOR``,
2229
# ``os_RELEASE``, ``os_UPDATE``, ``os_PACKAGE``, ``os_CODENAME``
2330
GetOSVersion
@@ -45,14 +52,41 @@ if is_service_enabled horizon; then
4552
stop_service apache2
4653
fi
4754

55+
SCSI_PERSIST_DIR=$CINDER_STATE_PATH/volumes/*
56+
4857
# Get the iSCSI volumes
4958
if is_service_enabled cinder n-vol; then
59+
if is_service_enabled n-vol; then
60+
SCSI_PERSIST_DIR=$NOVA_STATE_PATH/volumes/*
61+
fi
62+
5063
TARGETS=$(sudo tgtadm --op show --mode target)
64+
if [ $? -ne 0 ]; then
65+
# If tgt driver isn't running this won't work obviously
66+
# So check the response and restart if need be
67+
echo "tgtd seems to be in a bad state, restarting..."
68+
if [[ "$os_PACKAGE" = "deb" ]]; then
69+
restart_service tgt
70+
else
71+
restart_service tgtd
72+
fi
73+
TARGETS=$(sudo tgtadm --op show --mode target)
74+
fi
75+
5176
if [[ -n "$TARGETS" ]]; then
52-
# FIXME(dtroyer): this could very well require more here to
53-
# clean up left-over volumes
54-
echo "iSCSI target cleanup needed:"
55-
echo "$TARGETS"
77+
iqn_list=( $(grep --no-filename -r iqn $SCSI_PERSIST_DIR | sed 's/<target //' | sed 's/>//') )
78+
for i in "${iqn_list[@]}"; do
79+
echo removing iSCSI target: $i
80+
sudo tgt-admin --delete $i
81+
done
82+
fi
83+
84+
if is_service_enabled cinder; then
85+
sudo rm -rf $CINDER_STATE_PATH/volumes/*
86+
fi
87+
88+
if is_service_enabled n-vol; then
89+
sudo rm -rf $NOVA_STATE_PATH/volumes/*
5690
fi
5791

5892
if [[ "$os_PACKAGE" = "deb" ]]; then

0 commit comments

Comments
 (0)