From b2817e853d1ecfccee65d4df42d0bd49b915de17 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Fri, 23 Oct 2026 18:15:01 -0700 Subject: [PATCH] test: raise mini-server startup wait from 30s to 90s in Makefiles (#12005) * test: raise mini-server startup wait from 30s to 90s in Makefiles Self-hosted/persistent runners under load regularly need >30s for weed mini (master+volume+filer+s3+iceberg+lance+webdav+worker) to become healthy; hosted runners start in <10s. Siblings already wait 90s (s3/checksum, s3/cors). Fixes the S3 Filer Group first-run flake on busy self-hosted runners. * test: align Makefile startup guards and progress totals with 90s bound Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- test/kms/Makefile | 8 ++++---- test/s3/copying/Makefile | 4 ++-- test/s3/cors/Makefile | 2 +- test/s3/filer_group/Makefile | 4 ++-- test/s3/iam/Makefile | 2 +- test/s3/sse/Makefile | 6 +++--- test/s3/versioning/Makefile | 2 +- test/tus/Makefile | 8 ++++---- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/kms/Makefile b/test/kms/Makefile index a46aa19b25..47736f6800 100644 --- a/test/kms/Makefile +++ b/test/kms/Makefile @@ -174,12 +174,12 @@ start-openbao-ci: ## Start OpenBao via Docker for CI ghcr.io/openbao/openbao:latest \ bao server -dev -dev-root-token-id=$(OPENBAO_TOKEN) -dev-listen-address=0.0.0.0:8200 @echo "Waiting for OpenBao to be ready..." - @for i in $$(seq 1 30); do \ + @for i in $$(seq 1 90); do \ if curl -s $(OPENBAO_ADDR)/v1/sys/health > /dev/null 2>&1; then \ echo "$(GREEN)OpenBao is ready$(NC)"; \ break; \ fi; \ - if [ $$i -eq 30 ]; then \ + if [ $$i -eq 90 ]; then \ echo "$(RED)Timeout waiting for OpenBao$(NC)"; \ docker logs openbao-ci 2>&1 | tail -20; \ exit 1; \ @@ -213,12 +213,12 @@ start-seaweedfs-ci: check-binary ## Start weed mini with OpenBao KMS config -ip=127.0.0.1 \ > /tmp/seaweedfs-kms-mini.log 2>&1 & echo $$! > /tmp/weed-kms-mini.pid @echo "Checking S3 service is ready..." - @for i in $$(seq 1 30); do \ + @for i in $$(seq 1 90); do \ if curl -s http://127.0.0.1:$(S3_PORT) > /dev/null 2>&1; then \ echo "$(GREEN)S3 service is ready$(NC)"; \ break; \ fi; \ - if [ $$i -eq 30 ]; then \ + if [ $$i -eq 90 ]; then \ echo "$(RED)Timeout waiting for S3 service$(NC)"; \ echo "=== Last 50 lines of server log ==="; \ tail -50 /tmp/seaweedfs-kms-mini.log 2>/dev/null || echo "No server log found"; \ diff --git a/test/s3/copying/Makefile b/test/s3/copying/Makefile index ea399223f0..50bedf2007 100644 --- a/test/s3/copying/Makefile +++ b/test/s3/copying/Makefile @@ -76,12 +76,12 @@ start-seaweedfs: check-binary -ip=127.0.0.1 \ > /tmp/seaweedfs-mini.log 2>&1 & echo $$! > /tmp/weed-mini.pid @echo "$(YELLOW)Waiting for S3 service to be ready...$(NC)" - @for i in $$(seq 1 30); do \ + @for i in $$(seq 1 90); do \ if curl -s -f http://127.0.0.1:$(S3_PORT) > /dev/null 2>&1; then \ echo "$(GREEN)S3 service is ready$(NC)"; \ break; \ fi; \ - echo "Waiting for S3 service... ($$i/30)"; \ + echo "Waiting for S3 service... ($$i/90)"; \ sleep 1; \ done @sleep 2 diff --git a/test/s3/cors/Makefile b/test/s3/cors/Makefile index 1378c7439e..ac56e11bc0 100644 --- a/test/s3/cors/Makefile +++ b/test/s3/cors/Makefile @@ -92,7 +92,7 @@ start-server: check-deps echo $$! > weed-server.pid @echo "Waiting for S3 server to be ready..." - @for i in $$(seq 1 30); do \ + @for i in $$(seq 1 90); do \ if echo | nc -z localhost $(S3_PORT); then \ echo "S3 server is ready!"; \ exit 0; \ diff --git a/test/s3/filer_group/Makefile b/test/s3/filer_group/Makefile index 21d5c050a8..7420b23149 100644 --- a/test/s3/filer_group/Makefile +++ b/test/s3/filer_group/Makefile @@ -79,14 +79,14 @@ start-server: check-deps echo $$! > weed-server.pid @echo "Waiting for S3 server to be ready..." - @for i in $$(seq 1 30); do \ + @for i in $$(seq 1 90); do \ if echo | nc -z localhost $(S3_PORT); then \ echo "S3 server is ready!"; \ exit 0; \ fi; \ sleep 1; \ done; \ - echo "❌ Server failed to start within 30 seconds"; \ + echo "❌ Server failed to start within 90 seconds"; \ if [ -f weed-server.log ]; then \ cat weed-server.log; \ fi; \ diff --git a/test/s3/iam/Makefile b/test/s3/iam/Makefile index 6dbb54299f..70f8972e14 100644 --- a/test/s3/iam/Makefile +++ b/test/s3/iam/Makefile @@ -81,7 +81,7 @@ start-services: ## Start SeaweedFS services for testing wait-for-services: ## Wait for all services to be ready @echo "Waiting for services to be ready..." @echo "Checking S3 API server..." - @for i in $$(seq 1 30); do \ + @for i in $$(seq 1 90); do \ if curl -s http://localhost:$(S3_PORT) > /dev/null 2>&1; then \ echo "OK S3 API server is ready"; \ exit 0; \ diff --git a/test/s3/sse/Makefile b/test/s3/sse/Makefile index cd7d50e9e8..e5072dbdba 100644 --- a/test/s3/sse/Makefile +++ b/test/s3/sse/Makefile @@ -106,7 +106,7 @@ start-seaweedfs: check-binary > /tmp/seaweedfs-sse-mini.log 2>&1 & echo $$! > /tmp/weed-mini.pid @echo "Checking S3 service is ready..." - @for i in $$(seq 1 30); do \ + @for i in $$(seq 1 90); do \ if curl -s http://127.0.0.1:$(S3_PORT) > /dev/null 2>&1; then \ echo "✅ S3 service is ready"; \ break; \ @@ -347,7 +347,7 @@ start-seaweedfs-ci: check-binary > /tmp/seaweedfs-sse-mini.log 2>&1 & echo $$! > /tmp/weed-mini.pid @echo "Checking S3 service is ready..." - @for i in $$(seq 1 30); do \ + @for i in $$(seq 1 90); do \ if curl -s http://127.0.0.1:$(S3_PORT) > /dev/null 2>&1; then \ echo "✅ S3 service is ready"; \ break; \ @@ -491,7 +491,7 @@ test-volume-encryption: build-weed -ip=127.0.0.1 \ > /tmp/seaweedfs-sse-mini.log 2>&1 & echo $$! > /tmp/weed-mini.pid @echo "Checking S3 service is ready..." - @for i in $$(seq 1 30); do \ + @for i in $$(seq 1 90); do \ if curl -s http://127.0.0.1:$(S3_PORT) > /dev/null 2>&1; then \ echo "✅ S3 service is ready"; \ break; \ diff --git a/test/s3/versioning/Makefile b/test/s3/versioning/Makefile index 621543bbc8..f41cfe3905 100644 --- a/test/s3/versioning/Makefile +++ b/test/s3/versioning/Makefile @@ -331,7 +331,7 @@ start-server-simple: check-deps echo $$! > weed-server.pid @echo "Waiting for S3 server to be ready..." - @for i in $$(seq 1 30); do \ + @for i in $$(seq 1 90); do \ if echo | nc -z localhost $(S3_PORT); then \ echo "S3 server is ready!"; \ exit 0; \ diff --git a/test/tus/Makefile b/test/tus/Makefile index 172b3af506..63f2ed50cc 100644 --- a/test/tus/Makefile +++ b/test/tus/Makefile @@ -106,17 +106,17 @@ start-seaweedfs: check-binary # Wait for filer to be ready @echo "$(YELLOW)Waiting for filer to be ready...$(NC)" - @for i in $$(seq 1 30); do \ + @for i in $$(seq 1 90); do \ if curl -s -f http://127.0.0.1:$(FILER_PORT)/ > /dev/null 2>&1; then \ echo "$(GREEN)Filer is ready$(NC)"; \ break; \ fi; \ - if [ $$i -eq 30 ]; then \ - echo "$(RED)Filer failed to start within 30 seconds$(NC)"; \ + if [ $$i -eq 90 ]; then \ + echo "$(RED)Filer failed to start within 90 seconds$(NC)"; \ $(MAKE) debug-logs; \ exit 1; \ fi; \ - echo "Waiting for filer... ($$i/30)"; \ + echo "Waiting for filer... ($$i/90)"; \ sleep 1; \ done