diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-28 13:37:00 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-28 13:37:00 -0700 |
| commit | ef7efb1b845f4eb32e35d296cc925d8ed8384538 (patch) | |
| tree | 3d4f6da1f4e9c0789fd0cc727655c4cb8213b357 /src | |
| parent | 56e470e04739e64efc6791099f64a99fe6a3be7f (diff) | |
| parent | 62cfbea9083b153753dabb90093101b2ca69f321 (diff) | |
Merge branch 'fail_fast' into service_config
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/client_config/client_channel.c | 4 | ||||
| -rw-r--r-- | src/cpp/client/client_context.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/core/ext/client_config/client_channel.c b/src/core/ext/client_config/client_channel.c index e61d253480..7a80975278 100644 --- a/src/core/ext/client_config/client_channel.c +++ b/src/core/ext/client_config/client_channel.c @@ -116,10 +116,10 @@ static void set_channel_connectivity_state_locked(grpc_exec_ctx *exec_ctx, if ((state == GRPC_CHANNEL_TRANSIENT_FAILURE || state == GRPC_CHANNEL_SHUTDOWN) && chand->lb_policy != NULL) { - /* cancel fail-fast picks */ + /* cancel picks with wait_for_ready=false */ grpc_lb_policy_cancel_picks( exec_ctx, chand->lb_policy, - /* mask= */ GRPC_INITIAL_METADATA_IGNORE_CONNECTIVITY, + /* mask= */ GRPC_INITIAL_METADATA_WAIT_FOR_READY, /* check= */ 0, GRPC_ERROR_REF(error)); } grpc_connectivity_state_set(exec_ctx, &chand->state_tracker, state, error, diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index 5b6aaa777b..b6008f47b1 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -59,7 +59,8 @@ static ClientContext::GlobalCallbacks* g_client_callbacks = ClientContext::ClientContext() : initial_metadata_received_(false), - fail_fast_(true), + wait_for_ready_(false), + wait_for_ready_explicitly_set_(false), idempotent_(false), cacheable_(false), call_(nullptr), |