diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-05-04 09:36:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-04 09:36:54 +0000 |
| commit | 21ef1349d65eea760c4545ed6e3cb8a49288a910 (patch) | |
| tree | 9b3f9b46e183c41f751de4b705d9ab39c28f32a5 | |
| parent | c337eff097139516b0bb2827bdb308e32416861e (diff) | |
| parent | 909606466c50aab19017b6e6cedd3e213aff7c27 (diff) | |
Merge "Bugfix: fix HA test case tc046"
3 files changed, 11 insertions, 3 deletions
diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/check_process_python.bash b/yardstick/benchmark/scenarios/availability/ha_tools/check_process_python.bash index 7c275f7ce..96257804f 100755 --- a/yardstick/benchmark/scenarios/availability/ha_tools/check_process_python.bash +++ b/yardstick/benchmark/scenarios/availability/ha_tools/check_process_python.bash @@ -15,4 +15,4 @@ set -e process_name=$1 -ps aux | grep -e $process_name | grep -v grep | wc -l +ps aux | grep -e $process_name | grep -v grep | grep -v /bin/sh | wc -l diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash b/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash index d0e2f1683..e0491b0d5 100755 --- a/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash +++ b/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash @@ -15,4 +15,8 @@ set -e process_name=$1 -killall -9 $process_name +if [ "$process_name" = "keystone" ]; then + killall -9 -u $process_name +else + killall -9 $process_name +fi diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/start_service.bash b/yardstick/benchmark/scenarios/availability/ha_tools/start_service.bash index c1bf8b7eb..3164c44df 100755 --- a/yardstick/benchmark/scenarios/availability/ha_tools/start_service.bash +++ b/yardstick/benchmark/scenarios/availability/ha_tools/start_service.bash @@ -15,4 +15,8 @@ set -e service_name=$1 -service $service_name start +if [ "$service_name" = "keystone" ]; then + service apache2 start +else + service $service_name start +fi |