import 15.2.0 Octopus source

[ceph.git] / ceph / qa / standalone / osd / ec-error-rollforward.sh

diff --git a/ceph/qa/standalone/osd/ec-error-rollforward.sh b/ceph/qa/standalone/osd/ec-error-rollforward.sh
index 05188ad509653bc95eaaf0816a4b7d5346166bf8..621e6b13f2f11699a5e9143f5bb65e5cfa3531c8 100755 (executable)
--- a/ceph/qa/standalone/osd/ec-error-rollforward.sh
+++ b/ceph/qa/standalone/osd/ec-error-rollforward.sh
@@ -37,7 +37,7 @@ function TEST_ec_error_rollforward() {
 
     rados -p ec put foo /etc/passwd
 
-    kill -STOP `cat $dir/osd.2.pid`
+    kill -STOP $(cat $dir/osd.2.pid)
 
     rados -p ec rm foo &
     pids="$!"
@@ -49,14 +49,16 @@ function TEST_ec_error_rollforward() {
     rados -p ec rm c &
     pids+=" $!"
     sleep 1
-    kill -9 `cat $dir/osd.?.pid`
+    # Use SIGKILL so stopped osd.2 will terminate
+    # and kill_daemons waits for daemons to die
+    kill_daemons $dir KILL osd
     kill $pids
     wait
 
-    run_osd $dir 0 || return 1
-    run_osd $dir 1 || return 1
-    run_osd $dir 2 || return 1
-    run_osd $dir 3 || return 1
+    activate_osd $dir 0 || return 1
+    activate_osd $dir 1 || return 1
+    activate_osd $dir 2 || return 1
+    activate_osd $dir 3 || return 1
 
     wait_for_clean || return 1
 }