commit 43eb0b3159d8ad1eb14e0430124cc72cb50ae3c2
author Chmouel Boudjnah <chmouel@chmouel.com> Sat Jan 12 20:10:34 2013 +0000
committer Chmouel Boudjnah <chmouel@chmouel.com> Sat Jan 12 20:10:34 2013 +0000
tree df624b24898b8b9b746f1f01315262812ece1951
parent 9bd9d7d1a34dd7cb8d5f51936b67c7549f40c9a3

Make sure to cleanup swift on unstack/relaunch.

- Fixes bug 1049553.

Change-Id: I9fef93d25512c014dfb882adf0e169487bf877d8

lib/swift

diff --git a/lib/swift b/lib/swift
index b418eda..aff4596 100644
--- a/lib/swift
+++ b/lib/swift
@@ -107,16 +107,17 @@
     if [[ -e ${SWIFT_DATA_DIR}/drives/images/swift.img ]]; then
         if egrep -q ${SWIFT_DATA_DIR}/drives/sdb1 /proc/mounts; then
             sudo umount ${SWIFT_DATA_DIR}/drives/sdb1
+            sudo rm -f ${SWIFT_DATA_DIR}/drives/images/swift.img
         fi
-    else
-        mkdir -p  ${SWIFT_DATA_DIR}/drives/images
-        sudo touch  ${SWIFT_DATA_DIR}/drives/images/swift.img
-        sudo chown $USER: ${SWIFT_DATA_DIR}/drives/images/swift.img
-
-        dd if=/dev/zero of=${SWIFT_DATA_DIR}/drives/images/swift.img \
-            bs=1024 count=0 seek=${SWIFT_LOOPBACK_DISK_SIZE}
     fi
 
+    mkdir -p  ${SWIFT_DATA_DIR}/drives/images
+    sudo touch  ${SWIFT_DATA_DIR}/drives/images/swift.img
+    sudo chown $USER: ${SWIFT_DATA_DIR}/drives/images/swift.img
+
+    dd if=/dev/zero of=${SWIFT_DATA_DIR}/drives/images/swift.img \
+        bs=1024 count=0 seek=${SWIFT_LOOPBACK_DISK_SIZE}
+
     # Make a fresh XFS filesystem
     mkfs.xfs -f -i size=1024  ${SWIFT_DATA_DIR}/drives/images/swift.img
 

unstack.sh

diff --git a/unstack.sh b/unstack.sh
index 1d4bfd5..a086d5c 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -65,6 +65,7 @@
 # Swift runs daemons
 if is_service_enabled swift; then
     stop_swift
+    cleanup_swift
 fi
 
 # Apache has the WSGI processes