diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-10-10 10:20:48 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-10-10 10:20:48 -0700 |
| commit | c99945e44ce40e52883c3c68cdb783eb395f9a03 (patch) | |
| tree | ed370f2e7b32f0b286d8377e73b3d1e4bc5078e7 /test/cpp/qps | |
| parent | 1bb0ce5e23126692169765496221c58da7310a2b (diff) | |
| parent | fdc2b10dce93c806edc95eb76fdca38625c47d06 (diff) | |
Merge branch 'direct-calls' into buffer_pools_for_realsies
Diffstat (limited to 'test/cpp/qps')
| -rw-r--r-- | test/cpp/qps/client_async.cc | 1 | ||||
| -rw-r--r-- | test/cpp/qps/driver.cc | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index 572a85e58e..4d36a6ba42 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -243,6 +243,7 @@ class AsyncClient : public ClientImpl<StubType, RequestType> { // this thread isn't supposed to shut down std::lock_guard<std::mutex> l(shutdown_state_[thread_idx]->mutex); if (shutdown_state_[thread_idx]->shutdown) { + delete ctx; return true; } else if (!ctx->RunNextState(ok, entry)) { // The RPC and callback are done, so clone the ctx diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index 0168a525ce..89739ad562 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -84,7 +84,7 @@ static std::unordered_map<string, std::deque<int>> get_hosts_and_cores( auto stub = WorkerService::NewStub( CreateChannel(*it, InsecureChannelCredentials())); grpc::ClientContext ctx; - ctx.set_fail_fast(false); + ctx.set_wait_for_ready(true); CoreRequest dummy; CoreResponse cores; grpc::Status s = stub->CoreCount(&ctx, dummy, &cores); @@ -184,7 +184,7 @@ namespace runsc { static ClientContext* AllocContext(list<ClientContext>* contexts) { contexts->emplace_back(); auto context = &contexts->back(); - context->set_fail_fast(false); + context->set_wait_for_ready(true); return context; } @@ -557,7 +557,7 @@ bool RunQuit() { CreateChannel(workers[i], InsecureChannelCredentials())); Void dummy; grpc::ClientContext ctx; - ctx.set_fail_fast(false); + ctx.set_wait_for_ready(true); Status s = stub->QuitWorker(&ctx, dummy, &dummy); if (!s.ok()) { gpr_log(GPR_ERROR, "Worker %zu could not be properly quit because %s", i, |