diff options
author | Alexander Polcyn <apolcyn@google.com> | 2017-02-01 12:06:23 -0800 |
---|---|---|
committer | Alexander Polcyn <apolcyn@google.com> | 2017-02-01 12:06:23 -0800 |
commit | 76be306f9d721654f18bb6d8d0992cc825722d6e (patch) | |
tree | ab11b01ddcb53fef6b7b3532e1a972db635edafe /tools | |
parent | d1cfffe758129cae1ed7560f6e0f20cadb5a67a8 (diff) |
shorten qps worker timeouts and run remote workers under timeout
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/run_tests/run_performance_tests.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/run_tests/run_performance_tests.py b/tools/run_tests/run_performance_tests.py index 12b5e01508..3ad05feebc 100755 --- a/tools/run_tests/run_performance_tests.py +++ b/tools/run_tests/run_performance_tests.py @@ -96,16 +96,18 @@ def create_qpsworker_job(language, shortname=None, port=10000, remote_host=None, # specify -o output file so perf.data gets collected when worker stopped cmdline = perf_cmd + ['-o', '%s-perf.data' % perf_file_base_name] + cmdline + worker_timeout = 3 * 60 if remote_host: user_at_host = '%s@%s' % (_REMOTE_HOST_USERNAME, remote_host) ssh_cmd = ['ssh'] + cmdline = ['timeout', '%s' % (worker_timeout + 30)] + cmdline ssh_cmd.extend([str(user_at_host), 'cd ~/performance_workspace/grpc/ && %s' % ' '.join(cmdline)]) cmdline = ssh_cmd jobspec = jobset.JobSpec( cmdline=cmdline, shortname=shortname, - timeout_seconds=5*60, # workers get restarted after each scenario + timeout_seconds=worker_timeout, # workers get restarted after each scenario verbose_success=True) return QpsWorkerJob(jobspec, language, host_and_port, perf_file_base_name) |