upstream: Expose the drainConnections method on the connection pool…

…. (#22554) Exposing the drainConnections method on the connection pool, so that Nighthawk can correctly drain the connection pools used by its individual workers. Fixes #22527. Works on envoyproxy/nighthawk#873. /cc @alyssawilk Risk Level: low, existing functionality isn't affected. Testing: unit tests. Docs Changes: n/a. Release Notes: n/a. Platform Specific Features: n/a. Signed-off-by: Jakub Sobon <[email protected]>
maistra · Oct 24, 2022 · 59bffd9 · 59bffd9
1 parent 84e3f8f
commit 59bffd9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/envoy/upstream/thread_local_cluster.h b/envoy/upstream/thread_local_cluster.h
@@ -33,6 +33,9 @@ class HttpPoolData {
    * See documentation of Envoy::ConnectionPool::Instance.
    */
   void addIdleCallback(ConnectionPool::Instance::IdleCb cb) { pool_->addIdleCallback(cb); };
+  void drainConnections(ConnectionPool::DrainBehavior drain_behavior) {
+    pool_->drainConnections(drain_behavior);
+  };
 
   Upstream::HostDescriptionConstSharedPtr host() const { return pool_->host(); }
 

diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc
@@ -4248,6 +4248,9 @@ TEST_F(ClusterManagerImplTest, HttpPoolDataForwardsCallsToConnectionPool) {
   ConnectionPool::Instance::IdleCb drained_cb = []() {};
   EXPECT_CALL(*pool_mock, addIdleCallback(_));
   opt_cp.value().addIdleCallback(drained_cb);
+
+  EXPECT_CALL(*pool_mock, drainConnections(ConnectionPool::DrainBehavior::DrainAndDelete));
+  opt_cp.value().drainConnections(ConnectionPool::DrainBehavior::DrainAndDelete);
 }
 
 // Test that the read only cross-priority host map in the main thread is correctly synchronized to