diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-28 13:33:21 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-28 13:33:21 -0700 |
| commit | 59c9f904bfe5a9cc7102b44c9440a5e93fdaf159 (patch) | |
| tree | 3e9e4033c6524542660be1852264ae471ee54c55 /src | |
| parent | 5db24978b6a710ebb38de9c006180a754e14a184 (diff) | |
Rename GRPC_INITIAL_METADATA_IGNORE_CONNECTIVITY to
GRPC_INITIAL_METADATA_WAIT_FOR_READY.
Also add a flag to indicate whether wait_for_ready was explicitly set by
the application.
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 | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/ext/client_config/client_channel.c b/src/core/ext/client_config/client_channel.c index b2b4fea83c..2c8113c1db 100644 --- a/src/core/ext/client_config/client_channel.c +++ b/src/core/ext/client_config/client_channel.c @@ -110,10 +110,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_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 fb9a7c0459..b6008f47b1 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -60,6 +60,7 @@ static ClientContext::GlobalCallbacks* g_client_callbacks = ClientContext::ClientContext() : initial_metadata_received_(false), wait_for_ready_(false), + wait_for_ready_explicitly_set_(false), idempotent_(false), cacheable_(false), call_(nullptr), |