diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-06-24 21:47:26 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-06-24 21:47:26 -0700 |
| commit | bc6bc090f471ac60c28a00152c637522e3bc72aa (patch) | |
| tree | 5ef5e6ab09b37372c08c7f6eabeaa1b390c653b4 | |
| parent | 64ea30fe5b9dacc2f2288e20dd0835933e5ca836 (diff) | |
fixed leak and outdated comment
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c index d9bba3598e..330516a2ac 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c @@ -405,7 +405,7 @@ static grpc_connectivity_state update_lb_connectivity_status_locked( * CHECK: sd->curr_connectivity_state == CONNECTING. * * 3) RULE: ALL subchannels are SHUTDOWN => policy is SHUTDOWN. - * CHECK: p->num_subchannels = 0. + * CHECK: p->num_shutdown == p->num_subchannels. * * 4) RULE: ALL subchannels are TRANSIENT_FAILURE => policy is * TRANSIENT_FAILURE. @@ -427,14 +427,13 @@ static grpc_connectivity_state update_lb_connectivity_status_locked( return GRPC_CHANNEL_CONNECTING; } else if (p->num_shutdown == p->num_subchannels) { /* 3) SHUTDOWN */ grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - GRPC_CHANNEL_SHUTDOWN, GRPC_ERROR_REF(error), - "rr_shutdown"); + GRPC_CHANNEL_SHUTDOWN, error, "rr_shutdown"); return GRPC_CHANNEL_SHUTDOWN; } else if (p->num_transient_failures == p->num_subchannels) { /* 4) TRANSIENT_FAILURE */ grpc_connectivity_state_set(exec_ctx, &p->state_tracker, - GRPC_CHANNEL_TRANSIENT_FAILURE, - GRPC_ERROR_REF(error), "rr_transient_failure"); + GRPC_CHANNEL_TRANSIENT_FAILURE, error, + "rr_transient_failure"); return GRPC_CHANNEL_TRANSIENT_FAILURE; } else if (p->num_idle == p->num_subchannels) { /* 5) IDLE */ grpc_connectivity_state_set(exec_ctx, &p->state_tracker, GRPC_CHANNEL_IDLE, |