From e2620e14223f6aa823845f7422fe4241f6650d10 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Tue, 3 Apr 2018 11:09:58 -0700 Subject: [PATCH] Address a couple of FIXMEs. --- .../lb_policy/round_robin/round_robin.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index 43eba1b64a1..2cfd2d649f7 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -174,7 +174,7 @@ class RoundRobin : public LoadBalancingPolicy { /** our connectivity state tracker */ grpc_connectivity_state_tracker state_tracker_; /** Index into subchannel_list_ for last pick. */ - size_t last_ready_subchannel_index_ = 0; // FIXME: set to -1? + size_t last_ready_subchannel_index_ = -1; }; RoundRobin::RoundRobin(const Args& args) : LoadBalancingPolicy(args) { @@ -562,15 +562,6 @@ void RoundRobin::RoundRobinSubchannelData::ProcessConnectivityChangeLocked( grpc_error_string(error)); } GPR_ASSERT(subchannel() != nullptr); -// FIXME: this check may not be needed, because subchannel_list should -// always be shutting down if policy is shutting down - // If the policy is shutting down, unref and return. - if (p->shutdown_) { - StopConnectivityWatchLocked(); - UnrefSubchannelLocked("rr_shutdown"); - subchannel_list()->UnrefForConnectivityWatch("rr_shutdown"); - return; - } // If the subchannel list is shutting down, stop watching. if (subchannel_list()->shutting_down() || error == GRPC_ERROR_CANCELLED) { StopConnectivityWatchLocked();