Commit c0067335 authored by Kirill Smelkov's avatar Kirill Smelkov

X neotest: Don't depend on killall

killall is optional (comes from psmisc package) and besides `killall
runzeo` is not safe as it can be killing not only runzeo spawn from
under neotest, but also from other processes.

-> Switch to explicit kill with runzeo pid.
parent 2bcd6ebb
...@@ -1064,9 +1064,10 @@ zbench_local() { ...@@ -1064,9 +1064,10 @@ zbench_local() {
echo -e "\n*** ZEO" echo -e "\n*** ZEO"
Zpy $fs1/data.fs Zpy $fs1/data.fs
Zpy_job=$!
zbench zeo://$Zbind `hostname`/zeo $zhashok zbench zeo://$Zbind `hostname`/zeo $zhashok
killall runzeo kill $Zpy_job
wait wait $Zpy_job
echo -e "\n*** NEO/py sqlite" echo -e "\n*** NEO/py sqlite"
NEOpylite NEOpylite
...@@ -1159,9 +1160,10 @@ zbench_cluster() { ...@@ -1159,9 +1160,10 @@ zbench_cluster() {
echo -e "\n*** ZEO" echo -e "\n*** ZEO"
Zpy $fs1/data.fs Zpy $fs1/data.fs
Zpy_job=$!
on $url ./neotest zbench-client zeo://$Zbind "`hostname`-$peer/zeo" $zhashok on $url ./neotest zbench-client zeo://$Zbind "`hostname`-$peer/zeo" $zhashok
killall runzeo kill $Zpy_job
wait wait $Zpy_job
echo -e "\n*** NEO/py sqlite" echo -e "\n*** NEO/py sqlite"
NEOpylite NEOpylite
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment