Remove unnecessary drain grace timer when empty connections

yashykt · Jan 6, 2025 · a920e9b · a920e9b
1 parent a86b31c
commit a920e9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/core/server/server.cc b/src/core/server/server.cc
@@ -280,6 +280,9 @@ void Server::ListenerState::RemoveLogicalConnection(
 }
 
 void Server::ListenerState::DrainConnectionsLocked() {
+  if (connections_.empty()) {
+    return;
+  }
   // Send GOAWAYs on the transports so that they disconnect when existing
   // RPCs finish.
   for (auto& connection : connections_) {

diff --git a/test/cpp/end2end/xds/xds_enabled_server_end2end_test.cc b/test/cpp/end2end/xds/xds_enabled_server_end2end_test.cc
@@ -298,8 +298,6 @@ TEST_P(XdsEnabledServerStatusNotificationTest, RepeatedServingStatusChanges) {
 }
 
 TEST_P(XdsEnabledServerStatusNotificationTest, ExistingRpcsOnResourceDeletion) {
-  // Send a valid LDS update to get the server to start listening
-  SetValidLdsUpdate();
   StartBackend(0);
   ASSERT_TRUE(backends_[0]->WaitOnServingStatusChange(grpc::StatusCode::OK));
   constexpr int kNumChannels = 10;
@@ -356,8 +354,6 @@ TEST_P(XdsEnabledServerStatusNotificationTest,
        ExistingRpcsFailOnResourceUpdateAfterDrainGraceTimeExpires) {
   constexpr int kDrainGraceTimeMs = 100;
   xds_drain_grace_time_ms_ = kDrainGraceTimeMs;
-  // Send a valid LDS update to get the server to start listening
-  SetValidLdsUpdate();
   StartBackend(0);
   ASSERT_TRUE(backends_[0]->WaitOnServingStatusChange(grpc::StatusCode::OK));
   constexpr int kNumChannels = 10;