From 09c03612744836061af590c724de26793f88b38f Mon Sep 17 00:00:00 2001 From: JingLu5 Date: Thu, 4 May 2017 06:46:04 +0000 Subject: Bugfix: fix HA test case tc046 The original way to kill keystone service didn't work anymore. this patch uses killall -u to kill keystone processes. Change-Id: I553b716f17a5ab7e57630468517642a92f06dd27 Signed-off-by: JingLu5 (cherry picked from commit 909606466c50aab19017b6e6cedd3e213aff7c27) --- .../scenarios/availability/ha_tools/check_process_python.bash | 2 +- .../scenarios/availability/ha_tools/fault_process_kill.bash | 6 +++++- .../benchmark/scenarios/availability/ha_tools/start_service.bash | 6 +++++- 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 -- cgit 1.2.3-korg