From f2957a680d5555b4f24d770bbdd928b35a14b8c6 Mon Sep 17 00:00:00 2001 From: Zhengchao An Date: Fri, 21 Aug 2026 08:43:12 +0800 Subject: [PATCH] test: stabilize release-blocking full E2E checks (#6322) --- crates/e2e_test/src/common.rs | 3 ++- crates/e2e_test/src/inline_fast_path_cluster_test.rs | 3 ++- crates/e2e_test/src/quota_test.rs | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/e2e_test/src/common.rs b/crates/e2e_test/src/common.rs index 460c764ed..42fe5f92a 100644 --- a/crates/e2e_test/src/common.rs +++ b/crates/e2e_test/src/common.rs @@ -53,7 +53,8 @@ pub(crate) const FAST_DATA_USAGE_SCANNER_ENV: &[(&str, &str)] = pub const TEST_BUCKET: &str = "e2e-test-bucket"; const RUSTFS_FULL_FEATURE: &str = "full"; const TEST_PORT_MIN: u16 = 20_000; -const TEST_PORT_RANGE: u16 = 40_000; +// Keep allocator ports below the ephemeral range used by bind(..., 0) test helpers. +const TEST_PORT_RANGE: u16 = 10_000; const TEST_PORT_COUNTER_PATH: &str = "/tmp/rustfs_e2e_next_port"; const TEST_PORT_LOCK_DIR: &str = "/tmp/rustfs_e2e_port_allocator.lock"; const TEST_PORT_LOCK_STALE_AFTER: Duration = Duration::from_secs(30); diff --git a/crates/e2e_test/src/inline_fast_path_cluster_test.rs b/crates/e2e_test/src/inline_fast_path_cluster_test.rs index 04a0a9f05..a4df7cd88 100644 --- a/crates/e2e_test/src/inline_fast_path_cluster_test.rs +++ b/crates/e2e_test/src/inline_fast_path_cluster_test.rs @@ -2255,6 +2255,7 @@ async fn four_node_manual_transition_distributed_admission_conflict_reports_stat hot.set_env("RUSTFS_SCANNER_CYCLE", "3600"); hot.set_env("RUSTFS_MAX_TRANSITION_WORKERS", "1"); hot.set_env("RUSTFS_TRANSITION_QUEUE_CAPACITY", "1"); + hot.set_env("RUSTFS_TRANSITION_QUEUE_SEND_TIMEOUT_MS", "1"); hot.start().await?; let hot_client = hot.create_s3_client(0)?; @@ -2271,7 +2272,7 @@ async fn four_node_manual_transition_distributed_admission_conflict_reports_stat .put_object() .bucket(&bucket) .key(key) - .body(ByteStream::from(payload(64 * KIB, index))) + .body(ByteStream::from(payload(1024 * KIB, index))) .send() .await?; } diff --git a/crates/e2e_test/src/quota_test.rs b/crates/e2e_test/src/quota_test.rs index 0e73f2212..adff548ad 100644 --- a/crates/e2e_test/src/quota_test.rs +++ b/crates/e2e_test/src/quota_test.rs @@ -634,6 +634,7 @@ mod integration_tests { let env = QuotaTestEnv::new().await?; env.create_bucket().await?; + env.wait_for_quota_usage_for(&env.bucket_name).await?; // Test 1: GET quota for bucket without quota config let url = format!("{}/rustfs/admin/v3/quota/{}", env.env.url, env.bucket_name);