1. devstack
  2. Commit a27b74cdf74a83ef2d197d026526211d12990228
Browse code

Ceph: wait for services to shutdown during cleanup

It can take ceph-osd and ceph-mon a few seconds to complete when
they are killed. This races against the umount command in cleaup
and can often result in $CEPH_DATA_DIR failing to unmount since
it is still in use.

Wait for these processes to stop to ensure the mount point is
umounted successfully.

Change-Id: I1a635e75a68be6b14fbee52ff981b5f5a3a8eb0e

Eric Harney authored on 2014/09/19 02:02:55
Showing 1 changed files
lib/ceph
History View file @ a27b74c
... ... 
@@ -142,8 +142,8 @@ function cleanup_ceph_remote {
142 142 
 }
143 143
144 144 
 function cleanup_ceph_embedded {
145 
-    sudo pkill -f ceph-mon
146 
-    sudo pkill -f ceph-osd
145 
+    sudo killall -w -9 ceph-mon
146 
+    sudo killall -w -9 ceph-osd
147 147 
     sudo rm -rf ${CEPH_DATA_DIR}/*/*
148 148 
     if egrep -q ${CEPH_DATA_DIR} /proc/mounts; then
149 149 
         sudo umount ${CEPH_DATA_DIR}