Fix flaky integ tests (#5348)

* Pass TcpListener to quickwit_serve in integ tests

* Use static dispatch instead of enum

* Simplify cluster sandbox API

* Increase wait_for_split to match higher commit timeouts

quickwit/quickwit-cli/src/service.rs

@@ -27,6 +27,7 @@ use quickwit_common::runtimes::RuntimesConfig;
 use quickwit_common::uri::{Protocol, Uri};
 use quickwit_config::service::QuickwitService;
 use quickwit_config::NodeConfig;
+use quickwit_serve::tcp_listener::DefaultTcpListenerResolver;
 use quickwit_serve::{serve_quickwit, BuildInfo, EnvFilterReloadFn};
 use quickwit_telemetry::payload::{QuickwitFeature, QuickwitTelemetryInfo, TelemetryEvent};
 use tokio::signal;
@@ -114,6 +115,7 @@ impl RunCliCommand {
             runtimes_config,
             metastore_resolver,
             storage_resolver,
+            DefaultTcpListenerResolver,
             shutdown_signal,
             env_filter_reload_fn,
         )

quickwit/quickwit-config/src/node_config/mod.rs

@@ -480,9 +480,17 @@ impl NodeConfig {
         self.storage_configs.redact();
     }
 
+    /// Creates a config with defaults suitable for testing.
+    ///
+    /// Uses the default ports without ensuring that they are available.
     #[cfg(any(test, feature = "testsuite"))]
     pub fn for_test() -> Self {
-        serialize::node_config_for_test()
+        serialize::node_config_for_tests_from_ports(7280, 7281)
+    }
+
+    #[cfg(any(test, feature = "testsuite"))]
+    pub fn for_test_from_ports(rest_listen_port: u16, grpc_listen_port: u16) -> Self {
+        serialize::node_config_for_tests_from_ports(rest_listen_port, grpc_listen_port)
     }
 }
 

quickwit/quickwit-config/src/node_config/serialize.rs

@@ -411,13 +411,13 @@ impl RestConfigBuilder {
 }
 
 #[cfg(any(test, feature = "testsuite"))]
-pub fn node_config_for_test() -> NodeConfig {
-    use quickwit_common::net::find_available_tcp_port;
-
+pub fn node_config_for_tests_from_ports(
+    rest_listen_port: u16,
+    grpc_listen_port: u16,
+) -> NodeConfig {
     let node_id = NodeId::new(default_node_id().unwrap());
     let enabled_services = QuickwitService::supported_services();
     let listen_address = Host::default();
-    let rest_listen_port = find_available_tcp_port().expect("OS should find an available port");
     let rest_listen_addr = listen_address
         .with_port(rest_listen_port)
         .to_socket_addr()
@@ -426,7 +426,6 @@ pub fn node_config_for_test() -> NodeConfig {
         .with_port(rest_listen_port)
         .to_socket_addr()
         .expect("default host should be an IP address");
-    let grpc_listen_port = find_available_tcp_port().expect("OS should find an available port");
     let grpc_listen_addr = listen_address
         .with_port(grpc_listen_port)
         .to_socket_addr()

quickwit/quickwit-integration-tests/Cargo.toml

@@ -41,5 +41,5 @@ quickwit-metastore = { workspace = true, features = ["testsuite"] }
 quickwit-opentelemetry = { workspace = true, features = ["testsuite"] }
 quickwit-proto = { workspace = true, features = ["testsuite"] }
 quickwit-rest-client = { workspace = true }
-quickwit-serve = { workspace = true }
+quickwit-serve = { workspace = true, features = ["testsuite"] }
 quickwit-storage = { workspace = true, features = ["testsuite"] }