Reviewer comment

src/core/server/server.h

@@ -161,9 +161,10 @@ class Server : public ServerInterface,
     // 1) Invoke AddLogicalConnection() on accepting a new connection. Do not
     // invoke if the connection is going to be closed immediately.
     // 2) Invoke OnHandshakeDone() (irrespective of error) once handshake is
-    // done.
-    // 3) Invoke RemoveLogicalConnection() when the connection is closed.
-    // Do not invoke if the connection was never added.
+    // done. No need to invoke if `RemoveLogicalConnection()` has already been
+    // invoked.
+    // 3) Invoke RemoveLogicalConnection() when the connection is closed. Do not
+    // invoke if the connection was never added.
     // TODO(yashykt): In the case where there is no config fetcher, we remove
     // the connection from our map and instead use `ChannelData` to keep track
     // of the connections. This is much cheaper (8 bytes per connection) as

test/cpp/end2end/xds/xds_end2end_test.cc

@@ -3506,9 +3506,9 @@ int main(int argc, char** argv) {
   // updates from all the subchannels's FDs.
   grpc_core::ConfigVars::Overrides overrides;
   overrides.client_channel_backup_poll_interval_ms = 1;
-  //   overrides.trace =
-  //       "call,channel,client_channel,client_channel_call,client_channel_lb_call,"
-  //       "handshaker";
+  overrides.trace =
+      "call,channel,client_channel,client_channel_call,client_channel_lb_call,"
+      "handshaker";
   grpc_core::ConfigVars::SetOverrides(overrides);
 #if TARGET_OS_IPHONE
   // Workaround Apple CFStream bug