more WIP on RR

1 files changed, 8 insertions, 4 deletions

diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
index 0824fe373c..c643f4cb4b 100644
--- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
+++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
@@ -79,11 +79,15 @@ class SubchannelData {
     return curr_connectivity_state_;
   }
 
-  virtual grpc_connectivity_state CheckConnectivityStateLocked() {
+  void CheckConnectivityStateLocked() {
+    GPR_ASSERT(!connectivity_notification_pending_);
+    grpc_error* error = GRPC_ERROR_NONE;
     pending_connectivity_state_unsafe_ =
-        grpc_subchannel_check_connectivity(subchannel(), nullptr);
-    curr_connectivity_state_ = pending_connectivity_state_unsafe_;
-    return curr_connectivity_state_;
+        grpc_subchannel_check_connectivity(subchannel(), &error);
+    if (pending_connectivity_state_unsafe_ != curr_connectivity_state_) {
+      curr_connectivity_state_ = pending_connectivity_state_unsafe_;
+      ProcessConnectivityChangeLocked(error);
+    }
   }
 
   // Unrefs the subchannel.