diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-06-03 16:07:41 -0400 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-06-03 16:07:41 -0400 |
| commit | d38b2c479a53a15ea080a468bc54295baa78b386 (patch) | |
| tree | 69794807fc0fda01607060f3fb5814faf9c5381f /src/core/ext/client_config/subchannel.c | |
| parent | 3dbafd5923f11ffd73d702a7dc4118a8d1f241fc (diff) | |
| parent | 48ed92ea38f40d62467eb7955bd4b8bb7cd0ef24 (diff) | |
Merge pull request #6761 from ctiller/there-were-no-fatalities
Rename GRPC_CHANNEL_FATAL_FAILURE --> GRPC_CHANNEL_SHUTDOWN
Diffstat (limited to 'src/core/ext/client_config/subchannel.c')
| -rw-r--r-- | src/core/ext/client_config/subchannel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ext/client_config/subchannel.c b/src/core/ext/client_config/subchannel.c index f7d98ec4d9..3a635be02f 100644 --- a/src/core/ext/client_config/subchannel.c +++ b/src/core/ext/client_config/subchannel.c @@ -480,11 +480,11 @@ static void subchannel_on_child_state_changed(grpc_exec_ctx *exec_ctx, void *p, if (iomgr_success) { if (sw->connectivity_state == GRPC_CHANNEL_TRANSIENT_FAILURE) { /* any errors on a subchannel ==> we're done, create a new one */ - sw->connectivity_state = GRPC_CHANNEL_FATAL_FAILURE; + sw->connectivity_state = GRPC_CHANNEL_SHUTDOWN; } grpc_connectivity_state_set(exec_ctx, &c->state_tracker, sw->connectivity_state, "reflect_child"); - if (sw->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE) { + if (sw->connectivity_state != GRPC_CHANNEL_SHUTDOWN) { grpc_connected_subchannel_notify_on_state_change( exec_ctx, GET_CONNECTED_SUBCHANNEL(c, no_barrier), NULL, &sw->connectivity_state, &sw->closure); |