diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2016-05-11 08:35:25 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2016-05-11 08:35:25 -0700 |
| commit | 088891119f17b827b4f45f09e39411f007618ddf (patch) | |
| tree | fbb1e9f4731e209f6b6184da9d9333b39c7f6405 /src/core | |
| parent | 8dbe2cb071d90942c7bbe5987151f04955b9e9cb (diff) | |
| parent | 1fc79fccf4f78e39032dc51d2fba26ba0f706bef (diff) | |
Merge branch 'master' into server_channel_affinity
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ext/client_config/subchannel_call_holder.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/ext/client_config/subchannel_call_holder.c b/src/core/ext/client_config/subchannel_call_holder.c index 9918fbdcb4..91fa917661 100644 --- a/src/core/ext/client_config/subchannel_call_holder.c +++ b/src/core/ext/client_config/subchannel_call_holder.c @@ -174,6 +174,7 @@ static void subchannel_ready(grpc_exec_ctx *exec_ctx, void *arg, bool success) { GRPC_SUBCHANNEL_CALL_HOLDER_PICKING_SUBCHANNEL); holder->creation_phase = GRPC_SUBCHANNEL_CALL_HOLDER_NOT_CREATING; if (holder->connected_subchannel == NULL) { + gpr_atm_no_barrier_store(&holder->subchannel_call, 1); fail_locked(exec_ctx, holder); } else if (1 == gpr_atm_acq_load(&holder->subchannel_call)) { /* already cancelled before subchannel became ready */ |