diff options
author | Craig Tiller <ctiller@google.com> | 2015-08-18 16:17:14 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-08-18 16:17:14 -0700 |
commit | 376076b34edd634a4dc920f073df188c14d6a645 (patch) | |
tree | 27803d7bd20bc2c1ba738fdcec2a4c1421358aff /src/core | |
parent | 7ff63f6abad6c49a7b88b036c54075a03433457c (diff) |
Fix TSAN reported race
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/channel/client_channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index a73458821e..2e25033813 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -505,13 +505,13 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { if (iomgr_success && chand->resolver) { grpc_resolver *resolver = chand->resolver; GRPC_RESOLVER_REF(resolver, "channel-next"); + grpc_connectivity_state_set(&chand->state_tracker, state, + "new_lb+resolver"); gpr_mu_unlock(&chand->mu_config); GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); grpc_resolver_next(resolver, &chand->incoming_configuration, &chand->on_config_changed); GRPC_RESOLVER_UNREF(resolver, "channel-next"); - grpc_connectivity_state_set(&chand->state_tracker, state, - "new_lb+resolver"); if (lb_policy != NULL) { watch_lb_policy(chand, lb_policy, state); } |