diff options
| author |  Mark D. Roth <roth@google.com> | 2017-07-13 13:22:59 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-07-13 13:22:59 -0700 |
| commit | e5b847cea428b237ba612c394dff2bf6f4c5d6f5 (patch) | |
| tree | 2ed40c81a74273bb9252fd02a9692096c6258df5 /src | |
| parent | fdf04d2d6132cdd01a43c2073caa9f1ab1bf9889 (diff) | |
| parent | 15494b5d3e2b4ed8d8dc2243f32d06c41d668e9d (diff) | |
Merge pull request #11779 from markdroth/client_channel_fix
Don't set the channel's state to TRANSIENT_FAILURE if we updated the LB policy.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/filters/client_channel/client_channel.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/client_channel.c b/src/core/ext/filters/client_channel/client_channel.c index 1bf10454d1..58e31d7b45 100644 --- a/src/core/ext/filters/client_channel/client_channel.c +++ b/src/core/ext/filters/client_channel/client_channel.c @@ -371,6 +371,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, grpc_error_string(error)); } // Extract the following fields from the resolver result, if non-NULL. + bool lb_policy_updated = false; char *lb_policy_name = NULL; bool lb_policy_name_changed = false; grpc_lb_policy *new_lb_policy = NULL; @@ -425,6 +426,7 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, strcmp(chand->info_lb_policy_name, lb_policy_name) != 0; if (chand->lb_policy != NULL && !lb_policy_name_changed) { // Continue using the same LB policy. Update with new addresses. + lb_policy_updated = true; grpc_lb_policy_update_locked(exec_ctx, chand->lb_policy, &lb_policy_args); } else { // Instantiate new LB policy. @@ -570,8 +572,11 @@ static void on_resolver_result_changed_locked(grpc_exec_ctx *exec_ctx, } watch_lb_policy_locked(exec_ctx, chand, new_lb_policy, state); } - set_channel_connectivity_state_locked( - exec_ctx, chand, state, GRPC_ERROR_REF(state_error), "new_lb+resolver"); + if (!lb_policy_updated) { + set_channel_connectivity_state_locked(exec_ctx, chand, state, + GRPC_ERROR_REF(state_error), + "new_lb+resolver"); + } grpc_resolver_next_locked(exec_ctx, chand->resolver, &chand->resolver_result, &chand->on_resolver_result_changed); |