diff options
| author |   rexlee8776 <limingjiang@huawei.com> | 2017-11-25 06:44:33 +0000 |
|---|---|---|
| committer |   Ross Brattain <ross.b.brattain@intel.com> | 2017-12-16 08:58:42 +0000 |
| commit | 7bad2481c956956ce62eff953ae477333b6c4494 (patch) | |
| tree | b605a8effb369817a6d4b197f5705343a744640d /yardstick | |
| parent | 2cbda68cf08d9319cf88a1b221b9c7e55a09d124 (diff) | |
bugfix: kill process do not accurately kill "nova-api"
JIRA: YARDSTICK-849
1. update the kill process RegEx pattern to be more accurate
2. make attack_process to be parameter so it can be customized if
the SUT is using a different name of attack_process
Change-Id: I569730ced6c24aafbffcf2fc5752d3560d0adac5
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
(cherry picked from commit 4bbd919e2b26fe606bb1b83efc579e0f2557593e)
Diffstat (limited to 'yardstick')
| -rwxr-xr-x | yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash | 2 |
1 files changed, 1 insertions, 1 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 eec86e133..d34ce9338 100755 --- a/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash +++ b/yardstick/benchmark/scenarios/availability/ha_tools/fault_process_kill.bash @@ -26,7 +26,7 @@ elif [ "$process_name" = "haproxy" ]; then kill -9 "${pid}" done else - for pid in $(pgrep -f "/usr/.*/${process_name}"); + for pid in $(pgrep -fa [^-_a-zA-Z0-9]${process_name} | grep -iv heartbeat | awk '{print $1}'); do kill -9 "${pid}" done |