diff options
| -rwxr-xr-x | tools/run_tests/performance/remote_host_prepare.sh | 5 | ||||
| -rwxr-xr-x | tools/run_tests/run_performance_tests.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/run_tests/performance/remote_host_prepare.sh b/tools/run_tests/performance/remote_host_prepare.sh index a660d29458..17cfa1a599 100755 --- a/tools/run_tests/performance/remote_host_prepare.sh +++ b/tools/run_tests/performance/remote_host_prepare.sh @@ -38,10 +38,13 @@ ssh "${USER_AT_HOST}" "rm -rf ~/performance_workspace && mkdir -p ~/performance_ # TODO(jtattermusch): To be sure there are no running processes that would # mess with the results, be rough and reboot the slave here # and wait for it to come back online. -# TODO(jtattermusch): Kill all java QpsWorkers, but killall java # could also kill jenkins. ssh "${USER_AT_HOST}" "killall -9 qps_worker mono node ruby || true" +# Kill all java LoadWorker processes. We can't just killall java +# as one of the processes might be jenkins. +ssh "${USER_AT_HOST}" 'kill -9 $(jps | grep LoadWorker | cut -f1 -d" ") || true' + # push the current sources to the slave and unpack it. scp ../grpc.tar "${USER_AT_HOST}:~/performance_workspace" ssh "${USER_AT_HOST}" "tar -xf ~/performance_workspace/grpc.tar -C ~/performance_workspace" diff --git a/tools/run_tests/run_performance_tests.py b/tools/run_tests/run_performance_tests.py index c820a5493b..9ff075e3a2 100755 --- a/tools/run_tests/run_performance_tests.py +++ b/tools/run_tests/run_performance_tests.py @@ -89,7 +89,7 @@ def create_qpsworker_job(language, shortname=None, jobspec = jobset.JobSpec( cmdline=cmdline, shortname=shortname, - timeout_seconds=15*60) + timeout_seconds=30*60) return QpsWorkerJob(jobspec, language, host_and_port) |