diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-03-07 15:58:52 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-07 15:58:52 -0800 |
| commit | 2280306ec38e2c0df7cc8f2535af14dfab7b9ebc (patch) | |
| tree | c25f0f9922ee3e722d8289b2b25cfe66afb4c167 | |
| parent | 41559c643416148f46251052f8148bc38071a47f (diff) | |
| parent | 6921820fab0c9a2df8d4f258de76086cf7596b28 (diff) | |
Merge pull request #10029 from ctiller/qps
Get master performance workers working again
| -rw-r--r-- | test/core/util/port_server_client.c | 9 | ||||
| -rwxr-xr-x | tools/run_tests/run_performance_tests.py | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/test/core/util/port_server_client.c b/test/core/util/port_server_client.c index a851d01635..38054dd1e7 100644 --- a/test/core/util/port_server_client.c +++ b/test/core/util/port_server_client.c @@ -162,6 +162,15 @@ static void got_port_from_server(grpc_exec_ctx *exec_ctx, void *arg, if (failed) { grpc_httpcli_request req; memset(&req, 0, sizeof(req)); + if (pr->retries >= 5) { + gpr_mu_lock(pr->mu); + pr->port = 0; + GRPC_LOG_IF_ERROR( + "pollset_kick", + grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), NULL)); + gpr_mu_unlock(pr->mu); + return; + } GPR_ASSERT(pr->retries < 10); gpr_sleep_until(gpr_time_add( gpr_now(GPR_CLOCK_REALTIME), diff --git a/tools/run_tests/run_performance_tests.py b/tools/run_tests/run_performance_tests.py index 7c04d228ba..ee4102c591 100755 --- a/tools/run_tests/run_performance_tests.py +++ b/tools/run_tests/run_performance_tests.py @@ -101,7 +101,7 @@ def create_qpsworker_job(language, shortname=None, port=10000, remote_host=None, 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)]) + ssh_cmd.extend([str(user_at_host), 'cd ~/performance_workspace/grpc/ && tools/run_tests/start_port_server.py && %s' % ' '.join(cmdline)]) cmdline = ssh_cmd jobspec = jobset.JobSpec( |