Browse code

Merge "Ceph: wait for services to shutdown during cleanup"

Jenkins authored on 2015/02/05 07:46:27
Showing 1 changed files
... ...
@@ -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}