diff options
author | rexlee8776 <limingjiang@huawei.com> | 2018-08-31 07:08:45 +0000 |
---|---|---|
committer | rexlee8776 <limingjiang@huawei.com> | 2018-09-10 01:42:28 +0000 |
commit | e5cf82b0514c88a2aca87a2bbb98c8cc1d751ecb (patch) | |
tree | 7625e65a514c26b7d041ac4fc8bb120bd79e7f4b | |
parent | a8706c3b18f7f70798a0b20b1ec15ad496626784 (diff) |
tc046 kill keystone process condition incorrect - dovetail
Change-Id: If01abfd5a99b4cea74f835e258f3a982af9446cd
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
-rwxr-xr-x | yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash | 4 |
1 files changed, 2 insertions, 2 deletions
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 d34ce9338..cda469cf9 100755 --- a/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash +++ b/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash @@ -16,7 +16,7 @@ set -e process_name=$1 if [ "$process_name" = "keystone" ]; then - for pid in $(ps aux | grep "keystone" | grep -iv heartbeat | grep -iv monitor | grep -v grep | grep -v /bin/sh | awk '{print $2}'); \ + for pid in $(ps aux | grep "keystone" | grep -iv monitor | grep -v grep | grep -v /bin/sh | awk '{print $2}'); \ do kill -9 "${pid}" done @@ -26,7 +26,7 @@ elif [ "$process_name" = "haproxy" ]; then kill -9 "${pid}" done else - for pid in $(pgrep -fa [^-_a-zA-Z0-9]${process_name} | grep -iv heartbeat | awk '{print $1}'); + for pid in $(pgrep -fa [^-_a-zA-Z0-9]${process_name} | awk '{print $1}'); do kill -9 "${pid}" done |