diff options
| author |  apolcyn <apolcyn@google.com> | 2017-02-04 09:42:48 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-02-04 09:42:48 -0800 |
| commit | cf7587e066fe777ee87dad40faee5d211931932f (patch) | |
| tree | e7b587d5b24bd02e9f3f385d2ae437645716e757 | |
| parent | 472acff7ab38660433c0ba43bed814c148ed81df (diff) | |
| parent | 76be306f9d721654f18bb6d8d0992cc825722d6e (diff) | |
Merge pull request #9548 from apolcyn/improve_benchmark_worker_timeouts
shorten qps worker timeouts and run remote workers under timeout
| -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 e47c9a40d1..7c04d228ba 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) |