test: fix master client timeout causing test hangs

Use the main test context for KeepConnectedToMaster instead of creating a separate 60s context. The tests have 180s outer timeouts but the master client was disconnecting after 60s, causing subsequent commands to hang waiting for reconnection.
test: improve helper robustness
2026-10-15 19:15:51 +00:00 · 2025-12-10 23:40:48 -08:00 · 2025-12-10 22:42:28 -08:00 · 2025-12-10 22:41:35 -08:00 · 2025-12-10 22:27:12 -08:00 · 2025-12-10 21:33:11 -08:00
330 changed files with 4082 additions and 31296 deletions
@@ -44,7 +44,7 @@ jobs:
        run: echo BUILD_TIME=$(date -u +%Y%m%d-%H%M) >> ${GITHUB_ENV}

      - name: Go Release Binaries Large Disk
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -60,7 +60,7 @@ jobs:
          asset_name: "weed-large-disk-${{ env.BUILD_TIME }}-${{ matrix.goos }}-${{ matrix.goarch }}"

      - name: Go Release Binaries Normal Volume Size
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -93,7 +93,7 @@ jobs:
        run: echo BUILD_TIME=$(date -u +%Y%m%d-%H%M) >> ${GITHUB_ENV}

      - name: Go Release Binaries Large Disk
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -109,7 +109,7 @@ jobs:
          asset_name: "weed-large-disk-${{ env.BUILD_TIME }}-${{ matrix.goos }}-${{ matrix.goarch }}"

      - name: Go Release Binaries Normal Volume Size
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -30,7 +30,7 @@ jobs:
      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v2
      - name: Go Release Binaries Normal Volume Size
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -44,7 +44,7 @@ jobs:
          binary_name: weed
          asset_name: "${{ matrix.goos }}_${{ matrix.goarch }}"
      - name: Go Release Large Disk Binaries
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -30,7 +30,7 @@ jobs:
      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v2
      - name: Go Release Binaries Normal Volume Size
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -44,7 +44,7 @@ jobs:
          binary_name: weed
          asset_name: "${{ matrix.goos }}_${{ matrix.goarch }}"
      - name: Go Release Large Disk Binaries
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -30,7 +30,7 @@ jobs:
      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v2
      - name: Go Release Binaries Normal Volume Size
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -44,7 +44,7 @@ jobs:
          binary_name: weed
          asset_name: "${{ matrix.goos }}_${{ matrix.goarch }}"
      - name: Go Release Large Disk Binaries
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -30,7 +30,7 @@ jobs:
      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v2
      - name: Go Release Binaries Normal Volume Size
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -44,7 +44,7 @@ jobs:
          binary_name: weed
          asset_name: "${{ matrix.goos }}_${{ matrix.goarch }}"
      - name: Go Release Large Disk Binaries
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -30,7 +30,7 @@ jobs:
      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v2
      - name: Go Release Binaries Normal Volume Size
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -45,7 +45,7 @@ jobs:
          binary_name: weed
          asset_name: "${{ matrix.goos }}_${{ matrix.goarch }}_full"
      - name: Go Release Large Disk Binaries
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -30,7 +30,7 @@ jobs:
      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v2
      - name: Go Release Binaries Normal Volume Size
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -44,7 +44,7 @@ jobs:
          binary_name: weed
          asset_name: "${{ matrix.goos }}_${{ matrix.goarch }}"
      - name: Go Release Large Disk Binaries
-        uses: wangyoucao577/go-release-action@279495102627de7960cbc33434ab01a12bae144b # v1.22
+        uses: wangyoucao577/go-release-action@ec4e3151b3eccfa3527868ba70f60402265fef06 # v1.22
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          goos: ${{ matrix.goos }}
@@ -223,23 +223,4 @@ jobs:
          
          echo "✓ Successfully copied ${{ matrix.variant }} to Docker Hub"

-  helm-release:
-    runs-on: ubuntu-latest
-    needs: [copy-to-dockerhub]
-    permissions:
-      contents: write
-      pages: write
-    steps:
-      - uses: actions/checkout@v6
-      - name: Publish Helm charts
-        uses: stefanprodan/helm-gh-pages@v1.7.0
-        with:          
-          token: ${{ secrets.GITHUB_TOKEN }}
-          charts_dir: k8s/charts
-          target_dir: helm
-          branch: gh-pages
-          helm_version: "3.18.4"
-
-
-

@@ -36,7 +36,7 @@ jobs:
      uses: docker/setup-buildx-action@v3
      
    - name: Cache Docker layers
-      uses: actions/cache@v5
+      uses: actions/cache@v4
      with:
        path: /tmp/.buildx-cache
        key: ${{ runner.os }}-buildx-e2e-${{ github.sha }}
@@ -134,7 +134,7 @@ jobs:

    - name: Archive logs
      if: always()
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v5
      with:
        name: output-logs
        path: docker/output.log
@@ -35,7 +35,7 @@ jobs:

    - name: Archive logs
      if: failure()
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v5
      with:
        name: ec-integration-test-logs
        path: test/erasure_coding
@@ -183,7 +183,7 @@ jobs:
        
    - name: Upload Test Artifacts
      if: always()
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v5
      with:
        name: fuse-integration-test-results
        path: |
@@ -33,15 +33,6 @@ jobs:
      run: |
        cd weed; go get -v -t -d ./...

-    - name: Go Vet (excluding protobuf lock copying)
-      run: |
-        cd weed
-        # Run go vet and filter out known protobuf MessageState lock copying warnings
-        # These are expected in generated protobuf code with embedded sync.Mutex and are safe in practice
-        go vet -v ./... 2>&1 | grep -v "MessageState contains sync.Mutex" | grep -v "IdentityAccessManagement contains sync.RWMutex" | tee vet-output.txt
-        # Fail only if there are actual vet errors (not counting the filtered lock warnings)
-        if grep -q "vet:" vet-output.txt; then exit 1; fi
-
    - name: Build
      run: cd weed; go build -tags "elastic gocdk sqlite ydb tarantool tikv rclone" -v .

@@ -0,0 +1,23 @@
+name: "helm: publish charts"
+on:
+  push:
+    tags:
+      - '*'
+
+permissions:
+  contents: write
+  pages: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - name: Publish Helm charts
+        uses: stefanprodan/helm-gh-pages@v1.7.0
+        with:          
+          token: ${{ secrets.GITHUB_TOKEN }}
+          charts_dir: k8s/charts
+          target_dir: helm
+          branch: gh-pages
+          helm_version: "3.18.4"
@@ -53,7 +53,6 @@ jobs:
          mkdir -p "$WEED_DATA_DIR"
          
          # Start SeaweedFS with optimized settings for CI
-          # Include S3 API for s3copier integration tests
          weed server -dir="$WEED_DATA_DIR" \
            -master.raftHashicorp \
            -master.electionTimeout=1s \
@@ -62,9 +61,6 @@ jobs:
            -volume.preStopSeconds=1 \
            -master.peers=none \
            -filer -filer.maxMB=64 \
-            -s3 -s3.port=8333 \
-            -s3.config="$GITHUB_WORKSPACE/docker/compose/s3.json" \
-            -s3.allowDeleteBucketNotEmpty=true \
            -master.port=9333 \
            -volume.port=8080 \
            -filer.port=8888 \
@@ -109,16 +105,6 @@ jobs:
            sleep 2
          done
          
-          # Wait for S3 API
-          for i in {1..30}; do
-            if curl -s http://localhost:8333/ > /dev/null 2>&1; then
-              echo "✓ S3 API is ready"
-              break
-            fi
-            echo "Waiting for S3 API... ($i/30)"
-            sleep 2
-          done
-          
          echo "✓ All SeaweedFS components are ready!"
          
          # Display cluster status
@@ -147,20 +133,6 @@ jobs:
        run: |
          mvn test -Dtest=SeaweedFileSystemConfigTest -Dmaven.javadoc.skip=true -Dgpg.skip=true
      
-      - name: Run S3 ETag Validation Tests (Issue #7768)
-        working-directory: other/java/s3copier
-        env:
-          S3_ENDPOINT: http://127.0.0.1:8333
-          S3_ACCESS_KEY: some_access_key1
-          S3_SECRET_KEY: some_secret_key1
-        run: |
-          echo "Running S3 ETag validation tests against $S3_ENDPOINT"
-          mvn test -Dtest=ETagValidationTest \
-            -DS3_ENDPOINT=$S3_ENDPOINT \
-            -DS3_ACCESS_KEY=$S3_ACCESS_KEY \
-            -DS3_SECRET_KEY=$S3_SECRET_KEY \
-            -Dmaven.javadoc.skip=true -Dgpg.skip=true
-      
      - name: Display logs on failure
        if: failure()
        run: |
@@ -49,7 +49,7 @@ jobs:
      
      - name: Upload Test Reports
        if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: test-reports-java-${{ matrix.java }}
          path: |
@@ -52,7 +52,6 @@ jobs:
      run: |
        cd test/kafka
        go mod download
-        go mod tidy

    - name: Run Kafka Gateway Unit Tests
      run: |
@@ -97,7 +96,6 @@ jobs:
      run: |
        cd test/kafka
        go mod download
-        go mod tidy

    - name: Run Integration Tests
      run: |
@@ -156,7 +154,6 @@ jobs:
        cd test/kafka
        # Use go mod download with timeout to prevent hanging
        timeout 90s go mod download || echo "Warning: Dependency download timed out, continuing with cached modules"
-        go mod tidy

    - name: Build and start SeaweedFS MQ
      run: |
@@ -335,7 +332,6 @@ jobs:
        cd test/kafka
        # Use go mod download with timeout to prevent hanging
        timeout 90s go mod download || echo "Warning: Dependency download timed out, continuing with cached modules"
-        go mod tidy

    - name: Build and start SeaweedFS MQ
      run: |
@@ -496,7 +492,6 @@ jobs:
      run: |
        cd test/kafka
        timeout 90s go mod download || echo "Warning: Dependency download timed out, continuing with cached modules"
-        go mod tidy

    - name: Build and start SeaweedFS MQ
      run: |
@@ -654,7 +649,6 @@ jobs:
      run: |
        cd test/kafka
        timeout 90s go mod download || echo "Warning: Dependency download timed out, continuing with cached modules"
-        go mod tidy

    - name: Build and start SeaweedFS MQ
      run: |
@@ -809,7 +803,6 @@ jobs:
      run: |
        cd test/kafka
        go mod download
-        go mod tidy

    - name: Run Protocol Tests
      run: |
@@ -70,7 +70,7 @@ jobs:
        
    - name: Archive logs on failure
      if: failure()
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v5
      with:
        name: metadata-subscribe-test-logs
        path: |
@@ -35,7 +35,7 @@ jobs:
      uses: docker/setup-buildx-action@v3

    - name: Cache Docker layers
-      uses: actions/cache@v5
+      uses: actions/cache@v4
      with:
        path: /tmp/.buildx-cache
        key: ${{ runner.os }}-buildx-postgres-${{ github.sha }}
@@ -62,7 +62,7 @@ jobs:

    - name: Archive logs
      if: always()
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v5
      with:
        name: postgres-logs
        path: test/postgres/postgres-output.log
@@ -1,86 +0,0 @@
-name: "S3 Filer Group Tests"
-
-on:
-  pull_request:
-  
-concurrency:
-  group: ${{ github.head_ref }}/s3-filer-group-tests
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-defaults:
-  run:
-    working-directory: weed
-
-jobs:
-  s3-filer-group-tests:
-    name: S3 Filer Group Integration Tests
-    runs-on: ubuntu-22.04
-    timeout-minutes: 20
-    
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v6
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: 'go.mod'
-        id: go
-
-      - name: Install SeaweedFS
-        run: |
-          go install -buildvcs=false
-
-      - name: Run S3 Filer Group Tests
-        timeout-minutes: 15
-        working-directory: test/s3/filer_group
-        run: |
-          set -x
-          echo "=== System Information ==="
-          uname -a
-          free -h
-          df -h
-          echo "=== Starting Filer Group Tests ==="
-          
-          # Run tests with automatic server management
-          # The test-with-server target handles server startup/shutdown automatically
-          # Server is started with -filer.group=testgroup
-          make test-with-server || {
-            echo "❌ Filer group tests failed, checking logs..."
-            if [ -f weed-test.log ]; then
-              echo "=== Server logs ==="
-              tail -100 weed-test.log
-            fi
-            echo "=== Process information ==="
-            ps aux | grep -E "(weed|test)" || true
-            exit 1
-          }
-
-      - name: Show server logs on failure
-        if: failure()
-        working-directory: test/s3/filer_group
-        run: |
-          echo "=== Server Logs ==="
-          if [ -f weed-test.log ]; then
-            echo "Last 100 lines of server logs:"
-            tail -100 weed-test.log
-          else
-            echo "No server log file found"
-          fi
-          
-          echo "=== Test Environment ==="
-          ps aux | grep -E "(weed|test)" || true
-          netstat -tlnp | grep -E "(8333|9333|8080)" || true
-
-      - name: Upload test logs on failure
-        if: failure()
-        uses: actions/upload-artifact@v6
-        with:
-          name: s3-filer-group-test-logs
-          path: test/s3/filer_group/weed-test*.log
-          retention-days: 3
-
-
@@ -76,7 +76,7 @@ jobs:

      - name: Upload test logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-versioning-test-logs-${{ matrix.test-type }}
          path: test/s3/versioning/weed-test*.log
@@ -124,7 +124,7 @@ jobs:

      - name: Upload server logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-versioning-compatibility-logs
          path: test/s3/versioning/weed-test*.log
@@ -172,7 +172,7 @@ jobs:

      - name: Upload server logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-cors-compatibility-logs
          path: test/s3/cors/weed-test*.log
@@ -239,7 +239,7 @@ jobs:

      - name: Upload test logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-retention-test-logs-${{ matrix.test-type }}
          path: test/s3/retention/weed-test*.log
@@ -306,7 +306,7 @@ jobs:

      - name: Upload test logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-cors-test-logs-${{ matrix.test-type }}
          path: test/s3/cors/weed-test*.log
@@ -355,7 +355,7 @@ jobs:

      - name: Upload server logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-retention-worm-logs
          path: test/s3/retention/weed-test*.log
@@ -365,6 +365,8 @@ jobs:
    name: S3 Versioning Stress Test
    runs-on: ubuntu-22.04
    timeout-minutes: 35
+    # Only run stress tests on master branch pushes to avoid overloading PR testing
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
    
    steps:
      - name: Check out code
@@ -389,9 +391,6 @@ jobs:
          uname -a
          free -h
          
-          # Start server for stress tests
-          make start-server
-          
          # Run stress tests (concurrent operations)
          make test-versioning-stress || {
            echo "❌ Stress test failed, checking logs..."
@@ -399,30 +398,14 @@ jobs:
              echo "=== Server logs ==="
              tail -200 weed-test.log
            fi
-            make stop-server
            make clean
            exit 1
          }
-          
-          # Run pagination stress tests (>1000 versions)
-          echo "=== Running pagination stress tests ==="
-          make test-versioning-pagination-stress || {
-            echo "❌ Pagination stress test failed, checking logs..."
-            if [ -f weed-test.log ]; then
-              echo "=== Server logs ==="
-              tail -200 weed-test.log
-            fi
-            make stop-server
-            make clean
-            exit 1
-          }
-          
-          make stop-server
          make clean

      - name: Upload stress test logs
        if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-versioning-stress-logs
          path: test/s3/versioning/weed-test*.log
@@ -476,65 +459,10 @@ jobs:

      - name: Upload test logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-tagging-test-logs
          path: test/s3/tagging/weed-test*.log
          retention-days: 3

-  s3-remote-cache-tests:
-    name: S3 Remote Cache Tests
-    runs-on: ubuntu-22.04
-    timeout-minutes: 20
-    
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v6
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: 'go.mod'
-        id: go
-
-      - name: Install SeaweedFS
-        run: |
-          go install -buildvcs=false
-
-      - name: Run S3 Remote Cache Tests
-        timeout-minutes: 15
-        working-directory: test/s3/remote_cache
-        run: |
-          set -x
-          echo "=== System Information ==="
-          uname -a
-          free -h
-          
-          # Run the remote cache integration tests
-          # Tests singleflight deduplication for caching remote objects
-          make test-with-server || {
-            echo "❌ Test failed, checking logs..."
-            if [ -f primary-weed.log ]; then
-              echo "=== Primary server logs ==="
-              tail -100 primary-weed.log
-            fi
-            if [ -f remote-weed.log ]; then
-              echo "=== Remote server logs ==="
-              tail -100 remote-weed.log
-            fi
-            echo "=== Process information ==="
-            ps aux | grep -E "(weed|test)" || true
-            exit 1
-          }
-
-      - name: Upload test logs on failure
-        if: failure()
-        uses: actions/upload-artifact@v6
-        with:
-          name: s3-remote-cache-test-logs
-          path: |
-            test/s3/remote_cache/primary-weed.log
-            test/s3/remote_cache/remote-weed.log
-          retention-days: 3
-
  # Removed SSE-C integration tests and compatibility job
@@ -65,7 +65,7 @@ jobs:

      - name: Upload test results on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: iam-unit-test-results
          path: |
@@ -162,7 +162,7 @@ jobs:

      - name: Upload test logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-iam-integration-logs-${{ matrix.test-type }}
          path: test/s3/iam/weed-*.log
@@ -222,7 +222,7 @@ jobs:

      - name: Upload distributed test logs
        if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-iam-distributed-logs
          path: test/s3/iam/weed-*.log
@@ -274,7 +274,7 @@ jobs:

      - name: Upload performance test results
        if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-iam-performance-results
          path: |
@@ -152,7 +152,7 @@ jobs:

      - name: Upload test logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-keycloak-test-logs
          path: |
@@ -121,7 +121,7 @@ jobs:
      
      - name: Upload test logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: test-logs-python-${{ matrix.python-version }}
          path: |
@@ -95,7 +95,7 @@ jobs:

      - name: Upload test logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-sse-test-logs-${{ matrix.test-type }}
          path: test/s3/sse/weed-test*.log
@@ -143,7 +143,7 @@ jobs:

      - name: Upload server logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-sse-compatibility-logs
          path: test/s3/sse/weed-test*.log
@@ -192,7 +192,7 @@ jobs:

      - name: Upload server logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-sse-metadata-persistence-logs
          path: test/s3/sse/weed-test*.log
@@ -241,7 +241,7 @@ jobs:

      - name: Upload server logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-sse-copy-operations-logs
          path: test/s3/sse/weed-test*.log
@@ -290,7 +290,7 @@ jobs:

      - name: Upload server logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-sse-multipart-logs
          path: test/s3/sse/weed-test*.log
@@ -340,7 +340,7 @@ jobs:

      - name: Upload performance test logs
        if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: s3-sse-performance-logs
          path: test/s3/sse/weed-test*.log
@@ -91,4 +91,3 @@ jobs:
        echo "| readonly | /public | Read-only |" >> $GITHUB_STEP_SUMMARY


-
@@ -125,7 +125,7 @@ jobs:

    - name: Upload test results
      if: always()
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v5
      with:
        name: spark-test-results
        path: test/java/spark/target/surefire-reports/
@@ -150,7 +150,7 @@ jobs:
    - name: Cache Apache Spark
      if: false && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
      id: cache-spark
-      uses: actions/cache@v5
+      uses: actions/cache@v4
      with:
        path: spark-3.5.0-bin-hadoop3
        key: spark-3.5.0-hadoop3
@@ -18,7 +18,7 @@ defaults:
 jobs:
  awscli-tests:
    runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 5
    steps:
      - uses: actions/checkout@v6

@@ -103,7 +103,7 @@ jobs:

      - name: Upload server logs on failure
        if: failure()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: seaweedfs-logs
          # Note: actions don't use defaults.run.working-directory, so path is relative to workspace root
@@ -1,114 +0,0 @@
-name: "TUS Protocol Tests"
-
-on:
-  pull_request:
-    paths:
-      - 'weed/server/filer_server_tus*.go'
-      - 'weed/server/filer_server.go'
-      - 'test/tus/**'
-      - '.github/workflows/tus-tests.yml'
-  push:
-    branches: [ master, main ]
-    paths:
-      - 'weed/server/filer_server_tus*.go'
-      - 'weed/server/filer_server.go'
-      - 'test/tus/**'
-
-concurrency:
-  group: ${{ github.head_ref || github.ref }}/tus-tests
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-defaults:
-  run:
-    working-directory: weed
-
-jobs:
-  tus-integration-tests:
-    name: TUS Protocol Integration Tests
-    runs-on: ubuntu-22.04
-    timeout-minutes: 20
-    
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v6
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: 'go.mod'
-        id: go
-
-      - name: Install SeaweedFS
-        run: |
-          go install -buildvcs=false
-
-      - name: Run TUS Integration Tests
-        timeout-minutes: 15
-        working-directory: test/tus
-        run: |
-          set -x
-          echo "=== System Information ==="
-          uname -a
-          free -h
-          df -h
-          echo "=== Starting TUS Tests ==="
-          
-          # Run tests with automatic server management
-          make test-with-server || {
-            echo "TUS integration tests failed, checking logs..."
-            if [ -f /tmp/seaweedfs-tus-filer.log ]; then
-              echo "=== Filer logs ==="
-              tail -100 /tmp/seaweedfs-tus-filer.log
-            fi
-            if [ -f /tmp/seaweedfs-tus-master.log ]; then
-              echo "=== Master logs ==="
-              tail -50 /tmp/seaweedfs-tus-master.log
-            fi
-            if [ -f /tmp/seaweedfs-tus-volume.log ]; then
-              echo "=== Volume logs ==="
-              tail -50 /tmp/seaweedfs-tus-volume.log
-            fi
-            exit 1
-          }
-
-      - name: Show server logs on failure
-        if: failure()
-        working-directory: test/tus
-        run: |
-          echo "=== Filer Server Logs ==="
-          if [ -f /tmp/seaweedfs-tus-filer.log ]; then
-            echo "Last 100 lines of filer logs:"
-            tail -100 /tmp/seaweedfs-tus-filer.log
-          else
-            echo "No filer log file found"
-          fi
-          
-          echo "=== Master Server Logs ==="
-          if [ -f /tmp/seaweedfs-tus-master.log ]; then
-            tail -50 /tmp/seaweedfs-tus-master.log
-          else
-            echo "No master log file found"
-          fi
-          
-          echo "=== Volume Server Logs ==="
-          if [ -f /tmp/seaweedfs-tus-volume.log ]; then
-            tail -50 /tmp/seaweedfs-tus-volume.log
-          else
-            echo "No volume log file found"
-          fi
-          
-          echo "=== Test Environment ==="
-          ps aux | grep -E "(weed|test)" || true
-          netstat -tlnp 2>/dev/null | grep -E "(18888|19333|18080)" || true
-
-      - name: Upload test logs on failure
-        if: failure()
-        uses: actions/upload-artifact@v6
-        with:
-          name: tus-test-logs
-          path: |
-            /tmp/seaweedfs-tus-*.log
-          retention-days: 3
@@ -124,10 +124,3 @@ ADVANCED_IAM_DEVELOPMENT_PLAN.md
 *.log
 weed-iam
 test/kafka/kafka-client-loadtest/weed-linux-arm64
-/test/tus/filerldb2
-coverage.out
-/test/s3/remote_cache/test-primary-data
-/test/s3/remote_cache/test-remote-data
-test/s3/remote_cache/remote-server.pid
-test/s3/remote_cache/primary-server.pid
-/test/erasure_coding/filerldb2
@@ -1,191 +0,0 @@
-# S3 Integration Tests Modernization - Complete Summary
-
-## Overview
-Modernized all S3 integration tests to use **weed mini** - a single optimized binary for simplified testing infrastructure. This eliminates the need to manually manage separate master, volume, and filer server processes.
-
-## Feature Branch
- **Branch**: `feature/modernize-s3-tests`
- **PR**: #7876
- **Status**: ✅ Complete - All changes committed and pushed
-
-## Infrastructure Changes
-
-### 1. Shared Server Management (`test/s3/testutil/server.go`)
-**Purpose**: Centralized server lifecycle management for all test suites
-
-**Key Features**:
- Auto-discovers weed binary at runtime
- Creates isolated test data directory (`/tmp/weed-test-data`)
- Configurable S3 port (default 8333)
- HTTP health check polling for startup verification
- Graceful shutdown with process cleanup
-
-**API**:
-```go
-type ServerConfig struct {
-    DataDir     string
-    S3Port      int
-    AccessKey   string
-    SecretKey   string
-    StartupWait time.Duration
-}
-
-func StartServer(config ServerConfig) (*Server, error)
-func (s *Server) Stop() error
-func (s *Server) WaitForReady() error
-```
-
-**Usage**: All test suites import and use `testutil.StartServer()`
-
-### 2. TestMain Pattern (13 test suites)
-**File**: `test/s3/{suite}/s3_test_main.go`
-
-**Pattern**:
-```go
-package {suite_package}
-
-import (
-    "os"
-    "testing"
-    "github.com/seaweedfs/seaweedfs/test/s3/testutil"
-)
-
-var testServer *testutil.Server
-
-func TestMain(m *testing.M) {
-    // Skip if using external server (CI/CD)
-    if os.Getenv("USE_EXTERNAL_SERVER") == "true" {
-        os.Exit(m.Run())
-    }
-    
-    // Start auto-managed server
-    var err error
-    testServer, err = testutil.StartServer(testutil.ServerConfig{
-        S3Port: 8333,
-        // ... other config
-    })
-    if err != nil {
-        panic(err)
-    }
-    defer testServer.Stop()
-    
-    // Run all tests
-    os.Exit(m.Run())
-}
-```
-
-**Benefits**:
- ✅ Automatic server lifecycle management
- ✅ Backward compatible with external servers (USE_EXTERNAL_SERVER env var)
- ✅ Per-suite isolation
- ✅ No code changes needed in existing tests
-
-## Test Suites Modernized
-
-| Suite | Package | Tests | Status |
-|-------|---------|-------|--------|
-| acl | `acl` | 1 | ✅ |
-| basic | `basic` | 3 | ✅ |
-| copying | `copying_test` | 1 | ✅ |
-| cors | `cors` | 2 | ✅ |
-| delete | `delete` | 1 | ✅ |
-| etag | `s3api` | 1 | ✅ |
-| filer_group | `filer_group` | 1 | ✅ |
-| iam | `iam` | 3 | ✅ |
-| remote_cache | `remote_cache` | 1 | ✅ |
-| retention | `retention` | 7 | ✅ |
-| sse | `sse_test` | 7 | ✅ |
-| tagging | `tagging` | 2 | ✅ |
-| versioning | `s3api` | 9 | ✅ |
-
-**Total**: 13 test suites, 39 test files, all modernized ✅
-
-## Build Status
-All test directories compile successfully:
-```
-✓ test/s3/acl builds
-✓ test/s3/basic builds
-✓ test/s3/copying builds
-✓ test/s3/cors builds
-✓ test/s3/delete builds
-✓ test/s3/etag builds
-✓ test/s3/filer_group builds
-✓ test/s3/iam builds
-✓ test/s3/remote_cache builds
-✓ test/s3/retention builds
-✓ test/s3/sse builds
-✓ test/s3/tagging builds
-✓ test/s3/versioning builds
-```
-
-## Test Execution Modes
-
-### Mode 1: Auto-Managed (Development)
-```bash
-cd test/s3/basic
-go test -v ./...
-```
- Server auto-starts before tests
- Isolated to test directory
- No setup required
-
-### Mode 2: External Server (CI/CD)
-```bash
-# Start weed mini once
-cd /tmp && weed -v=2 server -s3
-
-# Run all tests in any order
-USE_EXTERNAL_SERVER=true go test ./...
-```
- Reusable server for multiple test suites
- Parallel test execution
- CI/CD optimized
-
-## Weed Mini Configuration
-```
-Master:  Port 9333 (default)
-Volume:  Port 8080 (default)
-Filer:   Port 8888 (default)
-S3 API:  Port 8333 (configurable)
-```
-
-## Related Bug Fixes
- Fixed S3 object key normalization (NormalizeObjectKey)
- Fixed directory marker path construction
- Fixed explicit directory handling in GetPrefix
- Fixed S3LIST trailing slash issues
-
-## Files Modified
- `test/s3/testutil/server.go` (183 lines) - New shared utilities
- `test/s3/testutil/server_test.go` (27 lines) - Utilities tests
- `test/s3/{13 suites}/s3_test_main.go` (42 lines each) - TestMain implementations
- `test/s3/versioning/Makefile` (349 → 76 lines) - Simplified
-
-## Next Steps (Optional)
-1. Create simplified Makefiles for other test suites (like versioning)
-2. Add documentation to CONTRIBUTING.md
-3. Integrate with CI/CD pipelines
-4. Run complete test suite to validate at scale
-5. Consider performance benchmarking
-
-## Verified Test Results
-✅ `versioning/TestBucketListReturnDataVersioning` - PASS
-✅ `basic/TestPutObject` - PASS (5.54s)
-✅ `tagging/TestPutObjectTaggingAPI` - PASS (0.31s)
-✅ `cors/TestCorsSimple` - PASS (0.268s)
-
-## Migration Guide for Other Tests
-
-To add weed mini support to any other S3 test suite:
-
-1. Create `s3_test_main.go` with correct package name
-2. Implement TestMain() function
-3. Call `testutil.StartServer()` if `USE_EXTERNAL_SERVER != "true"`
-4. Run tests: `go test -v ./...`
-
-See `test/s3/versioning/s3_test_main.go` as template.
-
---
-**Status**: ✅ Complete and validated
-**Last Updated**: 2024-12-24
-**Branch**: feature/modernize-s3-tests (PR #7876)
@@ -28,7 +28,7 @@ require (
 	github.com/facebookgo/stats v0.0.0-20151006221625-1b76add642e4
 	github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/go-redsync/redsync/v4 v4.15.0
+	github.com/go-redsync/redsync/v4 v4.14.0
 	github.com/go-sql-driver/mysql v1.9.3
 	github.com/go-zookeeper/zk v1.0.3 // indirect
 	github.com/gocql/gocql v1.7.0
@@ -71,7 +71,7 @@ require (
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/seaweedfs/goexif v1.0.3
-	github.com/seaweedfs/raft v1.1.6
+	github.com/seaweedfs/raft v1.1.3
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
@@ -96,14 +96,14 @@ require (
 	gocloud.dev v0.43.0
 	gocloud.dev/pubsub/natspubsub v0.43.0
 	gocloud.dev/pubsub/rabbitpubsub v0.43.0
-	golang.org/x/crypto v0.46.0
+	golang.org/x/crypto v0.45.0
 	golang.org/x/exp v0.0.0-20250811191247-51f88131bc50
-	golang.org/x/image v0.34.0
-	golang.org/x/net v0.48.0
+	golang.org/x/image v0.33.0
+	golang.org/x/net v0.47.0
 	golang.org/x/oauth2 v0.32.0 // indirect
-	golang.org/x/sys v0.39.0
-	golang.org/x/text v0.32.0 // indirect
-	golang.org/x/tools v0.39.0 // indirect
+	golang.org/x/sys v0.38.0
+	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	google.golang.org/api v0.247.0
 	google.golang.org/genproto v0.0.0-20250715232539-7130f93afb79 // indirect
@@ -126,9 +126,9 @@ require (
 	github.com/apple/foundationdb/bindings/go v0.0.0-20250911184653-27f7192f47c3
 	github.com/arangodb/go-driver v1.6.9
 	github.com/armon/go-metrics v0.4.1
-	github.com/aws/aws-sdk-go-v2 v1.41.0
-	github.com/aws/aws-sdk-go-v2/config v1.32.6
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.6
+	github.com/aws/aws-sdk-go-v2 v1.40.1
+	github.com/aws/aws-sdk-go-v2/config v1.31.3
+	github.com/aws/aws-sdk-go-v2/credentials v1.19.3
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.93.0
 	github.com/cognusion/imaging v1.0.2
 	github.com/fluent/fluent-logger-golang v1.10.1
@@ -152,14 +152,14 @@ require (
 	github.com/rabbitmq/amqp091-go v1.10.0
 	github.com/rclone/rclone v1.71.2
 	github.com/rdleal/intervalst v1.5.0
-	github.com/redis/go-redis/v9 v9.17.2
+	github.com/redis/go-redis/v9 v9.14.1
 	github.com/schollz/progressbar/v3 v3.18.0
 	github.com/shirou/gopsutil/v4 v4.25.11
 	github.com/tarantool/go-tarantool/v2 v2.4.1
 	github.com/tikv/client-go/v2 v2.0.7
 	github.com/xeipuuv/gojsonschema v1.2.0
-	github.com/ydb-platform/ydb-go-sdk-auth-environ v0.5.1
-	github.com/ydb-platform/ydb-go-sdk/v3 v3.122.0
+	github.com/ydb-platform/ydb-go-sdk-auth-environ v0.5.0
+	github.com/ydb-platform/ydb-go-sdk/v3 v3.121.0
 	go.etcd.io/etcd/client/pkg/v3 v3.6.6
 	go.uber.org/atomic v1.11.0
 	golang.org/x/sync v0.19.0
@@ -173,7 +173,6 @@ require (
 	cloud.google.com/go/longrunning v0.6.7 // indirect
 	cloud.google.com/go/pubsub/v2 v2.0.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
 	github.com/bazelbuild/rules_go v0.46.0 // indirect
 	github.com/biogo/store v0.0.0-20201120204734-aad293a2328f // indirect
 	github.com/blevesearch/snowballstem v0.9.0 // indirect
@@ -204,8 +203,8 @@ require (
 	github.com/openzipkin/zipkin-go v0.4.3 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/pierrre/geohash v1.0.0 // indirect
-	github.com/quic-go/qpack v0.6.0 // indirect
-	github.com/quic-go/quic-go v0.57.0 // indirect
+	github.com/quic-go/qpack v0.5.1 // indirect
+	github.com/quic-go/quic-go v0.54.1 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
@@ -219,9 +218,10 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
 	go.opentelemetry.io/otel/exporters/zipkin v1.36.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
+	go.uber.org/mock v0.5.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/mod v0.30.0 // indirect
+	golang.org/x/mod v0.29.0 // indirect
 	gonum.org/v1/gonum v0.16.0 // indirect
 )

@@ -261,21 +261,21 @@ require (
 	github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.15 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.15 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.15 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.15 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.15 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.15 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sns v1.34.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sqs v1.38.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.30.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.41.3 // indirect
 	github.com/aws/smithy-go v1.24.0 // indirect
 	github.com/boltdb/bolt v1.3.1 // indirect
 	github.com/bradenaw/juniper v0.15.3 // indirect
@@ -446,7 +446,7 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/arch v0.20.0 // indirect
-	golang.org/x/term v0.38.0 // indirect
+	golang.org/x/term v0.37.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba // indirect
@@ -651,6 +651,8 @@ github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmg
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
 github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
+github.com/apple/foundationdb/bindings/go v0.0.0-20240515141816-262c6fe778ad h1:fQBkhYv86zyW95PWhzBlkgz3NoY1ue0L+8oYBaoCMbg=
+github.com/apple/foundationdb/bindings/go v0.0.0-20240515141816-262c6fe778ad/go.mod h1:OMVSB21p9+xQUIqlGizHPZfjK+SHws1ht+ZytVDoz9U=
 github.com/apple/foundationdb/bindings/go v0.0.0-20250911184653-27f7192f47c3 h1:WZaTKNHCfcw7fWSR6/RKnCldVzvYZC+Y20Su4lffEIg=
 github.com/apple/foundationdb/bindings/go v0.0.0-20250911184653-27f7192f47c3/go.mod h1:OMVSB21p9+xQUIqlGizHPZfjK+SHws1ht+ZytVDoz9U=
 github.com/appscode/go-querystring v0.0.0-20170504095604-0126cfb3f1dc h1:LoL75er+LKDHDUfU5tRvFwxH0LjPpZN8OoG8Ll+liGU=
@@ -665,48 +667,46 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ=
 github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk=
-github.com/aws/aws-sdk-go-v2 v1.41.0 h1:tNvqh1s+v0vFYdA1xq0aOJH+Y5cRyZ5upu6roPgPKd4=
-github.com/aws/aws-sdk-go-v2 v1.41.0/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
+github.com/aws/aws-sdk-go-v2 v1.40.1 h1:difXb4maDZkRH0x//Qkwcfpdg1XQVXEAEs2DdXldFFc=
+github.com/aws/aws-sdk-go-v2 v1.40.1/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaX3CE/Be2uWjiXrkCH6gUX+bZA/BU=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4/go.mod h1:IOAPF6oT9KCsceNTvvYMNHy0+kMF8akOjeDvPENWxp4=
-github.com/aws/aws-sdk-go-v2/config v1.32.6 h1:hFLBGUKjmLAekvi1evLi5hVvFQtSo3GYwi+Bx4lpJf8=
-github.com/aws/aws-sdk-go-v2/config v1.32.6/go.mod h1:lcUL/gcd8WyjCrMnxez5OXkO3/rwcNmvfno62tnXNcI=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.6 h1:F9vWao2TwjV2MyiyVS+duza0NIRtAslgLUM0vTA1ZaE=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.6/go.mod h1:SgHzKjEVsdQr6Opor0ihgWtkWdfRAIwxYzSJ8O85VHY=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 h1:80+uETIWS1BqjnN9uJ0dBUaETh+P1XwFy5vwHwK5r9k=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16/go.mod h1:wOOsYuxYuB/7FlnVtzeBYRcjSRtQpAW0hCP7tIULMwo=
+github.com/aws/aws-sdk-go-v2/config v1.31.3 h1:RIb3yr/+PZ18YYNe6MDiG/3jVoJrPmdoCARwNkMGvco=
+github.com/aws/aws-sdk-go-v2/config v1.31.3/go.mod h1:jjgx1n7x0FAKl6TnakqrpkHWWKcX3xfWtdnIJs5K9CE=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.3 h1:01Ym72hK43hjwDeJUfi1l2oYLXBAOR8gNSZNmXmvuas=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.3/go.mod h1:55nWF/Sr9Zvls0bGnWkRxUdhzKqj9uRNlPvgV1vgxKc=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.15 h1:utxLraaifrSBkeyII9mIbVwXXWrZdlPO7FIKmyLCEcY=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.15/go.mod h1:hW6zjYUDQwfz3icf4g2O41PHi77u10oAzJ84iSzR/lo=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 h1:0SzCLoPRSK3qSydsaFQWugP+lOBCTPwfcBOm6222+UA=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4/go.mod h1:JAet9FsBHjfdI+TnMBX4ModNNaQHAd3dc/Bk+cNsxeM=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 h1:rgGwPzb82iBYSvHMHXc8h9mRoOUBZIGFgKb9qniaZZc=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16/go.mod h1:L/UxsGeKpGoIj6DxfhOWHWQ/kGKcd4I1VncE4++IyKA=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 h1:1jtGzuV7c82xnqOVfx2F0xmJcOw5374L7N6juGW6x6U=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16/go.mod h1:M2E5OQf+XLe+SZGmmpaI2yy+J326aFf6/+54PoxSANc=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.15 h1:Y5YXgygXwDI5P4RkteB5yF7v35neH7LfJKBG+hzIons=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.15/go.mod h1:K+/1EpG42dFSY7CBj+Fruzm8PsCGWTXJ3jdeJ659oGQ=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.15 h1:AvltKnW9ewxX2hFmQS0FyJH93aSvJVUEFvXfU+HWtSE=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.15/go.mod h1:3I4oCdZdmgrREhU74qS1dK9yZ62yumob+58AbFR4cQA=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.15 h1:NLYTEyZmVZo0Qh183sC8nC+ydJXOOeIL/qI/sS3PdLY=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.15/go.mod h1:Z803iB3B0bc8oJV8zH2PERLRfQUJ2n2BXISpsA4+O1M=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 h1:0ryTNEdJbzUCEWkVXEXoqlXV72J5keC1GvILMOuD00E=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4/go.mod h1:HQ4qwNZh32C3CBeO6iJLQlgtMzqeG17ziAA/3KDJFow=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.6 h1:P1MU/SuhadGvg2jtviDXPEejU3jBNhoeeAlRadHzvHI=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.6/go.mod h1:5KYaMG6wmVKMFBSfWoyG/zH8pWwzQFnKgpoSRlXHKdQ=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 h1:oHjJHeUy0ImIV0bsrX0X91GkV5nJAyv1l1CC9lnO0TI=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16/go.mod h1:iRSNGgOYmiYwSCXxXaKb9HfOEj40+oTKn8pTxMlYkRM=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.15 h1:3/u/4yZOffg5jdNk1sDpOQ4Y+R6Xbh+GzpDrSZjuy3U=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.15/go.mod h1:4Zkjq0FKjE78NKjabuM4tRXKFzUJWXgP0ItEZK8l7JU=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.15 h1:wsSQ4SVz5YE1crz0Ap7VBZrV4nNqZt4CIBBT8mnwoNc=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.15/go.mod h1:I7sditnFGtYMIqPRU1QoHZAUrXkGp4SczmlLwrNPlD0=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.93.0 h1:IrbE3B8O9pm3lsg96AXIN5MXX4pECEuExh/A0Du3AuI=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.93.0/go.mod h1:/sJLzHtiiZvs6C1RbxS/anSAFwZD6oC6M/kotQzOiLw=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 h1:HpI7aMmJ+mm1wkSHIA2t5EaFFv5EFYXePW30p1EIrbQ=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.4/go.mod h1:C5RdGMYGlfM0gYq/tifqgn4EbyX99V15P2V3R+VHbQU=
 github.com/aws/aws-sdk-go-v2/service/sns v1.34.7 h1:OBuZE9Wt8h2imuRktu+WfjiTGrnYdCIJg8IX92aalHE=
 github.com/aws/aws-sdk-go-v2/service/sns v1.34.7/go.mod h1:4WYoZAhHt+dWYpoOQUgkUKfuQbE6Gg/hW4oXE0pKS9U=
 github.com/aws/aws-sdk-go-v2/service/sqs v1.38.8 h1:80dpSqWMwx2dAm30Ib7J6ucz1ZHfiv5OCRwN/EnCOXQ=
 github.com/aws/aws-sdk-go-v2/service/sqs v1.38.8/go.mod h1:IzNt/udsXlETCdvBOL0nmyMe2t9cGmXmZgsdoZGYYhI=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 h1:aM/Q24rIlS3bRAhTyFurowU8A0SMyGDtEOY/l/s/1Uw=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.8/go.mod h1:+fWt2UHSb4kS7Pu8y+BMBvJF0EWx+4H0hzNwtDNRTrg=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 h1:AHDr0DaHIAo8c9t1emrzAlVDFp+iMMKnPdYy6XO4MCE=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12/go.mod h1:GQ73XawFFiWxyWXMHWfhiomvP3tXtdNar/fi8z18sx0=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 h1:SciGFVNZ4mHdm7gpD1dgZYnCuVdX1s+lFTg4+4DOy70=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.5/go.mod h1:iW40X4QBmUxdP+fZNOpfmkdMZqsovezbAeO+Ubiv2pk=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.6 h1:8sTTiw+9yuNXcfWeqKF2x01GqCF49CpP4Z9nKrrk/ts=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.6/go.mod h1:8WYg+Y40Sn3X2hioaaWAAIngndR8n1XFdRPPX+7QBaM=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.11 h1:E+KqWoVsSrj1tJ6I/fjDIu5xoS2Zacuu1zT+H7KtiIk=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.11/go.mod h1:qyWHz+4lvkXcr3+PoGlGHEI+3DLLiU6/GdrFfMaAhB0=
+github.com/aws/aws-sdk-go-v2/service/sts v1.41.3 h1:tzMkjh0yTChUqJDgGkcDdxvZDSrJ/WB6R6ymI5ehqJI=
+github.com/aws/aws-sdk-go-v2/service/sts v1.41.3/go.mod h1:T270C0R5sZNLbWUe8ueiAF42XSZxxPocTaGSgs5c/60=
 github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk=
 github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
 github.com/bazelbuild/rules_go v0.46.0 h1:CTefzjN/D3Cdn3rkrM6qMWuQj59OBcuOjyIp3m4hZ7s=
@@ -988,8 +988,8 @@ github.com/go-redis/redis/v7 v7.4.1 h1:PASvf36gyUpr2zdOUS/9Zqc80GbM+9BDyiJSJDDOr
 github.com/go-redis/redis/v7 v7.4.1/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
-github.com/go-redsync/redsync/v4 v4.15.0 h1:KH/XymuxSV7vyKs6z1Cxxj+N+N18JlPxgXeP6x4JY54=
-github.com/go-redsync/redsync/v4 v4.15.0/go.mod h1:qNp+lLs3vkfZbtA/aM/OjlZHfEr5YTAYhRktFPKHC7s=
+github.com/go-redsync/redsync/v4 v4.14.0 h1:zyxzFJsmQHIPBl8iBT7KFKohWsjsghgGLiP8TnFMLNc=
+github.com/go-redsync/redsync/v4 v4.14.0/go.mod h1:twMlVd19upZ/juvJyJGlQOSQxor1oeHtjs62l4pRFzo=
 github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM=
 github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
 github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
@@ -1072,8 +1072,8 @@ github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
 github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gomodule/redigo v1.9.3 h1:dNPSXeXv6HCq2jdyWfjgmhBdqnR6PRO3m/G05nvpPC8=
-github.com/gomodule/redigo v1.9.3/go.mod h1:KsU3hiK/Ay8U42qpaJk+kuNa3C+spxapWpM+ywhcgtw=
+github.com/gomodule/redigo v1.9.2 h1:HrutZBLhSIU8abiSfW8pj8mPhOyMYjZT/wcA4/L9L9s=
+github.com/gomodule/redigo v1.9.2/go.mod h1:KsU3hiK/Ay8U42qpaJk+kuNa3C+spxapWpM+ywhcgtw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
@@ -1565,10 +1565,10 @@ github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4
 github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
 github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8 h1:Y258uzXU/potCYnQd1r6wlAnoMB68BiCkCcCnKx1SH8=
 github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8/go.mod h1:bSJjRokAHHOhA+XFxplld8w2R/dXLH7Z3BZ532vhFwU=
-github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
-github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
-github.com/quic-go/quic-go v0.57.0 h1:AsSSrrMs4qI/hLrKlTH/TGQeTMY0ib1pAOX7vA3AdqE=
-github.com/quic-go/quic-go v0.57.0/go.mod h1:ly4QBAjHA2VhdnxhojRsCUOeJwKYg+taDlos92xb1+s=
+github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
+github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
+github.com/quic-go/quic-go v0.54.1 h1:4ZAWm0AhCb6+hE+l5Q1NAL0iRn/ZrMwqHRGQiFwj2eg=
+github.com/quic-go/quic-go v0.54.1/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY=
 github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw=
 github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
 github.com/rclone/rclone v1.71.2 h1:3Jk5xNPFrZhVABRuN/OPvApuZQddpE2tkhYMuEn1Ud4=
@@ -1577,12 +1577,12 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rdleal/intervalst v1.5.0 h1:SEB9bCFz5IqD1yhfH1Wv8IBnY/JQxDplwkxHjT6hamU=
 github.com/rdleal/intervalst v1.5.0/go.mod h1:xO89Z6BC+LQDH+IPQQw/OESt5UADgFD41tYMUINGpxQ=
-github.com/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4ViluI=
-github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
-github.com/redis/rueidis v1.0.69 h1:WlUefRhuDekji5LsD387ys3UCJtSFeBVf0e5yI0B8b4=
-github.com/redis/rueidis v1.0.69/go.mod h1:Lkhr2QTgcoYBhxARU7kJRO8SyVlgUuEkcJO1Y8MCluA=
-github.com/redis/rueidis/rueidiscompat v1.0.69 h1:IWVYY9lXdjNO3do2VpJT7aDFi8zbCUuQxZB6E2Grahs=
-github.com/redis/rueidis/rueidiscompat v1.0.69/go.mod h1:iC4Y8DoN0Uth0Uezg9e2trvNRC7QAgGeuP2OPLb5ccI=
+github.com/redis/go-redis/v9 v9.14.1 h1:nDCrEiJmfOWhD76xlaw+HXT0c9hfNWeXgl0vIRYSDvQ=
+github.com/redis/go-redis/v9 v9.14.1/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
+github.com/redis/rueidis v1.0.64 h1:XqgbueDuNV3qFdVdQwAHJl1uNt90zUuAJuzqjH4cw6Y=
+github.com/redis/rueidis v1.0.64/go.mod h1:Lkhr2QTgcoYBhxARU7kJRO8SyVlgUuEkcJO1Y8MCluA=
+github.com/redis/rueidis/rueidiscompat v1.0.64 h1:M8JbLP4LyHQhBLBRsUQIzui8/LyTtdESNIMVveqm4RY=
+github.com/redis/rueidis/rueidiscompat v1.0.64/go.mod h1:8pJVPhEjpw0izZFSxYwDziUiEYEkEklTSw/nZzga61M=
 github.com/rekby/fixenv v0.3.2/go.mod h1:/b5LRc06BYJtslRtHKxsPWFT/ySpHV+rWvzTg+XWk4c=
 github.com/rekby/fixenv v0.6.1 h1:jUFiSPpajT4WY2cYuc++7Y1zWrnCxnovGCIX72PZniM=
 github.com/rekby/fixenv v0.6.1/go.mod h1:/b5LRc06BYJtslRtHKxsPWFT/ySpHV+rWvzTg+XWk4c=
@@ -1620,8 +1620,8 @@ github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138 h1:bX
 github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138/go.mod h1:JSKCh6uCHBz91lQYFYHCyTrSVIPge4SUFVn28iwMNB0=
 github.com/seaweedfs/goexif v1.0.3 h1:ve/OjI7dxPW8X9YQsv3JuVMaxEyF9Rvfd04ouL+Bz30=
 github.com/seaweedfs/goexif v1.0.3/go.mod h1:Oni780Z236sXpIQzk1XoJlTwqrJ02smEin9zQeff7Fk=
-github.com/seaweedfs/raft v1.1.6 h1:e83Xn0boscPnuSiBllUPeWRVS6JKrqJPYBozgFyBiC0=
-github.com/seaweedfs/raft v1.1.6/go.mod h1:9cYlEBA+djJbnf/5tWsCybtbL7ICYpi+Uxcg3MxjuNs=
+github.com/seaweedfs/raft v1.1.3 h1:5B6hgneQ7IuU4Ceom/f6QUt8pEeqjcsRo+IxlyPZCws=
+github.com/seaweedfs/raft v1.1.3/go.mod h1:9cYlEBA+djJbnf/5tWsCybtbL7ICYpi+Uxcg3MxjuNs=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
@@ -1779,12 +1779,12 @@ github.com/ydb-platform/ydb-go-genproto v0.0.0-20221215182650-986f9d10542f/go.mo
 github.com/ydb-platform/ydb-go-genproto v0.0.0-20230528143953-42c825ace222/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
 github.com/ydb-platform/ydb-go-genproto v0.0.0-20251125145508-6d7ef87db5cb h1:LZ6dhVfWzhicf/P5Xh7fA0Jd7rfGduxmB2QZpD+Lz9Q=
 github.com/ydb-platform/ydb-go-genproto v0.0.0-20251125145508-6d7ef87db5cb/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
-github.com/ydb-platform/ydb-go-sdk-auth-environ v0.5.1 h1:XaRxeVrOyl3y6v9CiYMWaFdZ6zevvYe+TRxOR8ifa2s=
-github.com/ydb-platform/ydb-go-sdk-auth-environ v0.5.1/go.mod h1:9YzkhlIymWaJGX6KMU3vh5sOf3UKbCXkG/ZdjaI3zNM=
+github.com/ydb-platform/ydb-go-sdk-auth-environ v0.5.0 h1:/NyPd9KnCJgzrEXCArqk1ThqCH2Dh31uUwl88o/VkuM=
+github.com/ydb-platform/ydb-go-sdk-auth-environ v0.5.0/go.mod h1:9YzkhlIymWaJGX6KMU3vh5sOf3UKbCXkG/ZdjaI3zNM=
 github.com/ydb-platform/ydb-go-sdk/v3 v3.44.0/go.mod h1:oSLwnuilwIpaF5bJJMAofnGgzPJusoI3zWMNb8I+GnM=
 github.com/ydb-platform/ydb-go-sdk/v3 v3.47.3/go.mod h1:bWnOIcUHd7+Sl7DN+yhyY1H/I61z53GczvwJgXMgvj0=
-github.com/ydb-platform/ydb-go-sdk/v3 v3.122.0 h1:uvqheUfoEJz0CLLLaYct69wpvoaosM/2joWFcbwoqfw=
-github.com/ydb-platform/ydb-go-sdk/v3 v3.122.0/go.mod h1:/LjMxb/rXmoGAAnImoqAFIlhO5ampHacbvDetQitCk4=
+github.com/ydb-platform/ydb-go-sdk/v3 v3.121.0 h1:Ml4WMsaRY+/+Wh3DCp1A+/zjM1aMdQg3irjuYFwWVHQ=
+github.com/ydb-platform/ydb-go-sdk/v3 v3.121.0/go.mod h1:/LjMxb/rXmoGAAnImoqAFIlhO5ampHacbvDetQitCk4=
 github.com/ydb-platform/ydb-go-yc v0.12.1 h1:qw3Fa+T81+Kpu5Io2vYHJOwcrYrVjgJlT6t/0dOXJrA=
 github.com/ydb-platform/ydb-go-yc v0.12.1/go.mod h1:t/ZA4ECdgPWjAb4jyDe8AzQZB5dhpGbi3iCahFaNwBY=
 github.com/ydb-platform/ydb-go-yc-metadata v0.6.1 h1:9E5q8Nsy2RiJMZDNVy0A3KUrIMBPakJ2VgloeWbcI84=
@@ -1874,8 +1874,8 @@ go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A
 go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
-go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
+go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
+go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
@@ -1919,8 +1919,8 @@ golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1951,8 +1951,8 @@ golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeap
 golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.34.0 h1:33gCkyw9hmwbZJeZkct8XyR11yH889EQt/QH4VmXMn8=
-golang.org/x/image v0.34.0/go.mod h1:2RNFBZRB+vnwwFil8GkMdRvrJOFd1AzdZI6vOY+eJVU=
+golang.org/x/image v0.33.0 h1:LXRZRnv1+zGd5XBUVRFmYEphyyKJjQjCRiOuAP3sZfQ=
+golang.org/x/image v0.33.0/go.mod h1:DD3OsTYT9chzuzTQt+zMcOlBHgfoKQb1gry8p76Y1sc=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1987,8 +1987,8 @@ golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
-golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -2058,8 +2058,8 @@ golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2220,8 +2220,8 @@ golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
-golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -2239,8 +2239,8 @@ golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
-golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
-golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2262,8 +2262,8 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2343,8 +2343,8 @@ golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58
 golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
 golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
-golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
 golang.org/x/tools/godoc v0.1.0-deprecated h1:o+aZ1BOj6Hsx/GBdJO/s815sqftjSnrZZwyYTHODvtk=
 golang.org/x/tools/godoc v0.1.0-deprecated/go.mod h1:qM63CriJ961IHWmnWa9CjZnBndniPt4a3CK0PVB9bIg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1,6 +1,6 @@
 apiVersion: v1
 description: SeaweedFS
 name: seaweedfs
-appVersion: "4.04"
+appVersion: "4.02"
 # Dev note: Trigger a helm chart release by `git tag -a helm-<version>`
-version: 4.0.404
+version: 4.0.402
@@ -1595,101 +1595,6 @@
      "title": "S3 Bucket Traffic Sent",
      "type": "timeseries"
    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "reqps",
-          "unitScale": true
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 0,
-        "y": 41
-      },
-      "id": 86,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "10.3.1",
-      "targets": [
-        {
-          "expr": "sum(rate(SeaweedFS_s3_request_total{namespace=\"$NAMESPACE\"}[$__interval])) by (bucket)",
-          "format": "time_series",
-          "hide": false,
-          "intervalFactor": 2,
-          "legendFormat": "{{bucket}}",
-          "refId": "A"
-        }
-      ],
-      "title": "S3 API Calls per Bucket",
-      "type": "timeseries"
-    },
    {
      "datasource": {
        "type": "prometheus",
@@ -1754,8 +1659,8 @@
      },
      "gridPos": {
        "h": 7,
-        "w": 12,
-        "x": 12,
+        "w": 24,
+        "x": 0,
        "y": 41
      },
      "id": 72,
@@ -3361,209 +3266,6 @@
      ],
      "title": "Filer Go Routines",
      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "decbytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 0,
-        "y": 48
-      },
-      "id": 89,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "10.3.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "editorMode": "code",
-          "expr": "max(SeaweedFS_s3_bucket_size_bytes{namespace=\"$NAMESPACE\"}) by (bucket)",
-          "legendFormat": "{{bucket}} (logical)",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "editorMode": "code",
-          "expr": "max(SeaweedFS_s3_bucket_physical_size_bytes{namespace=\"$NAMESPACE\"}) by (bucket)",
-          "legendFormat": "{{bucket}} (physical)",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "S3 Bucket Size",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 12,
-        "y": 48
-      },
-      "id": 90,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "10.3.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "editorMode": "code",
-          "expr": "max(SeaweedFS_s3_bucket_object_count{namespace=\"$NAMESPACE\"}) by (bucket)",
-          "legendFormat": "{{bucket}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "S3 Bucket Object Count",
-      "type": "timeseries"
    }
  ],
  "refresh": "",
@@ -3654,4 +3356,4 @@
  "uid": "a24009d7-cbda-4443-a132-1cc1c4677304",
  "version": 1,
  "weekStart": ""
-}
+}
@@ -203,9 +203,6 @@ spec:
            - name: client-cert
              readOnly: true
              mountPath: /usr/local/share/ca-certificates/client/
-            - name: admin-cert
-              readOnly: true
-              mountPath: /usr/local/share/ca-certificates/admin/
            {{- end }}
            {{ tpl .Values.admin.extraVolumeMounts . | nindent 12 | trim }}
          ports:
@@ -301,9 +298,6 @@ spec:
        - name: client-cert
          secret:
            secretName: {{ template "seaweedfs.name" . }}-client-cert
-        - name: admin-cert
-          secret:
-            secretName: {{ template "seaweedfs.name" . }}-admin-cert
        {{- end }}
        {{ tpl .Values.admin.extraVolumes . | indent 8 | trim }}
      {{- if .Values.admin.nodeSelector }}
@@ -1,43 +0,0 @@
-{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
-apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
-kind: Certificate
-metadata:
-  name: {{ template "seaweedfs.name" . }}-admin-cert
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/component: admin
-  {{- if .Values.admin.annotations }}
-  annotations:
-    {{- toYaml .Values.admin.annotations | nindent 4 }}
-  {{- end }}
-spec:
-  secretName: {{ template "seaweedfs.name" . }}-admin-cert
-  issuerRef:
-    name: {{ template "seaweedfs.name" . }}-ca-issuer
-    kind: Issuer
-  commonName: {{ .Values.certificates.commonName }}
-  subject:
-    organizations:
-    - "SeaweedFS CA"
-  dnsNames:
-    - '*.{{ template "seaweedfs.name" . }}-admin'
-    - '*.{{ template "seaweedfs.name" . }}-admin.{{ .Release.Namespace }}'
-    - '*.{{ template "seaweedfs.name" . }}-admin.{{ .Release.Namespace }}.svc'
-    - '*.{{ template "seaweedfs.name" . }}-admin.{{ .Release.Namespace }}.svc.cluster.local'
-{{- if .Values.certificates.ipAddresses }}
-  ipAddresses:
-    {{- range .Values.certificates.ipAddresses }}
-    - {{ . }}
-    {{- end }}
-{{- end }}
-  privateKey:
-    algorithm: {{ .Values.certificates.keyAlgorithm }}
-    size: {{ .Values.certificates.keySize }}
-  duration: {{ .Values.certificates.duration }}
-  renewBefore: {{ .Values.certificates.renewBefore }}
-{{- end }}
-
@@ -1,43 +0,0 @@
-{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
-apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
-kind: Certificate
-metadata:
-  name: {{ template "seaweedfs.name" . }}-worker-cert
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/component: worker
-  {{- if .Values.worker.annotations }}
-  annotations:
-    {{- toYaml .Values.worker.annotations | nindent 4 }}
-  {{- end }}
-spec:
-  secretName: {{ template "seaweedfs.name" . }}-worker-cert
-  issuerRef:
-    name: {{ template "seaweedfs.name" . }}-ca-issuer
-    kind: Issuer
-  commonName: {{ .Values.certificates.commonName }}
-  subject:
-    organizations:
-    - "SeaweedFS CA"
-  dnsNames:
-    - '*.{{ template "seaweedfs.name" . }}-worker'
-    - '*.{{ template "seaweedfs.name" . }}-worker.{{ .Release.Namespace }}'
-    - '*.{{ template "seaweedfs.name" . }}-worker.{{ .Release.Namespace }}.svc'
-    - '*.{{ template "seaweedfs.name" . }}-worker.{{ .Release.Namespace }}.svc.cluster.local'
-{{- if .Values.certificates.ipAddresses }}
-  ipAddresses:
-    {{- range .Values.certificates.ipAddresses }}
-    - {{ . }}
-    {{- end }}
-{{- end }}
-  privateKey:
-    algorithm: {{ .Values.certificates.keyAlgorithm }}
-    size: {{ .Values.certificates.keySize }}
-  duration: {{ .Values.certificates.duration }}
-  renewBefore: {{ .Values.certificates.renewBefore }}
-{{- end }}
-
@@ -65,14 +65,6 @@ data:
    cert = "/usr/local/share/ca-certificates/filer/tls.crt"
    key  = "/usr/local/share/ca-certificates/filer/tls.key"

-    [grpc.admin]
-    cert = "/usr/local/share/ca-certificates/admin/tls.crt"
-    key  = "/usr/local/share/ca-certificates/admin/tls.key"
-
-    [grpc.worker]
-    cert = "/usr/local/share/ca-certificates/worker/tls.crt"
-    key  = "/usr/local/share/ca-certificates/worker/tls.key"
-
    # use this for any place needs a grpc client
    # i.e., "weed backup|benchmark|filer.copy|filer.replicate|mount|s3|upload"
    [grpc.client]
@@ -176,9 +176,6 @@ spec:
                {{- if $volume.dataCenter }}
                -dataCenter={{ $volume.dataCenter }} \
                {{- end }}
-                {{- if $volume.id }}
-                -id={{ $volume.id }} \
-                {{- end }}
                -ip.bind={{ $volume.ipBind }} \
                -readMode={{ $volume.readMode }} \
                {{- if $volume.whiteList }}
@@ -134,14 +134,11 @@ spec:
              {{- if .Values.worker.adminServer }}
              -admin={{ .Values.worker.adminServer }} \
              {{- else }}
-              -admin={{ template "seaweedfs.name" . }}-admin.{{ .Release.Namespace }}:{{ .Values.admin.port }} \
+              -admin={{ template "seaweedfs.name" . }}-admin.{{ .Release.Namespace }}:{{ .Values.admin.grpcPort }} \
              {{- end }}
              -capabilities={{ .Values.worker.capabilities }} \
              -maxConcurrent={{ .Values.worker.maxConcurrent }} \
-              -workingDir={{ .Values.worker.workingDir }}{{- if or .Values.worker.metricsPort .Values.worker.extraArgs }} \{{ end }}
-              {{- if .Values.worker.metricsPort }}
-              -metricsPort={{ .Values.worker.metricsPort }}{{- if .Values.worker.extraArgs }} \{{ end }}
-              {{- end }}
+              -workingDir={{ .Values.worker.workingDir }}{{- if .Values.worker.extraArgs }} \{{ end }}
              {{- range $index, $arg := .Values.worker.extraArgs }}
              {{ $arg }}{{- if lt $index (sub (len $.Values.worker.extraArgs) 1) }} \{{ end }}
              {{- end }}
@@ -174,9 +171,6 @@ spec:
            - name: client-cert
              readOnly: true
              mountPath: /usr/local/share/ca-certificates/client/
-            - name: worker-cert
-              readOnly: true
-              mountPath: /usr/local/share/ca-certificates/worker/
            {{- end }}
            {{ tpl .Values.worker.extraVolumeMounts . | nindent 12 | trim }}
          ports:
@@ -190,13 +184,9 @@ spec:
          {{- end }}
          {{- if .Values.worker.livenessProbe.enabled }}
          livenessProbe:
-            {{- if .Values.worker.livenessProbe.httpGet }}
-            httpGet:
-              path: {{ .Values.worker.livenessProbe.httpGet.path }}
-              port: {{ .Values.worker.livenessProbe.httpGet.port }}
-            {{- else if .Values.worker.livenessProbe.tcpSocket }}
+            {{- with .Values.worker.livenessProbe.tcpSocket }}
            tcpSocket:
-              port: {{ .Values.worker.livenessProbe.tcpSocket.port }}
+              port: {{ .port }}
            {{- end }}
            initialDelaySeconds: {{ .Values.worker.livenessProbe.initialDelaySeconds }}
            periodSeconds: {{ .Values.worker.livenessProbe.periodSeconds }}
@@ -206,13 +196,9 @@ spec:
          {{- end }}
          {{- if .Values.worker.readinessProbe.enabled }}
          readinessProbe:
-            {{- if .Values.worker.readinessProbe.httpGet }}
-            httpGet:
-              path: {{ .Values.worker.readinessProbe.httpGet.path }}
-              port: {{ .Values.worker.readinessProbe.httpGet.port }}
-            {{- else if .Values.worker.readinessProbe.tcpSocket }}
+            {{- with .Values.worker.readinessProbe.tcpSocket }}
            tcpSocket:
-              port: {{ .Values.worker.readinessProbe.tcpSocket.port }}
+              port: {{ .port }}
            {{- end }}
            initialDelaySeconds: {{ .Values.worker.readinessProbe.initialDelaySeconds }}
            periodSeconds: {{ .Values.worker.readinessProbe.periodSeconds }}
@@ -276,9 +262,6 @@ spec:
        - name: client-cert
          secret:
            secretName: {{ template "seaweedfs.name" . }}-client-cert
-        - name: worker-cert
-          secret:
-            secretName: {{ template "seaweedfs.name" . }}-worker-cert
        {{- end }}
        {{ tpl .Values.worker.extraVolumes . | indent 8 | trim }}
      {{- if .Values.worker.nodeSelector }}
@@ -401,10 +401,6 @@ volume:
  # Volume server's rack name
  rack: null

-  # Stable identifier for the volume server, independent of IP address
-  # Useful for Kubernetes environments with hostPath volumes to maintain stable identity
-  id: null
-
  # Volume server's data center name
  dataCenter: null

@@ -1306,11 +1302,10 @@ worker:
  extraEnvironmentVars: {}

  # Health checks for worker pods
-  # Workers expose metrics on the metricsPort with a /health endpoint for readiness checks.
+  # Since workers do not have an HTTP endpoint, a tcpSocket probe on the metrics port is recommended.
  livenessProbe:
    enabled: true
-    httpGet:
-      path: /health
+    tcpSocket:
      port: metrics
    initialDelaySeconds: 30
    periodSeconds: 60
@@ -1320,8 +1315,7 @@ worker:

  readinessProbe:
    enabled: true
-    httpGet:
-      path: /health
+    tcpSocket:
      port: metrics
    initialDelaySeconds: 20
    periodSeconds: 15
@@ -1,110 +0,0 @@
-# SeaweedFS S3 Java SDK Compatibility Tests
-
-This project contains Java-based integration tests for SeaweedFS S3 API compatibility.
-
-## Overview
-
-Tests are provided for both AWS SDK v1 and v2 to ensure compatibility with the various SDK versions commonly used in production.
-
-## SDK Versions
-
-| SDK | Version | Notes |
-|-----|---------|-------|
-| AWS SDK v1 for Java | 1.12.600 | Legacy SDK, less strict ETag validation |
-| AWS SDK v2 for Java | 2.20.127 | Modern SDK with strict checksum validation |
-
-## Running Tests
-
-### Prerequisites
-
-1. SeaweedFS running with S3 API enabled:
-   ```bash
-   weed server -s3
-   ```
-
-2. Java 18+ and Maven
-
-### Run All Tests
-
-```bash
-mvn test
-```
-
-### Run Specific Tests
-
-```bash
-# Run only ETag validation tests (AWS SDK v2)
-mvn test -Dtest=ETagValidationTest
-
-# Run with custom endpoint
-mvn test -Dtest=ETagValidationTest -DS3_ENDPOINT=http://localhost:8333
-```
-
-### Environment Variables
-
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `S3_ENDPOINT` | `http://127.0.0.1:8333` | S3 API endpoint URL |
-| `S3_ACCESS_KEY` | `some_access_key1` | Access key ID |
-| `S3_SECRET_KEY` | `some_secret_key1` | Secret access key |
-| `S3_REGION` | `us-east-1` | AWS region |
-
-## Test Coverage
-
-### ETagValidationTest (AWS SDK v2)
-
-Tests for [GitHub Issue #7768](https://github.com/seaweedfs/seaweedfs/issues/7768) - ETag format validation.
-
-| Test | Description |
-|------|-------------|
-| `testSmallFilePutObject` | Verify small files return pure MD5 ETag |
-| `testLargeFilePutObject_Issue7768` | **Critical**: Verify large files (>8MB) return pure MD5 ETag |
-| `testExtraLargeFilePutObject` | Verify very large files (>24MB) return pure MD5 ETag |
-| `testMultipartUploadETag` | Verify multipart uploads return composite ETag |
-| `testETagConsistency` | Verify ETag consistency across PUT/HEAD/GET |
-| `testMultipleLargeFileUploads` | Stress test multiple large uploads |
-
-### Background: Issue #7768
-
-AWS SDK v2 for Java includes checksum validation that decodes the ETag as hexadecimal. When SeaweedFS returned composite ETags (`<md5>-<count>`) for regular `PutObject` with internally auto-chunked files, the SDK failed with:
-
-```
-java.lang.IllegalArgumentException: Invalid base 16 character: '-'
-```
-
-**Per AWS S3 specification:**
- `PutObject`: ETag is always a pure MD5 hex string (32 chars)
- `CompleteMultipartUpload`: ETag is composite format (`<md5>-<partcount>`)
-
-The fix ensures SeaweedFS follows this specification.
-
-## Project Structure
-
-```
-src/
-├── main/java/com/seaweedfs/s3/
-│   ├── PutObject.java           # Example PutObject with SDK v1
-│   └── HighLevelMultipartUpload.java
-└── test/java/com/seaweedfs/s3/
-    ├── PutObjectTest.java       # Basic SDK v1 test
-    └── ETagValidationTest.java  # Comprehensive SDK v2 ETag tests
-```
-
-## Validated SDK Versions
-
-This Java test project validates:
-
- ✅ AWS SDK v2 for Java 2.20.127+
- ✅ AWS SDK v1 for Java 1.12.600+
-
-Go SDK validation is performed by separate test suites:
- See [Go ETag Tests](/test/s3/etag/) for AWS SDK v2 for Go tests
- See [test/s3/SDK_COMPATIBILITY.md](/test/s3/SDK_COMPATIBILITY.md) for full SDK compatibility matrix
-
-## Related
-
- [GitHub Issue #7768](https://github.com/seaweedfs/seaweedfs/issues/7768)
- [AWS S3 ETag Documentation](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Object.html)
- [Go ETag Tests](/test/s3/etag/)
- [SDK Compatibility Matrix](/test/s3/SDK_COMPATIBILITY.md)
-
@@ -6,29 +6,18 @@
  <packaging>jar</packaging>
  <version>1.0-SNAPSHOT</version>
  <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <aws.sdk.v1.version>1.12.600</aws.sdk.v1.version>
-    <aws.sdk.v2.version>2.20.127</aws.sdk.v2.version>
+    <maven.compiler.source>18</maven.compiler.source>
+    <maven.compiler.target>18</maven.compiler.target>
  </properties>
  <name>copier</name>
  <url>http://maven.apache.org</url>

  <dependencyManagement>
    <dependencies>
-      <!-- AWS SDK v1 BOM -->
      <dependency>
        <groupId>com.amazonaws</groupId>
        <artifactId>aws-java-sdk-bom</artifactId>
-        <version>${aws.sdk.v1.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <!-- AWS SDK v2 BOM -->
-      <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>bom</artifactId>
-        <version>${aws.sdk.v2.version}</version>
+        <version>1.11.327</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
@@ -36,50 +25,15 @@
  </dependencyManagement>

  <dependencies>
-    <!-- AWS SDK v1 (for backward compatibility with existing code) -->
    <dependency>
      <groupId>com.amazonaws</groupId>
      <artifactId>aws-java-sdk-s3</artifactId>
    </dependency>
-    
-    <!-- AWS SDK v2 (for modern tests with checksum validation) -->
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>s3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>s3-transfer-manager</artifactId>
-    </dependency>
-    
-    <!-- Test dependencies -->
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <version>5.10.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>3.24.2</version>
+      <version>4.13.1</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.2.2</version>
-      </plugin>
-    </plugins>
-  </build>
 </project>
@@ -1,439 +0,0 @@
-package com.seaweedfs.s3;
-
-import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.core.sync.RequestBody;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.*;
-
-import java.net.URI;
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.regex.Pattern;
-
-import static org.assertj.core.api.Assertions.*;
-
-/**
- * AWS SDK v2 Integration Tests for S3 ETag Format Validation.
- * 
- * These tests verify that SeaweedFS returns correct ETag formats that are
- * compatible with AWS SDK v2's checksum validation.
- * 
- * Background (GitHub Issue #7768):
- * AWS SDK v2 for Java validates ETags as hexadecimal MD5 hashes for PutObject
- * responses. If the ETag contains non-hex characters (like '-' in composite
- * format), the SDK fails with "Invalid base 16 character: '-'".
- * 
- * Per AWS S3 specification:
- * - Regular PutObject: ETag is always a pure MD5 hex string (32 chars)
- * - CompleteMultipartUpload: ETag is composite format "<md5>-<partcount>"
- * 
- * To run these tests:
- *   mvn test -Dtest=ETagValidationTest -DS3_ENDPOINT=http://localhost:8333
- * 
- * Or set environment variable:
- *   export S3_ENDPOINT=http://localhost:8333
- *   mvn test -Dtest=ETagValidationTest
- */
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@DisplayName("S3 ETag Format Validation Tests (AWS SDK v2)")
-class ETagValidationTest {
-
-    // Configuration - can be overridden via system properties or environment variables
-    private static final String DEFAULT_ENDPOINT = "http://127.0.0.1:8333";
-    private static final String DEFAULT_ACCESS_KEY = "some_access_key1";
-    private static final String DEFAULT_SECRET_KEY = "some_secret_key1";
-    private static final String DEFAULT_REGION = "us-east-1";
-    
-    // Auto-chunking threshold in SeaweedFS (must match s3api_object_handlers_put.go)
-    private static final int AUTO_CHUNK_SIZE = 8 * 1024 * 1024; // 8MB
-    
-    // Test sizes
-    private static final int SMALL_FILE_SIZE = 1024; // 1KB
-    private static final int LARGE_FILE_SIZE = 10 * 1024 * 1024; // 10MB (triggers auto-chunking)
-    private static final int XL_FILE_SIZE = 25 * 1024 * 1024; // 25MB (multiple chunks)
-    private static final int MULTIPART_PART_SIZE = 5 * 1024 * 1024; // 5MB per part
-    
-    // ETag format patterns
-    private static final Pattern PURE_MD5_PATTERN = Pattern.compile("^\"?[a-f0-9]{32}\"?$");
-    private static final Pattern COMPOSITE_PATTERN = Pattern.compile("^\"?[a-f0-9]{32}-\\d+\"?$");
-    
-    private S3Client s3Client;
-    private String testBucketName;
-    private final SecureRandom random = new SecureRandom();
-
-    @BeforeAll
-    void setUp() {
-        String endpoint = getConfig("S3_ENDPOINT", DEFAULT_ENDPOINT);
-        String accessKey = getConfig("S3_ACCESS_KEY", DEFAULT_ACCESS_KEY);
-        String secretKey = getConfig("S3_SECRET_KEY", DEFAULT_SECRET_KEY);
-        String region = getConfig("S3_REGION", DEFAULT_REGION);
-        
-        System.out.println("Connecting to S3 endpoint: " + endpoint);
-        
-        s3Client = S3Client.builder()
-                .endpointOverride(URI.create(endpoint))
-                .credentialsProvider(StaticCredentialsProvider.create(
-                        AwsBasicCredentials.create(accessKey, secretKey)))
-                .region(Region.of(region))
-                .forcePathStyle(true) // Required for SeaweedFS
-                .build();
-        
-        // Create test bucket
-        testBucketName = "test-etag-" + UUID.randomUUID().toString().substring(0, 8);
-        s3Client.createBucket(CreateBucketRequest.builder()
-                .bucket(testBucketName)
-                .build());
-        
-        System.out.println("Created test bucket: " + testBucketName);
-    }
-
-    @AfterAll
-    void tearDown() {
-        if (s3Client != null && testBucketName != null) {
-            try {
-                // Delete all objects with pagination
-                String continuationToken = null;
-                do {
-                    ListObjectsV2Response listResp = s3Client.listObjectsV2(
-                            ListObjectsV2Request.builder()
-                                    .bucket(testBucketName)
-                                    .continuationToken(continuationToken)
-                                    .build());
-                    for (S3Object obj : listResp.contents()) {
-                        s3Client.deleteObject(DeleteObjectRequest.builder()
-                                .bucket(testBucketName)
-                                .key(obj.key())
-                                .build());
-                    }
-                    continuationToken = listResp.nextContinuationToken();
-                } while (continuationToken != null);
-                
-                // Abort any multipart uploads
-                ListMultipartUploadsResponse mpResp = s3Client.listMultipartUploads(
-                        ListMultipartUploadsRequest.builder().bucket(testBucketName).build());
-                for (MultipartUpload upload : mpResp.uploads()) {
-                    s3Client.abortMultipartUpload(AbortMultipartUploadRequest.builder()
-                            .bucket(testBucketName)
-                            .key(upload.key())
-                            .uploadId(upload.uploadId())
-                            .build());
-                }
-                
-                // Delete bucket
-                s3Client.deleteBucket(DeleteBucketRequest.builder()
-                        .bucket(testBucketName)
-                        .build());
-                
-                System.out.println("Cleaned up test bucket: " + testBucketName);
-            } catch (Exception e) {
-                System.err.println("Warning: Failed to cleanup test bucket: " + e.getMessage());
-            }
-            s3Client.close();
-        }
-    }
-
-    @Test
-    @DisplayName("Small file PutObject should return pure MD5 ETag")
-    void testSmallFilePutObject() throws Exception {
-        byte[] testData = generateRandomData(SMALL_FILE_SIZE);
-        String expectedMD5 = calculateMD5Hex(testData);
-        String objectKey = "small-file-" + UUID.randomUUID() + ".bin";
-        
-        PutObjectResponse response = s3Client.putObject(
-                PutObjectRequest.builder()
-                        .bucket(testBucketName)
-                        .key(objectKey)
-                        .build(),
-                RequestBody.fromBytes(testData));
-        
-        String etag = response.eTag();
-        System.out.println("Small file ETag: " + etag + " (expected MD5: " + expectedMD5 + ")");
-        
-        assertThat(etag)
-                .describedAs("Small file ETag should be pure MD5")
-                .matches(PURE_MD5_PATTERN);
-        assertThat(cleanETag(etag))
-                .describedAs("ETag should match calculated MD5")
-                .isEqualTo(expectedMD5);
-        assertThat(etag)
-                .describedAs("ETag should not contain hyphen")
-                .doesNotContain("-");
-    }
-
-    /**
-     * Critical test for GitHub Issue #7768.
-     * 
-     * This test uploads a file larger than the auto-chunking threshold (8MB),
-     * which triggers SeaweedFS to split the file into multiple internal chunks.
-     * 
-     * Previously, this caused SeaweedFS to return a composite ETag like
-     * "d41d8cd98f00b204e9800998ecf8427e-2", which AWS SDK v2 rejected because
-     * it validates the ETag as hexadecimal and '-' is not a valid hex character.
-     * 
-     * The fix ensures that regular PutObject always returns a pure MD5 ETag,
-     * regardless of internal chunking.
-     */
-    @Test
-    @DisplayName("Large file PutObject (>8MB) should return pure MD5 ETag - Issue #7768")
-    void testLargeFilePutObject_Issue7768() throws Exception {
-        byte[] testData = generateRandomData(LARGE_FILE_SIZE);
-        String expectedMD5 = calculateMD5Hex(testData);
-        String objectKey = "large-file-" + UUID.randomUUID() + ".bin";
-        
-        System.out.println("Uploading large file (" + LARGE_FILE_SIZE + " bytes, " +
-                "> " + AUTO_CHUNK_SIZE + " byte auto-chunk threshold)...");
-        
-        // This is where Issue #7768 would manifest - SDK v2 validates ETag
-        PutObjectResponse response = s3Client.putObject(
-                PutObjectRequest.builder()
-                        .bucket(testBucketName)
-                        .key(objectKey)
-                        .build(),
-                RequestBody.fromBytes(testData));
-        
-        String etag = response.eTag();
-        int expectedChunks = (LARGE_FILE_SIZE / AUTO_CHUNK_SIZE) + 1;
-        System.out.println("Large file ETag: " + etag + 
-                " (expected MD5: " + expectedMD5 + ", internal chunks: ~" + expectedChunks + ")");
-        
-        // These assertions would fail before the fix
-        assertThat(etag)
-                .describedAs("Large file PutObject ETag MUST be pure MD5 (not composite)")
-                .matches(PURE_MD5_PATTERN);
-        assertThat(etag)
-                .describedAs("Large file ETag should NOT be composite format")
-                .doesNotMatch(COMPOSITE_PATTERN);
-        assertThat(etag)
-                .describedAs("ETag should not contain hyphen for regular PutObject")
-                .doesNotContain("-");
-        assertThat(cleanETag(etag))
-                .describedAs("ETag should match calculated MD5")
-                .isEqualTo(expectedMD5);
-        
-        // Verify hex decoding works (this is what fails in Issue #7768)
-        assertThatCode(() -> hexToBytes(cleanETag(etag)))
-                .describedAs("ETag should be valid hexadecimal (AWS SDK v2 validation)")
-                .doesNotThrowAnyException();
-    }
-
-    @Test
-    @DisplayName("Extra large file PutObject (>24MB) should return pure MD5 ETag")
-    void testExtraLargeFilePutObject() throws Exception {
-        byte[] testData = generateRandomData(XL_FILE_SIZE);
-        String expectedMD5 = calculateMD5Hex(testData);
-        String objectKey = "xl-file-" + UUID.randomUUID() + ".bin";
-        
-        int expectedChunks = (XL_FILE_SIZE / AUTO_CHUNK_SIZE) + 1;
-        System.out.println("Uploading XL file (" + XL_FILE_SIZE + " bytes, ~" + 
-                expectedChunks + " internal chunks)...");
-        
-        PutObjectResponse response = s3Client.putObject(
-                PutObjectRequest.builder()
-                        .bucket(testBucketName)
-                        .key(objectKey)
-                        .build(),
-                RequestBody.fromBytes(testData));
-        
-        String etag = response.eTag();
-        System.out.println("XL file ETag: " + etag);
-        
-        assertThat(etag)
-                .describedAs("XL file PutObject ETag MUST be pure MD5")
-                .matches(PURE_MD5_PATTERN);
-        assertThat(cleanETag(etag))
-                .describedAs("ETag should match calculated MD5")
-                .isEqualTo(expectedMD5);
-    }
-
-    @Test
-    @DisplayName("Multipart upload should return composite ETag")
-    void testMultipartUploadETag() throws Exception {
-        int totalSize = 15 * 1024 * 1024; // 15MB = 3 parts
-        byte[] testData = generateRandomData(totalSize);
-        String objectKey = "multipart-file-" + UUID.randomUUID() + ".bin";
-        
-        System.out.println("Performing multipart upload (" + totalSize + " bytes)...");
-        
-        // Initiate multipart upload
-        CreateMultipartUploadResponse createResp = s3Client.createMultipartUpload(
-                CreateMultipartUploadRequest.builder()
-                        .bucket(testBucketName)
-                        .key(objectKey)
-                        .build());
-        String uploadId = createResp.uploadId();
-        
-        List<CompletedPart> completedParts = new ArrayList<>();
-        int partNumber = 1;
-        
-        // Upload parts
-        for (int offset = 0; offset < totalSize; offset += MULTIPART_PART_SIZE) {
-            int end = Math.min(offset + MULTIPART_PART_SIZE, totalSize);
-            byte[] partData = new byte[end - offset];
-            System.arraycopy(testData, offset, partData, 0, partData.length);
-            
-            UploadPartResponse uploadResp = s3Client.uploadPart(
-                    UploadPartRequest.builder()
-                            .bucket(testBucketName)
-                            .key(objectKey)
-                            .uploadId(uploadId)
-                            .partNumber(partNumber)
-                            .build(),
-                    RequestBody.fromBytes(partData));
-            
-            completedParts.add(CompletedPart.builder()
-                    .partNumber(partNumber)
-                    .eTag(uploadResp.eTag())
-                    .build());
-            partNumber++;
-        }
-        
-        // Complete multipart upload
-        CompleteMultipartUploadResponse completeResp = s3Client.completeMultipartUpload(
-                CompleteMultipartUploadRequest.builder()
-                        .bucket(testBucketName)
-                        .key(objectKey)
-                        .uploadId(uploadId)
-                        .multipartUpload(CompletedMultipartUpload.builder()
-                                .parts(completedParts)
-                                .build())
-                        .build());
-        
-        String etag = completeResp.eTag();
-        System.out.println("Multipart upload ETag: " + etag + " (" + completedParts.size() + " parts)");
-        
-        // Multipart uploads SHOULD have composite ETag
-        assertThat(etag)
-                .describedAs("Multipart upload ETag SHOULD be composite format")
-                .matches(COMPOSITE_PATTERN);
-        assertThat(etag)
-                .describedAs("Multipart ETag should contain hyphen")
-                .contains("-");
-        
-        // Verify part count in ETag
-        String[] parts = cleanETag(etag).split("-");
-        assertThat(parts).hasSize(2);
-        assertThat(parts[1])
-                .describedAs("Part count in ETag should match uploaded parts")
-                .isEqualTo(String.valueOf(completedParts.size()));
-    }
-
-    @Test
-    @DisplayName("ETag should be consistent across PUT, HEAD, and GET")
-    void testETagConsistency() throws Exception {
-        byte[] testData = generateRandomData(LARGE_FILE_SIZE);
-        String objectKey = "consistency-test-" + UUID.randomUUID() + ".bin";
-        
-        // PUT
-        PutObjectResponse putResp = s3Client.putObject(
-                PutObjectRequest.builder()
-                        .bucket(testBucketName)
-                        .key(objectKey)
-                        .build(),
-                RequestBody.fromBytes(testData));
-        String putETag = putResp.eTag();
-        
-        // HEAD
-        HeadObjectResponse headResp = s3Client.headObject(
-                HeadObjectRequest.builder()
-                        .bucket(testBucketName)
-                        .key(objectKey)
-                        .build());
-        String headETag = headResp.eTag();
-        
-        // GET
-        GetObjectResponse getResp = s3Client.getObject(
-                GetObjectRequest.builder()
-                        .bucket(testBucketName)
-                        .key(objectKey)
-                        .build())
-                .response();
-        String getETag = getResp.eTag();
-        
-        System.out.println("PUT ETag: " + putETag + ", HEAD ETag: " + headETag + ", GET ETag: " + getETag);
-        
-        assertThat(putETag).isEqualTo(headETag);
-        assertThat(putETag).isEqualTo(getETag);
-    }
-
-    @Test
-    @DisplayName("Multiple large file uploads should all return pure MD5 ETags")
-    void testMultipleLargeFileUploads() throws Exception {
-        int numFiles = 3;
-        
-        for (int i = 0; i < numFiles; i++) {
-            byte[] testData = generateRandomData(LARGE_FILE_SIZE);
-            String expectedMD5 = calculateMD5Hex(testData);
-            String objectKey = "multi-large-" + i + "-" + UUID.randomUUID() + ".bin";
-            
-            PutObjectResponse response = s3Client.putObject(
-                    PutObjectRequest.builder()
-                            .bucket(testBucketName)
-                            .key(objectKey)
-                            .build(),
-                    RequestBody.fromBytes(testData));
-            
-            String etag = response.eTag();
-            System.out.println("File " + i + " ETag: " + etag);
-            
-            assertThat(etag)
-                    .describedAs("File " + i + " ETag should be pure MD5")
-                    .matches(PURE_MD5_PATTERN);
-            assertThat(cleanETag(etag))
-                    .describedAs("File " + i + " ETag should match MD5")
-                    .isEqualTo(expectedMD5);
-            
-            // Validate hex decoding
-            assertThatCode(() -> hexToBytes(cleanETag(etag)))
-                    .doesNotThrowAnyException();
-        }
-    }
-
-    // Helper methods
-    
-    private String getConfig(String key, String defaultValue) {
-        String value = System.getProperty(key);
-        if (value == null) {
-            value = System.getenv(key);
-        }
-        return value != null ? value : defaultValue;
-    }
-    
-    private byte[] generateRandomData(int size) {
-        byte[] data = new byte[size];
-        random.nextBytes(data);
-        return data;
-    }
-    
-    private String calculateMD5Hex(byte[] data) throws Exception {
-        MessageDigest md = MessageDigest.getInstance("MD5");
-        byte[] digest = md.digest(data);
-        StringBuilder sb = new StringBuilder();
-        for (byte b : digest) {
-            sb.append(String.format("%02x", b));
-        }
-        return sb.toString();
-    }
-    
-    private String cleanETag(String etag) {
-        if (etag == null) return null;
-        return etag.replace("\"", "");
-    }
-    
-    private byte[] hexToBytes(String hex) {
-        int len = hex.length();
-        byte[] data = new byte[len / 2];
-        for (int i = 0; i < len; i += 2) {
-            data[i / 2] = (byte) ((Character.digit(hex.charAt(i), 16) << 4)
-                    + Character.digit(hex.charAt(i + 1), 16));
-        }
-        return data;
-    }
-}
-
@@ -1319,99 +1319,6 @@
        "alignLevel": null
      }
    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "fill": 1,
-      "fillGradient": 0,
-      "fieldConfig": {
-        "defaults": {
-          "unit": "reqps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 0,
-        "y": 16
-      },
-      "hiddenSeries": false,
-      "id": 90,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "8.1.2",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum(rate(SeaweedFS_s3_request_total[$__interval])) by (bucket)",
-          "format": "time_series",
-          "hide": false,
-          "intervalFactor": 2,
-          "legendFormat": "{{bucket}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "S3 API Calls per Bucket",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "reqps",
-          "logBase": 1,
-          "min": 0,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
    {
      "aliasColors": {},
      "bars": false,
@@ -1425,8 +1332,8 @@
      "grid": {},
      "gridPos": {
        "h": 7,
-        "w": 12,
-        "x": 12,
+        "w": 24,
+        "x": 0,
        "y": 16
      },
      "hiddenSeries": false,
@@ -3053,200 +2960,6 @@
        "align": false,
        "alignLevel": null
      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "fill": 1,
-      "fillGradient": 0,
-      "fieldConfig": {
-        "defaults": {
-          "unit": "decbytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 0,
-        "y": 37
-      },
-      "hiddenSeries": false,
-      "id": 87,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null as zero",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "8.1.2",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "max(SeaweedFS_s3_bucket_size_bytes) by (bucket)",
-          "format": "time_series",
-          "hide": false,
-          "intervalFactor": 2,
-          "legendFormat": "{{bucket}} (logical)",
-          "refId": "A"
-        },
-        {
-          "expr": "max(SeaweedFS_s3_bucket_physical_size_bytes) by (bucket)",
-          "format": "time_series",
-          "hide": false,
-          "intervalFactor": 2,
-          "legendFormat": "{{bucket}} (physical)",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "S3 Bucket Size",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "decbytes",
-          "logBase": 1,
-          "min": 0,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "fill": 1,
-      "fillGradient": 0,
-      "fieldConfig": {
-        "defaults": {
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 12,
-        "y": 37
-      },
-      "hiddenSeries": false,
-      "id": 88,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null as zero",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "8.1.2",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "max(SeaweedFS_s3_bucket_object_count) by (bucket)",
-          "format": "time_series",
-          "hide": false,
-          "intervalFactor": 2,
-          "legendFormat": "{{bucket}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "S3 Bucket Object Count",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "min": 0,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
    }
  ],
  "refresh": "30s",
@@ -875,85 +875,6 @@
            }
          ]
        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
-          "datasource": "${DS_PROMETHEUS-DEV}",
-          "fill": 1,
-          "fillGradient": 0,
-          "gridPos": {
-            "h": 7,
-            "w": 12,
-            "x": 0,
-            "y": 16
-          },
-          "hiddenSeries": false,
-          "id": 86,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "nullPointMode": "null",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "spaceLength": 10,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "expr": "sum(rate(SeaweedFS_s3_request_total[$__interval])) by (bucket)",
-              "format": "time_series",
-              "hide": false,
-              "intervalFactor": 2,
-              "legendFormat": "{{bucket}}",
-              "refId": "A"
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "S3 API Calls per Bucket",
-          "tooltip": {
-            "msResolution": true,
-            "shared": true,
-            "sort": 0,
-            "value_type": "cumulative"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "format": "reqps",
-              "logBase": 1,
-              "min": 0,
-              "show": true
-            },
-            {
-              "format": "short",
-              "logBase": 1,
-              "show": false
-            }
-          ]
-        },
        {
          "aliasColors": {},
          "bars": false,
@@ -1166,202 +1087,6 @@
              "show": false
            }
          ]
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
-          "datasource": "${DS_PROMETHEUS}",
-          "fill": 1,
-          "fillGradient": 0,
-          "fieldConfig": {
-            "defaults": {
-              "unit": "decbytes"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 7,
-            "w": 12,
-            "x": 0,
-            "y": 37
-          },
-          "hiddenSeries": false,
-          "id": 87,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "nullPointMode": "null as zero",
-          "options": {
-            "alertThreshold": true
-          },
-          "percentage": false,
-          "pluginVersion": "8.1.2",
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "spaceLength": 10,
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "expr": "max(SeaweedFS_s3_bucket_size_bytes) by (bucket)",
-              "format": "time_series",
-              "hide": false,
-              "intervalFactor": 2,
-              "legendFormat": "{{bucket}} (logical)",
-              "refId": "A"
-            },
-            {
-              "expr": "max(SeaweedFS_s3_bucket_physical_size_bytes) by (bucket)",
-              "format": "time_series",
-              "hide": false,
-              "intervalFactor": 2,
-              "legendFormat": "{{bucket}} (physical)",
-              "refId": "B"
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeRegions": [],
-          "timeShift": null,
-          "title": "S3 Bucket Size",
-          "tooltip": {
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "format": "decbytes",
-              "logBase": 1,
-              "min": 0,
-              "show": true
-            },
-            {
-              "format": "short",
-              "logBase": 1,
-              "show": false
-            }
-          ],
-          "yaxis": {
-            "align": false,
-            "alignLevel": null
-          }
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
-          "datasource": "${DS_PROMETHEUS}",
-          "fill": 1,
-          "fillGradient": 0,
-          "fieldConfig": {
-            "defaults": {
-              "unit": "short"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 7,
-            "w": 12,
-            "x": 12,
-            "y": 37
-          },
-          "hiddenSeries": false,
-          "id": 88,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "nullPointMode": "null as zero",
-          "options": {
-            "alertThreshold": true
-          },
-          "percentage": false,
-          "pluginVersion": "8.1.2",
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "spaceLength": 10,
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "expr": "max(SeaweedFS_s3_bucket_object_count) by (bucket)",
-              "format": "time_series",
-              "hide": false,
-              "intervalFactor": 2,
-              "legendFormat": "{{bucket}}",
-              "refId": "A"
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeRegions": [],
-          "timeShift": null,
-          "title": "S3 Bucket Object Count",
-          "tooltip": {
-            "shared": true,
-            "sort": 0,
-            "value_type": "individual"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "format": "short",
-              "logBase": 1,
-              "min": 0,
-              "show": true
-            },
-            {
-              "format": "short",
-              "logBase": 1,
-              "show": false
-            }
-          ],
-          "yaxis": {
-            "align": false,
-            "alignLevel": null
-          }
        }
      ],
      "repeat": null,
@@ -2386,4 +2111,4 @@
  "timezone": "browser",
  "title": "SeaweedFS ks8 heartbeat",
  "version": 1
-}
+}
@@ -447,99 +447,6 @@
        "alignLevel": null
      }
    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$DS_PROMETHEUS",
-      "fill": 1,
-      "fillGradient": 0,
-      "fieldConfig": {
-        "defaults": {
-          "unit": "reqps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 6,
-        "x": 0,
-        "y": 15
-      },
-      "hiddenSeries": false,
-      "id": 86,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "8.1.2",
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum(rate(SeaweedFS_s3_request_total{namespace=\"$namespace\",service=~\"$service-api\"}[$__interval])) by (bucket)",
-          "format": "time_series",
-          "hide": false,
-          "intervalFactor": 2,
-          "legendFormat": "{{bucket}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "S3 API Calls per Bucket",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "reqps",
-          "logBase": 1,
-          "min": 0,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
    {
      "aliasColors": {},
      "bars": false,
@@ -559,8 +466,8 @@
      "grid": {},
      "gridPos": {
        "h": 7,
-        "w": 6,
-        "x": 12,
+        "w": 8,
+        "x": 0,
        "y": 15
      },
      "hiddenSeries": false,
@@ -670,8 +577,8 @@
      "grid": {},
      "gridPos": {
        "h": 7,
-        "w": 6,
-        "x": 6,
+        "w": 8,
+        "x": 8,
        "y": 15
      },
      "hiddenSeries": false,
@@ -781,8 +688,8 @@
      "grid": {},
      "gridPos": {
        "h": 7,
-        "w": 6,
-        "x": 18,
+        "w": 8,
+        "x": 16,
        "y": 15
      },
      "hiddenSeries": false,
@@ -2447,209 +2354,6 @@
        "align": false,
        "alignLevel": null
      }
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "decbytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 0,
-        "y": 41
-      },
-      "id": 89,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "10.3.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "editorMode": "code",
-          "expr": "max(SeaweedFS_s3_bucket_size_bytes{namespace=\"$NAMESPACE\"}) by (bucket)",
-          "legendFormat": "{{bucket}} (logical)",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "editorMode": "code",
-          "expr": "max(SeaweedFS_s3_bucket_physical_size_bytes{namespace=\"$NAMESPACE\"}) by (bucket)",
-          "legendFormat": "{{bucket}} (physical)",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "S3 Bucket Size",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 12,
-        "y": 41
-      },
-      "id": 90,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "10.3.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "editorMode": "code",
-          "expr": "max(SeaweedFS_s3_bucket_object_count{namespace=\"$NAMESPACE\"}) by (bucket)",
-          "legendFormat": "{{bucket}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "S3 Bucket Object Count",
-      "type": "timeseries"
    }
  ],
  "refresh": "30s",
@@ -2841,4 +2545,4 @@
  "timezone": "browser",
  "title": "SeaweedFS",
  "version": 2
-}
+}
@@ -1,187 +0,0 @@
-# Makefile for EC integration testing
-# Usage:
-#   make start      - Start the test cluster (master + 6 volume servers + filer)
-#   make stop       - Stop the test cluster
-#   make populate   - Populate test data (~300MB across 7 volumes)
-#   make shell      - Open weed shell connected to the test cluster
-#   make clean      - Stop cluster and remove all test data
-#   make setup      - Start cluster and populate data (one command)
-#
-# Requirements: curl, jq
-
-WEED_BINARY := $(shell pwd)/../../weed/weed
-TEST_DIR := /tmp/ec_manual_test
-# Use non-standard ports to avoid conflicts with existing SeaweedFS servers
-MASTER_PORT := 29333
-FILER_PORT := 28888
-VOLUME_BASE_PORT := 28080
-NUM_VOLUME_SERVERS := 6
-VOLUME_SIZE_LIMIT_MB := 30
-MAX_VOLUMES_PER_SERVER := 10
-
-# Build weed binary if it doesn't exist
-$(WEED_BINARY):
-	cd ../../weed && go build -o weed .
-
-.PHONY: build
-build: $(WEED_BINARY)
-
-.PHONY: start
-start: build
-	@echo "=== Starting SeaweedFS test cluster ==="
-	@mkdir -p $(TEST_DIR)/master $(TEST_DIR)/filer
-	@for i in $$(seq 0 $$(($(NUM_VOLUME_SERVERS)-1))); do mkdir -p $(TEST_DIR)/volume$$i; done
-	@# Create security.toml with JWT disabled
-	@echo "# Disable JWT for testing" > $(TEST_DIR)/security.toml
-	@echo '[jwt.signing]' >> $(TEST_DIR)/security.toml
-	@echo 'key = ""' >> $(TEST_DIR)/security.toml
-	@echo 'expires_after_seconds = 0' >> $(TEST_DIR)/security.toml
-	@echo '' >> $(TEST_DIR)/security.toml
-	@echo '[jwt.signing.read]' >> $(TEST_DIR)/security.toml
-	@echo 'key = ""' >> $(TEST_DIR)/security.toml
-	@echo 'expires_after_seconds = 0' >> $(TEST_DIR)/security.toml
-	@# Create filer.toml with leveldb2
-	@echo '[leveldb2]' > $(TEST_DIR)/filer.toml
-	@echo 'enabled = true' >> $(TEST_DIR)/filer.toml
-	@echo 'dir = "$(TEST_DIR)/filer/filerldb2"' >> $(TEST_DIR)/filer.toml
-	@# Start master
-	@echo "Starting master on port $(MASTER_PORT)..."
-	@cd $(TEST_DIR) && $(WEED_BINARY) master \
-		-port=$(MASTER_PORT) \
-		-mdir=$(TEST_DIR)/master \
-		-volumeSizeLimitMB=$(VOLUME_SIZE_LIMIT_MB) \
-		-ip=127.0.0.1 \
-		> $(TEST_DIR)/master/master.log 2>&1 & echo $$! > $(TEST_DIR)/master.pid
-	@sleep 3
-	@# Start volume servers (run from TEST_DIR to find security.toml)
-	@for i in $$(seq 0 $$(($(NUM_VOLUME_SERVERS)-1))); do \
-		port=$$(($(VOLUME_BASE_PORT) + $$i)); \
-		echo "Starting volume server $$i on port $$port (rack$$i)..."; \
-		cd $(TEST_DIR) && $(WEED_BINARY) volume \
-			-port=$$port \
-			-dir=$(TEST_DIR)/volume$$i \
-			-max=$(MAX_VOLUMES_PER_SERVER) \
-			-master=127.0.0.1:$(MASTER_PORT) \
-			-ip=127.0.0.1 \
-			-dataCenter=dc1 \
-			-rack=rack$$i \
-			> $(TEST_DIR)/volume$$i/volume.log 2>&1 & echo $$! > $(TEST_DIR)/volume$$i.pid; \
-	done
-	@sleep 3
-	@# Start filer (run from TEST_DIR to find security.toml)
-	@echo "Starting filer on port $(FILER_PORT)..."
-	@cd $(TEST_DIR) && $(WEED_BINARY) filer \
-		-port=$(FILER_PORT) \
-		-master=127.0.0.1:$(MASTER_PORT) \
-		-ip=127.0.0.1 \
-		> $(TEST_DIR)/filer/filer.log 2>&1 & echo $$! > $(TEST_DIR)/filer.pid
-	@sleep 3
-	@echo ""
-	@echo "=== Cluster started ==="
-	@echo "Master: http://127.0.0.1:$(MASTER_PORT)"
-	@echo "Filer:  http://127.0.0.1:$(FILER_PORT)"
-	@echo "Volume servers: http://127.0.0.1:$(VOLUME_BASE_PORT) - http://127.0.0.1:$$(($(VOLUME_BASE_PORT) + $(NUM_VOLUME_SERVERS) - 1))"
-	@echo ""
-	@echo "Run 'make shell' to open weed shell"
-	@echo "Run 'make populate' to add test data"
-
-.PHONY: stop
-stop:
-	@echo "=== Stopping SeaweedFS test cluster ==="
-	@# Stop filer by PID
-	@-[ -f $(TEST_DIR)/filer.pid ] && kill $$(cat $(TEST_DIR)/filer.pid) 2>/dev/null && rm -f $(TEST_DIR)/filer.pid || true
-	@# Stop volume servers by PID
-	@for i in $$(seq 0 $$(($(NUM_VOLUME_SERVERS)-1))); do \
-		[ -f $(TEST_DIR)/volume$$i.pid ] && kill $$(cat $(TEST_DIR)/volume$$i.pid) 2>/dev/null && rm -f $(TEST_DIR)/volume$$i.pid || true; \
-	done
-	@# Stop master by PID
-	@-[ -f $(TEST_DIR)/master.pid ] && kill $$(cat $(TEST_DIR)/master.pid) 2>/dev/null && rm -f $(TEST_DIR)/master.pid || true
-	@# Fallback: use pkill with specific patterns to ensure cleanup
-	@-pkill -f "weed filer.*-master=127.0.0.1:$(MASTER_PORT)" 2>/dev/null || true
-	@-pkill -f "weed volume.*-dir=$(TEST_DIR)/volume" 2>/dev/null || true
-	@-pkill -f "weed master.*-mdir=$(TEST_DIR)/master" 2>/dev/null || true
-	@echo "Cluster stopped."
-
-.PHONY: clean
-clean: stop
-	@echo "Removing test data..."
-	@rm -rf $(TEST_DIR)
-	@echo "Clean complete."
-
-.PHONY: populate
-populate:
-	@echo "=== Populating test data (~300MB) ==="
-	@# Create a 500KB test file template using mktemp for isolation
-	@tmpfile=$$(mktemp) && \
-	dd if=/dev/urandom bs=1024 count=500 of=$$tmpfile 2>/dev/null && \
-	uploaded=0; \
-	for i in $$(seq 1 600); do \
-		response=$$(curl -s "http://127.0.0.1:$(MASTER_PORT)/dir/assign?collection=ectest&replication=000"); \
-		fid=$$(echo $$response | jq -r '.fid'); \
-		url=$$(echo $$response | jq -r '.url'); \
-		if [ "$$fid" != "null" ] && [ -n "$$fid" ]; then \
-			curl -s -F "file=@$$tmpfile;filename=file_$$i.bin" "http://$$url/$$fid" > /dev/null; \
-			uploaded=$$((uploaded + 1)); \
-		fi; \
-		if [ $$((i % 100)) -eq 0 ]; then \
-			echo "Uploaded $$uploaded files..."; \
-		fi; \
-	done; \
-	rm -f $$tmpfile; \
-	echo ""; \
-	echo "=== Data population complete ==="; \
-	echo "Uploaded $$uploaded files (~$$((uploaded * 500 / 1024))MB)"
-	@echo ""
-	@echo "Volume status:"
-	@curl -s "http://127.0.0.1:$(MASTER_PORT)/vol/status" | jq -r \
-		'.Volumes.DataCenters.dc1 | to_entries[] | .key as $$rack | .value | to_entries[] | select(.value != null) | .key as $$server | .value[] | select(.Collection == "ectest") | "  Volume \(.Id): \(.FileCount) files, \((.Size/1048576*10|floor)/10)MB - \($$rack)"' 2>/dev/null || true
-
-.PHONY: shell
-shell: build
-	@echo "Opening weed shell..."
-	@echo "Commands to try:"
-	@echo "  lock"
-	@echo "  volume.list"
-	@echo "  ec.encode -collection=ectest -quietFor=1s -force"
-	@echo "  ec.balance -collection=ectest"
-	@echo "  unlock"
-	@echo ""
-	@$(WEED_BINARY) shell -master=127.0.0.1:$(MASTER_PORT) -filer=127.0.0.1:$(FILER_PORT)
-
-.PHONY: setup
-setup: clean start
-	@sleep 2
-	@$(MAKE) populate
-
-.PHONY: status
-status:
-	@echo "=== Cluster Status ==="
-	@curl -s "http://127.0.0.1:$(MASTER_PORT)/vol/status" | jq -r \
-		'.Volumes.DataCenters.dc1 | to_entries[] | .key as $$rack | .value | to_entries[] | select(.value != null) | .key as $$server | .value[] | select(.Collection == "ectest") | "Volume \(.Id): \(.FileCount) files, \((.Size/1048576*10|floor)/10)MB - \($$rack) (\($$server))"' 2>/dev/null | sort -t: -k1 -n || echo "Cluster not running"
-	@echo ""
-	@echo "=== EC Shards ==="
-	@for i in $$(seq 0 $$(($(NUM_VOLUME_SERVERS)-1))); do \
-		count=$$(ls $(TEST_DIR)/volume$$i/*.ec[0-9]* 2>/dev/null | wc -l | tr -d ' '); \
-		if [ "$$count" != "0" ]; then \
-			echo "  volume$$i (port $$(($(VOLUME_BASE_PORT) + $$i))): $$count EC shard files"; \
-		fi; \
-	done
-
-.PHONY: help
-help:
-	@echo "EC Integration Test Makefile"
-	@echo ""
-	@echo "Targets:"
-	@echo "  make start     - Start test cluster (master + 6 volume servers + filer)"
-	@echo "  make stop      - Stop test cluster"
-	@echo "  make populate  - Populate ~300MB of test data"
-	@echo "  make shell     - Open weed shell"
-	@echo "  make setup     - Clean, start, and populate (all-in-one)"
-	@echo "  make status    - Show cluster and EC shard status"
-	@echo "  make clean     - Stop cluster and remove all test data"
-	@echo "  make help      - Show this help"
-	@echo ""
-	@echo "Quick start:"
-	@echo "  make setup     # Start cluster and populate data"
-	@echo "  make shell     # Open shell to run EC commands"
-
@@ -78,43 +78,6 @@ go test -v -run TestECEncodingMasterTimingRaceCondition
 go test -v -short
 ```

-## Manual Testing with Makefile
-
-A Makefile is provided for manual EC testing.
-
-**Requirements:** `curl`, `jq` (command-line JSON processor)
-
-```bash
-# Quick start: start cluster and populate data
-make setup
-
-# Open weed shell to run EC commands
-make shell
-
-# Individual targets
-make start      # Start test cluster (master + 6 volume servers + filer)
-make stop       # Stop test cluster
-make populate   # Populate ~300MB of test data
-make status     # Show cluster and EC shard status
-make clean      # Stop cluster and remove all test data
-make help       # Show all targets
-```
-
-### EC Rebalance Limited Slots (Unit Test)
-
-The "no free ec shard slots" issue is tested with a **unit test** that works directly on
-topology data structures without requiring a running cluster.
-
-**Location**: `weed/shell/ec_rebalance_slots_test.go`
-
-Tests included:
- `TestECRebalanceWithLimitedSlots`: Tests a topology with 6 servers, 7 EC volumes (98 shards)
- `TestECRebalanceZeroFreeSlots`: Reproduces the exact 0 free slots scenario
-
-**Known Issue**: When volume servers are at capacity (`volumeCount == maxVolumeCount`),
-the rebalance step fails with "no free ec shard slots" instead of recognizing that
-moving shards frees slots on source servers.
-
 ## Test Results

 **With the fix**: Shows "Collecting volume locations for N volumes before EC encoding..." message
@@ -15,10 +15,8 @@ import (

 	"github.com/seaweedfs/seaweedfs/weed/operation"
 	"github.com/seaweedfs/seaweedfs/weed/pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
 	"github.com/seaweedfs/seaweedfs/weed/shell"
 	"github.com/seaweedfs/seaweedfs/weed/storage/needle"
-	"github.com/seaweedfs/seaweedfs/weed/wdclient"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
@@ -98,12 +96,13 @@ func TestECEncodingVolumeLocationTimingBug(t *testing.T) {
 		// This simulates the race condition where EC encoding updates master metadata
 		// but volume location collection happens after that update

-		// Try to get lock with timeout to avoid hanging
-		locked, unlock := tryLockWithTimeout(t, commandEnv, 30*time.Second)
-		if !locked {
-			t.Skip("Could not acquire lock within timeout - master may not be ready")
+		// First acquire the lock (required for EC encode)
+		lockCmd := shell.Commands[findCommandIndex("lock")]
+		var lockOutput bytes.Buffer
+		err = lockCmd.Do([]string{}, commandEnv, &lockOutput)
+		if err != nil {
+			t.Logf("Lock command failed: %v", err)
 		}
-		defer unlock()

 		// Execute EC encoding - test the timing directly
 		var encodeOutput bytes.Buffer
@@ -388,7 +387,7 @@ func startSeaweedFSCluster(ctx context.Context, dataDir string) (*TestCluster, e
 	// Find weed binary
 	weedBinary := findWeedBinary()
 	if weedBinary == "" {
-		return nil, fmt.Errorf("weed binary not found - build with 'go build' or 'make' first")
+		return nil, fmt.Errorf("weed binary not found")
 	}

 	cluster := &TestCluster{}
@@ -397,11 +396,6 @@ func startSeaweedFSCluster(ctx context.Context, dataDir string) (*TestCluster, e
 	masterDir := filepath.Join(dataDir, "master")
 	os.MkdirAll(masterDir, 0755)

-	// Create an empty security.toml to disable JWT authentication in tests
-	// This prevents the test from picking up ~/.seaweedfs/security.toml
-	securityToml := filepath.Join(dataDir, "security.toml")
-	os.WriteFile(securityToml, []byte("# Empty security config for testing\n"), 0644)
-
 	// Start master server
 	masterCmd := exec.CommandContext(ctx, weedBinary, "master",
 		"-port", "9333",
@@ -410,7 +404,6 @@ func startSeaweedFSCluster(ctx context.Context, dataDir string) (*TestCluster, e
 		"-ip", "127.0.0.1",
 		"-peers", "none", // Faster startup when no multiple masters needed
 	)
-	masterCmd.Dir = dataDir // Run from test dir so it picks up our security.toml

 	masterLogFile, err := os.Create(filepath.Join(masterDir, "master.log"))
 	if err != nil {
@@ -443,7 +436,6 @@ func startSeaweedFSCluster(ctx context.Context, dataDir string) (*TestCluster, e
 			"-dataCenter", "dc1",
 			"-rack", rack,
 		)
-		volumeCmd.Dir = dataDir // Run from test dir so it picks up our security.toml

 		volumeLogFile, err := os.Create(filepath.Join(volumeDir, "volume.log"))
 		if err != nil {
@@ -478,10 +470,6 @@ func findWeedBinary() string {

 	for _, candidate := range candidates {
 		if _, err := os.Stat(candidate); err == nil {
-			// Convert to absolute path so it works when command's Dir is changed
-			if absPath, err := filepath.Abs(candidate); err == nil {
-				return absPath
-			}
 			return candidate
 		}
 	}
@@ -663,55 +651,6 @@ type commandRunner interface {
 	Do([]string, *shell.CommandEnv, io.Writer) error
 }

-// tryLockWithTimeout attempts to acquire the shell lock with a timeout.
-// Returns true if lock was acquired, false if timeout or error occurred.
-// If lock was acquired, the caller must call the returned unlock function.
-func tryLockWithTimeout(t *testing.T, commandEnv *shell.CommandEnv, timeout time.Duration) (locked bool, unlock func()) {
-	t.Helper()
-
-	type lockResult struct {
-		err    error
-		output string
-	}
-
-	lockDone := make(chan lockResult, 1)
-	go func() {
-		lockCmd := shell.Commands[findCommandIndex("lock")]
-		var lockOutput bytes.Buffer
-		err := lockCmd.Do([]string{}, commandEnv, &lockOutput)
-		lockDone <- lockResult{err: err, output: lockOutput.String()}
-	}()
-
-	select {
-	case res := <-lockDone:
-		if res.err != nil {
-			t.Logf("lock command failed: %v, output: %s", res.err, res.output)
-			return false, nil
-		}
-		unlockCmd := shell.Commands[findCommandIndex("unlock")]
-		return true, func() {
-			var unlockOutput bytes.Buffer
-			_ = unlockCmd.Do([]string{}, commandEnv, &unlockOutput)
-		}
-	case <-time.After(timeout):
-		t.Logf("timed out acquiring lock after %s", timeout)
-		return false, nil
-	}
-}
-
-// connectToMasterAndSync connects the command environment to the master and waits for sync.
-// This helper reduces code duplication across test functions.
-func connectToMasterAndSync(ctx context.Context, t *testing.T, commandEnv *shell.CommandEnv) {
-	t.Helper()
-	// Connect to master - use the main test context to avoid early disconnection
-	go commandEnv.MasterClient.KeepConnectedToMaster(ctx)
-	commandEnv.MasterClient.WaitUntilConnected(ctx)
-
-	// Wait for master client to fully sync
-	t.Log("Waiting for master client to sync...")
-	time.Sleep(5 * time.Second)
-}
-
 // captureCommandOutput executes a shell command and captures its output from both
 // stdout/stderr and the command's buffer. This reduces code duplication in tests.
 func captureCommandOutput(t *testing.T, cmd commandRunner, args []string, commandEnv *shell.CommandEnv) (output string, err error) {
@@ -722,16 +661,17 @@ func captureCommandOutput(t *testing.T, cmd commandRunner, args []string, comman
 	r, w, pipeErr := os.Pipe()
 	require.NoError(t, pipeErr)

+	defer func() {
+		_ = w.Close()
+		os.Stdout = oldStdout
+		os.Stderr = oldStderr
+	}()
+
 	os.Stdout = w
 	os.Stderr = w

 	cmdErr := cmd.Do(args, commandEnv, &outBuf)

-	// Close write end BEFORE reading to signal EOF to the reader
-	_ = w.Close()
-	os.Stdout = oldStdout
-	os.Stderr = oldStderr
-
 	capturedOutput, readErr := io.ReadAll(r)
 	_ = r.Close()
 	require.NoError(t, readErr)
@@ -813,7 +753,12 @@ func TestDiskAwareECRebalancing(t *testing.T) {
 	}
 	commandEnv := shell.NewCommandEnv(options)

-	connectToMasterAndSync(ctx, t, commandEnv)
+	// Connect to master - use the main test context to avoid early disconnection
+	go commandEnv.MasterClient.KeepConnectedToMaster(ctx)
+	commandEnv.MasterClient.WaitUntilConnected(ctx)
+
+	// Wait for master client to fully sync
+	time.Sleep(5 * time.Second)

 	// Upload test data to create a volume - retry if volumes not ready
 	var volumeId needle.VolumeId
@@ -1247,7 +1192,12 @@ func TestECDiskTypeSupport(t *testing.T) {
 	}
 	commandEnv := shell.NewCommandEnv(options)

-	connectToMasterAndSync(ctx, t, commandEnv)
+	// Connect to master - use the main test context to avoid early disconnection
+	go commandEnv.MasterClient.KeepConnectedToMaster(ctx)
+	commandEnv.MasterClient.WaitUntilConnected(ctx)
+
+	// Wait for master client to fully sync
+	time.Sleep(5 * time.Second)

 	// Upload test data to create a volume - retry if volumes not ready
 	var volumeId needle.VolumeId
@@ -1274,12 +1224,19 @@ func TestECDiskTypeSupport(t *testing.T) {
 	})

 	t.Run("ec_encode_with_ssd_disktype", func(t *testing.T) {
-		// Try to get lock with timeout to avoid hanging
-		locked, unlock := tryLockWithTimeout(t, commandEnv, 30*time.Second)
-		if !locked {
-			t.Skip("Could not acquire lock within timeout - master may not be ready")
+		// Get lock first
+		lockCmd := shell.Commands[findCommandIndex("lock")]
+		var lockOutput bytes.Buffer
+		err := lockCmd.Do([]string{}, commandEnv, &lockOutput)
+		if err != nil {
+			t.Logf("Lock command failed: %v", err)
+			return
 		}
-		defer unlock()
+
+		// Defer unlock to ensure it's always released
+		unlockCmd := shell.Commands[findCommandIndex("unlock")]
+		var unlockOutput bytes.Buffer
+		defer unlockCmd.Do([]string{}, commandEnv, &unlockOutput)

 		// Execute EC encoding with SSD disk type
 		ecEncodeCmd := shell.Commands[findCommandIndex("ec.encode")]
@@ -1309,12 +1266,19 @@ func TestECDiskTypeSupport(t *testing.T) {
 	})

 	t.Run("ec_balance_with_ssd_disktype", func(t *testing.T) {
-		// Try to get lock with timeout to avoid hanging
-		locked, unlock := tryLockWithTimeout(t, commandEnv, 30*time.Second)
-		if !locked {
-			t.Skip("Could not acquire lock within timeout - master may not be ready")
+		// Get lock first
+		lockCmd := shell.Commands[findCommandIndex("lock")]
+		var lockOutput bytes.Buffer
+		err := lockCmd.Do([]string{}, commandEnv, &lockOutput)
+		if err != nil {
+			t.Logf("Lock command failed: %v", err)
+			return
 		}
-		defer unlock()
+
+		// Defer unlock to ensure it's always released
+		unlockCmd := shell.Commands[findCommandIndex("unlock")]
+		var unlockOutput bytes.Buffer
+		defer unlockCmd.Do([]string{}, commandEnv, &unlockOutput)

 		// Execute EC balance with SSD disk type
 		ecBalanceCmd := shell.Commands[findCommandIndex("ec.balance")]
@@ -1357,12 +1321,19 @@ func TestECDiskTypeSupport(t *testing.T) {
 	})

 	t.Run("ec_encode_with_source_disktype", func(t *testing.T) {
-		// Try to get lock with timeout to avoid hanging
-		locked, unlock := tryLockWithTimeout(t, commandEnv, 30*time.Second)
-		if !locked {
-			t.Skip("Could not acquire lock within timeout - master may not be ready")
+		// Test that -sourceDiskType flag is accepted
+		lockCmd := shell.Commands[findCommandIndex("lock")]
+		var lockOutput bytes.Buffer
+		err := lockCmd.Do([]string{}, commandEnv, &lockOutput)
+		if err != nil {
+			t.Logf("Lock command failed: %v", err)
+			return
 		}
-		defer unlock()
+
+		// Defer unlock to ensure it's always released
+		unlockCmd := shell.Commands[findCommandIndex("unlock")]
+		var unlockOutput bytes.Buffer
+		defer unlockCmd.Do([]string{}, commandEnv, &unlockOutput)

 		// Execute EC encoding with sourceDiskType filter
 		ecEncodeCmd := shell.Commands[findCommandIndex("ec.encode")]
@@ -1391,12 +1362,19 @@ func TestECDiskTypeSupport(t *testing.T) {
 	})

 	t.Run("ec_decode_with_disktype", func(t *testing.T) {
-		// Try to get lock with timeout to avoid hanging
-		locked, unlock := tryLockWithTimeout(t, commandEnv, 30*time.Second)
-		if !locked {
-			t.Skip("Could not acquire lock within timeout - master may not be ready")
+		// Test that ec.decode accepts -diskType flag
+		lockCmd := shell.Commands[findCommandIndex("lock")]
+		var lockOutput bytes.Buffer
+		err := lockCmd.Do([]string{}, commandEnv, &lockOutput)
+		if err != nil {
+			t.Logf("Lock command failed: %v", err)
+			return
 		}
-		defer unlock()
+
+		// Defer unlock to ensure it's always released
+		unlockCmd := shell.Commands[findCommandIndex("unlock")]
+		var unlockOutput bytes.Buffer
+		defer unlockCmd.Do([]string{}, commandEnv, &unlockOutput)

 		// Execute EC decode with disk type
 		ecDecodeCmd := shell.Commands[findCommandIndex("ec.decode")]
@@ -1442,7 +1420,6 @@ func startClusterWithDiskType(ctx context.Context, dataDir string, diskType stri
 		"-mdir", masterDir,
 		"-volumeSizeLimitMB", "10",
 		"-ip", "127.0.0.1",
-		"-peers", "none",
 	)

 	masterLogFile, err := os.Create(filepath.Join(masterDir, "master.log"))
@@ -1588,7 +1565,12 @@ func TestECDiskTypeMixedCluster(t *testing.T) {
 	}
 	commandEnv := shell.NewCommandEnv(options)

-	connectToMasterAndSync(ctx, t, commandEnv)
+	// Connect to master - use the main test context to avoid early disconnection
+	go commandEnv.MasterClient.KeepConnectedToMaster(ctx)
+	commandEnv.MasterClient.WaitUntilConnected(ctx)
+
+	// Wait for master client to fully sync
+	time.Sleep(5 * time.Second)

 	t.Run("upload_to_ssd_and_hdd", func(t *testing.T) {
 		// Upload to SSD
@@ -1623,12 +1605,19 @@ func TestECDiskTypeMixedCluster(t *testing.T) {
 	})

 	t.Run("ec_balance_targets_correct_disk_type", func(t *testing.T) {
-		// Try to get lock with timeout to avoid hanging
-		locked, unlock := tryLockWithTimeout(t, commandEnv, 30*time.Second)
-		if !locked {
-			t.Skip("Could not acquire lock within timeout - master may not be ready")
+		// Get lock first
+		lockCmd := shell.Commands[findCommandIndex("lock")]
+		var lockOutput bytes.Buffer
+		err := lockCmd.Do([]string{}, commandEnv, &lockOutput)
+		if err != nil {
+			t.Logf("Lock command failed: %v", err)
+			return
 		}
-		defer unlock()
+
+		// Defer unlock to ensure it's always released
+		unlockCmd := shell.Commands[findCommandIndex("unlock")]
+		var unlockOutput bytes.Buffer
+		defer unlockCmd.Do([]string{}, commandEnv, &unlockOutput)

 		// Run ec.balance for SSD collection with -diskType=ssd
 		var ssdOutput bytes.Buffer
@@ -1674,7 +1663,6 @@ func startMixedDiskTypeCluster(ctx context.Context, dataDir string) (*MultiDiskC
 		"-mdir", masterDir,
 		"-volumeSizeLimitMB", "10",
 		"-ip", "127.0.0.1",
-		"-peers", "none",
 	)

 	masterLogFile, err := os.Create(filepath.Join(masterDir, "master.log"))
@@ -1776,7 +1764,11 @@ func TestEvacuationFallbackBehavior(t *testing.T) {
 	}
 	commandEnv := shell.NewCommandEnv(options)

-	connectToMasterAndSync(ctx, t, commandEnv)
+	// Connect to master - use the main test context to avoid early disconnection
+	go commandEnv.MasterClient.KeepConnectedToMaster(ctx)
+	commandEnv.MasterClient.WaitUntilConnected(ctx)
+
+	time.Sleep(5 * time.Second)

 	t.Run("fallback_when_same_disktype_full", func(t *testing.T) {
 		// This test verifies that when evacuating SSD EC shards from a server,
@@ -1801,12 +1793,18 @@ func TestEvacuationFallbackBehavior(t *testing.T) {

 		time.Sleep(3 * time.Second)

-		// Try to get lock with timeout to avoid hanging
-		locked, unlock := tryLockWithTimeout(t, commandEnv, 30*time.Second)
-		if !locked {
-			t.Skip("Could not acquire lock within timeout - master may not be ready")
+		// Get lock
+		lockCmd := shell.Commands[findCommandIndex("lock")]
+		var lockOutput bytes.Buffer
+		err := lockCmd.Do([]string{}, commandEnv, &lockOutput)
+		if err != nil {
+			t.Logf("Lock command failed: %v", err)
+			return
 		}
-		defer unlock()
+
+		unlockCmd := shell.Commands[findCommandIndex("unlock")]
+		var unlockOutput bytes.Buffer
+		defer unlockCmd.Do([]string{}, commandEnv, &unlockOutput)

 		// EC encode the SSD volume
 		var encodeOutput bytes.Buffer
@@ -1870,7 +1868,11 @@ func TestCrossRackECPlacement(t *testing.T) {
 	}
 	commandEnv := shell.NewCommandEnv(options)

-	connectToMasterAndSync(ctx, t, commandEnv)
+	// Connect to master - use the main test context to avoid early disconnection
+	go commandEnv.MasterClient.KeepConnectedToMaster(ctx)
+	commandEnv.MasterClient.WaitUntilConnected(ctx)
+
+	time.Sleep(5 * time.Second)

 	// Upload test data
 	testData := []byte("Cross-rack EC placement test data - needs to be distributed across racks")
@@ -1889,12 +1891,18 @@ func TestCrossRackECPlacement(t *testing.T) {
 	time.Sleep(3 * time.Second)

 	t.Run("ec_encode_cross_rack", func(t *testing.T) {
-		// Try to get lock with timeout to avoid hanging
-		locked, unlock := tryLockWithTimeout(t, commandEnv, 30*time.Second)
-		if !locked {
-			t.Skip("Could not acquire lock within timeout - master may not be ready")
+		// Get lock
+		lockCmd := shell.Commands[findCommandIndex("lock")]
+		var lockOutput bytes.Buffer
+		err := lockCmd.Do([]string{}, commandEnv, &lockOutput)
+		if err != nil {
+			t.Logf("Lock command failed: %v", err)
+			return
 		}
-		defer unlock()
+
+		unlockCmd := shell.Commands[findCommandIndex("unlock")]
+		var unlockOutput bytes.Buffer
+		defer unlockCmd.Do([]string{}, commandEnv, &unlockOutput)

 		// EC encode with rack-aware placement
 		// Note: uploadTestDataToMaster uses collection "test" by default
@@ -1939,12 +1947,18 @@ func TestCrossRackECPlacement(t *testing.T) {
 	})

 	t.Run("ec_balance_respects_rack_placement", func(t *testing.T) {
-		// Try to get lock with timeout to avoid hanging
-		locked, unlock := tryLockWithTimeout(t, commandEnv, 30*time.Second)
-		if !locked {
-			t.Skip("Could not acquire lock within timeout - master may not be ready")
+		// Get lock
+		lockCmd := shell.Commands[findCommandIndex("lock")]
+		var lockOutput bytes.Buffer
+		err := lockCmd.Do([]string{}, commandEnv, &lockOutput)
+		if err != nil {
+			t.Logf("Lock command failed: %v", err)
+			return
 		}
-		defer unlock()
+
+		unlockCmd := shell.Commands[findCommandIndex("unlock")]
+		var unlockOutput bytes.Buffer
+		defer unlockCmd.Do([]string{}, commandEnv, &unlockOutput)

 		initialDistribution := countShardsPerRack(testDir, uint32(volumeId))
 		t.Logf("Initial rack distribution: %v", initialDistribution)
@@ -1992,7 +2006,6 @@ func startLimitedSsdCluster(ctx context.Context, dataDir string) (*MultiDiskClus
 		"-mdir", masterDir,
 		"-volumeSizeLimitMB", "10",
 		"-ip", "127.0.0.1",
-		"-peers", "none",
 	)

 	masterLogFile, err := os.Create(filepath.Join(masterDir, "master.log"))
@@ -2083,7 +2096,6 @@ func startMultiRackCluster(ctx context.Context, dataDir string) (*MultiDiskClust
 		"-mdir", masterDir,
 		"-volumeSizeLimitMB", "10",
 		"-ip", "127.0.0.1",
-		"-peers", "none",
 	)

 	masterLogFile, err := os.Create(filepath.Join(masterDir, "master.log"))
@@ -2187,249 +2199,3 @@ func countShardsPerRack(testDir string, volumeId uint32) map[string]int {

 	return rackDistribution
 }
-
-// TestECEncodeReplicatedVolumeSync tests that ec.encode properly syncs missing entries
-// between replicas before encoding. This addresses issue #7797.
-func TestECEncodeReplicatedVolumeSync(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping replicated volume sync integration test in short mode")
-	}
-
-	// Create temporary directory for test data
-	testDir, err := os.MkdirTemp("", "seaweedfs_ec_replica_sync_test_")
-	require.NoError(t, err)
-	defer os.RemoveAll(testDir)
-
-	// Start SeaweedFS cluster
-	ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
-	defer cancel()
-
-	cluster, err := startSeaweedFSCluster(ctx, testDir)
-	require.NoError(t, err)
-	defer cluster.Stop()
-
-	// Wait for servers to be ready
-	require.NoError(t, waitForServer("127.0.0.1:9333", 30*time.Second))
-	for i := 0; i < 6; i++ {
-		require.NoError(t, waitForServer(fmt.Sprintf("127.0.0.1:%d", 8080+i), 30*time.Second))
-	}
-
-	// Create command environment
-	options := &shell.ShellOptions{
-		Masters:        stringPtr("127.0.0.1:9333"),
-		GrpcDialOption: grpc.WithInsecure(),
-		FilerGroup:     stringPtr("default"),
-	}
-	commandEnv := shell.NewCommandEnv(options)
-
-	// Connect to master with longer timeout
-	ctx2, cancel2 := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel2()
-	go commandEnv.MasterClient.KeepConnectedToMaster(ctx2)
-	commandEnv.MasterClient.WaitUntilConnected(ctx2)
-
-	// Wait for volume servers to register with master
-	time.Sleep(5 * time.Second)
-
-	// Test: Create replicated volume and verify sync behavior with consistent replicas
-	t.Run("sync_replicated_volume_consistent", func(t *testing.T) {
-		const testCollection = "replicated_consistent"
-		const testReplication = "010" // 2 copies on different servers on the same rack
-
-		// Retry a few times as volume servers may still be registering
-		var volumeId needle.VolumeId
-		var uploadErr error
-		for retry := 0; retry < 5; retry++ {
-			volumeId, uploadErr = uploadTestDataWithReplication(t, "127.0.0.1:9333", testCollection, testReplication)
-			if uploadErr == nil {
-				break
-			}
-			t.Logf("Upload attempt %d failed: %v, retrying...", retry+1, uploadErr)
-			time.Sleep(3 * time.Second)
-		}
-		if uploadErr != nil {
-			t.Skipf("Could not create replicated volume: %v", uploadErr)
-			return
-		}
-		t.Logf("Created replicated volume %d with collection %s, replication %s", volumeId, testCollection, testReplication)
-
-		// Acquire lock
-		locked, unlock := tryLockWithTimeout(t, commandEnv, 30*time.Second)
-		if !locked {
-			t.Skip("Could not acquire lock within timeout")
-		}
-		defer unlock()
-
-		// Execute EC encoding with the same collection
-		ecEncodeCmd := shell.Commands[findCommandIndex("ec.encode")]
-		args := []string{
-			"-volumeId", fmt.Sprintf("%d", volumeId),
-			"-collection", testCollection,
-			"-force",
-		}
-
-		outputStr, encodeErr := captureCommandOutput(t, ecEncodeCmd, args, commandEnv)
-		t.Logf("EC encode output:\n%s", outputStr)
-
-		// For consistent replicas, should see "all X replicas are consistent"
-		assert.Contains(t, outputStr, "replicas are consistent", "Should detect replicas are consistent")
-
-		if encodeErr != nil {
-			t.Logf("EC encoding result: %v", encodeErr)
-		} else {
-			t.Log("EC encoding completed successfully")
-		}
-	})
-
-	// Test: Create divergent replicas and verify sync/union code is exercised
-	t.Run("sync_replicated_volume_divergent", func(t *testing.T) {
-		const testCollection = "replicated_divergent"
-		const testReplication = "010" // 2 copies on different servers on the same rack
-
-		// Create replicated volume with initial data
-		var volumeId needle.VolumeId
-		var uploadErr error
-		for retry := 0; retry < 5; retry++ {
-			volumeId, uploadErr = uploadTestDataWithReplication(t, "127.0.0.1:9333", testCollection, testReplication)
-			if uploadErr == nil {
-				break
-			}
-			t.Logf("Upload attempt %d failed: %v, retrying...", retry+1, uploadErr)
-			time.Sleep(3 * time.Second)
-		}
-		if uploadErr != nil {
-			t.Skipf("Could not create replicated volume: %v", uploadErr)
-			return
-		}
-		t.Logf("Created replicated volume %d with collection %s, replication %s", volumeId, testCollection, testReplication)
-
-		// Get volume locations to identify the two replicas
-		locations, found := commandEnv.MasterClient.GetLocationsClone(uint32(volumeId))
-		if !found || len(locations) < 2 {
-			t.Skipf("Could not get 2 replica locations for volume %d (got %d)", volumeId, len(locations))
-			return
-		}
-		t.Logf("Volume %d has replicas at: %v and %v", volumeId, locations[0].Url, locations[1].Url)
-
-		// Write an extra entry to ONLY one replica to create divergence
-		// We'll use the WriteNeedleBlob gRPC call to inject data directly
-		extraNeedleId := uint64(999999) // Use a high needle ID unlikely to conflict
-		extraData := []byte("extra data written to only one replica to create divergence")
-
-		err := injectNeedleToOneReplica(grpc.WithInsecure(), volumeId, locations[0], extraNeedleId, extraData)
-		if err != nil {
-			t.Logf("Could not inject divergent needle (may not be supported): %v", err)
-			// Fall back to testing consistent path
-		} else {
-			t.Logf("Injected extra needle %d to replica %s to create divergence", extraNeedleId, locations[0].Url)
-		}
-
-		// Acquire lock
-		locked, unlock := tryLockWithTimeout(t, commandEnv, 30*time.Second)
-		if !locked {
-			t.Skip("Could not acquire lock within timeout")
-		}
-		defer unlock()
-
-		// Execute EC encoding - should detect divergence and build union
-		ecEncodeCmd := shell.Commands[findCommandIndex("ec.encode")]
-		args := []string{
-			"-volumeId", fmt.Sprintf("%d", volumeId),
-			"-collection", testCollection,
-			"-force",
-		}
-
-		outputStr, encodeErr := captureCommandOutput(t, ecEncodeCmd, args, commandEnv)
-		t.Logf("EC encode output:\n%s", outputStr)
-
-		// Check if divergence was detected
-		if strings.Contains(outputStr, "building union") {
-			t.Log("SUCCESS: Divergent replicas detected - sync/union code was exercised")
-			assert.Contains(t, outputStr, "selected", "Should show which replica was selected as best")
-			// The "copied" message only appears if the best replica is missing entries from other replicas
-			// In our case, we injected into what becomes the best replica (higher file count),
-			// so copying may not be needed. The key is that "building union" was triggered.
-			if strings.Contains(outputStr, "copied") {
-				t.Log("Entries were copied between replicas")
-			} else {
-				t.Log("Best replica already had all entries (injected entry was on best replica)")
-			}
-		} else if strings.Contains(outputStr, "replicas are consistent") {
-			t.Log("Replicas were consistent (injection may not have worked)")
-		} else {
-			t.Log("Single replica or sync not triggered")
-		}
-
-		if encodeErr != nil {
-			t.Logf("EC encoding result: %v", encodeErr)
-		} else {
-			t.Log("EC encoding completed successfully")
-		}
-	})
-}
-
-// injectNeedleToOneReplica writes a needle directly to one replica to create divergence
-func injectNeedleToOneReplica(grpcDialOption grpc.DialOption, vid needle.VolumeId, location wdclient.Location, needleId uint64, data []byte) error {
-	return operation.WithVolumeServerClient(false, location.ServerAddress(), grpcDialOption, func(client volume_server_pb.VolumeServerClient) error {
-		_, err := client.WriteNeedleBlob(context.Background(), &volume_server_pb.WriteNeedleBlobRequest{
-			VolumeId:   uint32(vid),
-			NeedleId:   needleId,
-			Size:       int32(len(data)),
-			NeedleBlob: data,
-		})
-		return err
-	})
-}
-
-// uploadTestDataWithReplication uploads test data and returns the volume ID
-// using the specified collection and replication level. All files are uploaded to the same volume.
-func uploadTestDataWithReplication(t *testing.T, masterAddr string, collection string, replication string) (needle.VolumeId, error) {
-	const numFiles = 20 // Reduced count since we're uploading to same volume
-
-	// Assign multiple file IDs from the same volume
-	assignResult, err := operation.Assign(context.Background(), func(ctx context.Context) pb.ServerAddress {
-		return pb.ServerAddress(masterAddr)
-	}, grpc.WithInsecure(), &operation.VolumeAssignRequest{
-		Count:       uint64(numFiles),
-		Collection:  collection,
-		Replication: replication,
-	})
-	if err != nil {
-		return 0, fmt.Errorf("failed to assign volume: %v", err)
-	}
-
-	// Parse volume ID from file ID
-	fid, err := needle.ParseFileIdFromString(assignResult.Fid)
-	if err != nil {
-		return 0, fmt.Errorf("failed to parse file ID: %v", err)
-	}
-	volumeId := fid.VolumeId
-
-	// Create uploader for upload
-	uploader, err := operation.NewUploader()
-	if err != nil {
-		return 0, fmt.Errorf("failed to create uploader: %v", err)
-	}
-
-	// Upload test data to the same volume using the assigned file IDs
-	// The first FID is assignResult.Fid, subsequent ones increment the needle key
-	baseNeedleKey := uint64(fid.Key)
-	for i := 0; i < numFiles; i++ {
-		data := []byte(fmt.Sprintf("test data for replicated volume sync test - entry %d - padding to make it larger %s",
-			i, strings.Repeat("x", 1000)))
-
-		// Construct FID for this file (same volume, incrementing needle key)
-		currentFid := fmt.Sprintf("%d,%x%08x", volumeId, baseNeedleKey+uint64(i), fid.Cookie)
-		uploadUrl := fmt.Sprintf("http://%s/%s", assignResult.Url, currentFid)
-
-		_, _, uploadErr := uploader.Upload(context.Background(), bytes.NewReader(data), &operation.UploadOption{
-			UploadUrl: uploadUrl,
-			Filename:  fmt.Sprintf("file%d.txt", i),
-		})
-		if uploadErr != nil {
-			t.Logf("Upload %d failed: %v", i, uploadErr)
-		}
-	}
-
-	return volumeId, nil
-}
@@ -5,14 +5,13 @@ ARG FOUNDATIONDB_VERSION=7.4.5
 ENV FOUNDATIONDB_VERSION=${FOUNDATIONDB_VERSION}

 # Install build dependencies and download prebuilt FoundationDB clients
-SHELL ["/bin/bash", "-c"]
-RUN set -euo pipefail && \
-    apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y \
    build-essential \
    git \
    wget \
    ca-certificates \
    && rm -rf /var/lib/apt/lists/* && \
+    set -euo pipefail && \
    case "${FOUNDATIONDB_VERSION}" in \
        "7.4.5") EXPECTED_SHA256="f2176b86b7e1b561c3632b4e6e7efb82e3b8f57c2ff0d0ac4671e742867508aa" ;; \
        *) echo "ERROR: No known ARM64 client checksum for FoundationDB ${FOUNDATIONDB_VERSION}. Please update this Dockerfile." >&2; exit 1 ;; \
@@ -15,7 +15,6 @@ RUN apt-get update && apt-get install -y \
    && rm -rf /var/lib/apt/lists/*

 # Install FoundationDB server + client debs with checksum verification
-SHELL ["/bin/bash", "-c"]
 RUN set -euo pipefail && \
    apt-get update && \
    case "${FOUNDATIONDB_VERSION}" in \
@@ -50,24 +50,6 @@ test-benchmark: ## Run performance benchmarks
 	@echo "$(YELLOW)Running FoundationDB performance benchmarks...$(NC)"
 	@cd ../../ && go test -v -timeout=$(TEST_TIMEOUT) -tags foundationdb -bench=. ./test/foundationdb/...

-test-benchmark-filer: ## Run filer store benchmarks (batch vs no-batch comparison)
-	@echo "$(YELLOW)Running FoundationDB filer store benchmarks...$(NC)"
-	@echo "$(BLUE)Comparing batched vs non-batched write performance$(NC)"
-	@cd ../../ && go test -v -timeout=$(TEST_TIMEOUT) -tags foundationdb \
-		-bench='BenchmarkFoundationDBStore_.*' \
-		-benchmem \
-		-benchtime=5s \
-		./weed/filer/foundationdb/...
-
-test-benchmark-concurrent: ## Run concurrent operation benchmarks
-	@echo "$(YELLOW)Running concurrent operation benchmarks...$(NC)"
-	@cd ../../ && go test -v -timeout=$(TEST_TIMEOUT) -tags foundationdb \
-		-bench='BenchmarkFoundationDBStore_Concurrent.*' \
-		-benchmem \
-		-benchtime=10s \
-		-cpu=1,2,4,8 \
-		./weed/filer/foundationdb/...
-
 # ARM64 specific targets (Apple Silicon / M1/M2/M3 Macs)
 setup-arm64: ## Set up ARM64-native FoundationDB cluster (builds from source)
 	@echo "$(YELLOW)Setting up ARM64-native FoundationDB cluster...$(NC)"
@@ -353,31 +353,12 @@ The tests are designed to be reliable in CI environments with:
 Run performance benchmarks:

 ```bash
-make test-benchmark              # Run all benchmarks
-make test-benchmark-filer        # Filer store benchmarks with batch comparison
-make test-benchmark-concurrent   # Concurrent operation benchmarks (varies CPU count)
+make test-benchmark

 # Sample expected results:
-# BenchmarkFoundationDBStore_InsertEntry-8           1000    1.2ms per op
-# BenchmarkFoundationDBStore_FindEntry-8             5000    0.5ms per op  
-# BenchmarkFoundationDBStore_KvOperations-8          2000    0.8ms per op
-# BenchmarkFoundationDBStore_InsertEntry_NoBatch-8   1000    1.0ms per op  (optimal for S3)
-# BenchmarkFoundationDBStore_InsertEntry_WithBatch-8 1200    0.9ms per op  (bulk ingestion)
-# BenchmarkFoundationDBStore_ConcurrentInsert_*-8    5000    0.3ms per op  (parallel writes)
-```
-
-### Batch vs Non-Batch Performance
-
-The FoundationDB filer store supports two write modes:
-
-| Mode | Config | Best For | Latency | Throughput |
-|------|--------|----------|---------|------------|
-| **Direct Commit** (default) | `batch_enabled = false` | S3 API, low-latency workloads | ~1-5ms per op | Good |
-| **Batched** | `batch_enabled = true` | Bulk ingestion, high throughput | Variable | Higher |
-
-Run the comparison benchmark:
-```bash
-make test-benchmark-filer
+# BenchmarkFoundationDBStore_InsertEntry-8    1000    1.2ms per op
+# BenchmarkFoundationDBStore_FindEntry-8      5000    0.5ms per op  
+# BenchmarkFoundationDBStore_KvOperations-8   2000    0.8ms per op
 ```

 ## Contributing
@@ -28,8 +28,8 @@ services:
          echo 'testing:testing@fdb1:4500,fdb2:4502,fdb3:4504' > /var/fdb/config/fdb.cluster
        fi
        # Start FDB processes
-        /usr/sbin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb1:4501 --listen_address=0.0.0.0:4501 --coordination=fdb1:4500 &
-        /usr/sbin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb1:4500 --listen_address=0.0.0.0:4500 --coordination=fdb1:4500 --class=coordination &
+        /usr/bin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb1:4501 --listen_address=0.0.0.0:4501 --coordination=fdb1:4500 &
+        /usr/bin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb1:4500 --listen_address=0.0.0.0:4500 --coordination=fdb1:4500 --class=coordination &
        wait
      "

@@ -59,8 +59,8 @@ services:
        # Wait for cluster file from fdb1
        while [ ! -f /var/fdb/config/fdb.cluster ]; do sleep 1; done
        # Start FDB processes
-        /usr/sbin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb2:4503 --listen_address=0.0.0.0:4503 --coordination=fdb1:4500 &
-        /usr/sbin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb2:4502 --listen_address=0.0.0.0:4502 --coordination=fdb1:4500 --class=coordination &
+        /usr/bin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb2:4503 --listen_address=0.0.0.0:4503 --coordination=fdb1:4500 &
+        /usr/bin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb2:4502 --listen_address=0.0.0.0:4502 --coordination=fdb1:4500 --class=coordination &
        wait
      "

@@ -90,8 +90,8 @@ services:
        # Wait for cluster file from fdb1
        while [ ! -f /var/fdb/config/fdb.cluster ]; do sleep 1; done
        # Start FDB processes
-        /usr/sbin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb3:4505 --listen_address=0.0.0.0:4505 --coordination=fdb1:4500 &
-        /usr/sbin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb3:4504 --listen_address=0.0.0.0:4504 --coordination=fdb1:4500 --class=coordination &
+        /usr/bin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb3:4505 --listen_address=0.0.0.0:4505 --coordination=fdb1:4500 &
+        /usr/bin/fdbserver --config_path=/var/fdb/config --datadir=/var/fdb/data --logdir=/var/fdb/logs --public_address=fdb3:4504 --listen_address=0.0.0.0:4504 --coordination=fdb1:4500 --class=coordination &
        wait
      "

@@ -1,8 +1,19 @@
-# FoundationDB Filer Configuration for Testing
+# FoundationDB Filer Configuration

 [foundationdb]
 enabled = true
 cluster_file = "/var/fdb/config/fdb.cluster"
-# api_version = 740
-# timeout = "5s"
-# directory_prefix = "seaweedfs"
+api_version = 740
+timeout = "5s"
+max_retry_delay = "1s"
+directory_prefix = "seaweedfs"
+
+# For testing different configurations
+[foundationdb.test]
+enabled = false
+cluster_file = "/var/fdb/config/fdb.cluster"
+api_version = 740
+timeout = "10s"
+max_retry_delay = "2s"
+directory_prefix = "seaweedfs_test"
+location = "/test"
@@ -22,7 +22,7 @@
        <junit.version>4.13.2</junit.version>
        <seaweedfs.hadoop3.client.version>4.00</seaweedfs.hadoop3.client.version>
        <jackson.version>2.18.2</jackson.version> <!-- Upgraded from 2.15.3 -->
-        <netty.version>4.1.129.Final</netty.version> <!-- Upgraded to 4.1.125.Final for security fixes (CVE in netty-codec < 4.1.125.Final, netty-codec-http2 <= 4.1.123.Final) -->
+        <netty.version>4.1.125.Final</netty.version> <!-- Upgraded to 4.1.125.Final for security fixes (CVE in netty-codec < 4.1.125.Final, netty-codec-http2 <= 4.1.123.Final) -->
        <parquet.version>1.15.2</parquet.version> <!-- Upgraded to 1.15.2 for security fix -->
        <parquet.format.version>2.12.0</parquet.format.version>
        <surefire.jvm.args>
@@ -172,8 +172,7 @@ services:
      - -master=seaweedfs-master:9333
      - -ip=seaweedfs-mq-broker
      - -port=17777
-      - -debug
-      - -debug.port=18777
+      - -port.pprof=18777
    depends_on:
      seaweedfs-filer:
        condition: service_healthy
@@ -43,26 +43,25 @@ require (
 	github.com/appscode/go-querystring v0.0.0-20170504095604-0126cfb3f1dc // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/aws/aws-sdk-go v1.55.8 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.41.0 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.32.6 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.6 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.40.0 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.31.3 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.18.20 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.15 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.15 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.93.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect
-	github.com/aws/smithy-go v1.24.0 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.12 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.12 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.89.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.30.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.39.0 // indirect
+	github.com/aws/smithy-go v1.23.2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bradenaw/juniper v0.15.3 // indirect
 	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
@@ -230,15 +229,15 @@ require (
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.46.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
 	golang.org/x/exp v0.0.0-20250811191247-51f88131bc50 // indirect
-	golang.org/x/image v0.34.0 // indirect
-	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/image v0.33.0 // indirect
+	golang.org/x/net v0.47.0 // indirect
 	golang.org/x/oauth2 v0.32.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
-	golang.org/x/sys v0.39.0 // indirect
-	golang.org/x/term v0.38.0 // indirect
-	golang.org/x/text v0.32.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/term v0.37.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	google.golang.org/api v0.247.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba // indirect
@@ -102,46 +102,44 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ=
 github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk=
-github.com/aws/aws-sdk-go-v2 v1.41.0 h1:tNvqh1s+v0vFYdA1xq0aOJH+Y5cRyZ5upu6roPgPKd4=
-github.com/aws/aws-sdk-go-v2 v1.41.0/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaX3CE/Be2uWjiXrkCH6gUX+bZA/BU=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4/go.mod h1:IOAPF6oT9KCsceNTvvYMNHy0+kMF8akOjeDvPENWxp4=
-github.com/aws/aws-sdk-go-v2/config v1.32.6 h1:hFLBGUKjmLAekvi1evLi5hVvFQtSo3GYwi+Bx4lpJf8=
-github.com/aws/aws-sdk-go-v2/config v1.32.6/go.mod h1:lcUL/gcd8WyjCrMnxez5OXkO3/rwcNmvfno62tnXNcI=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.6 h1:F9vWao2TwjV2MyiyVS+duza0NIRtAslgLUM0vTA1ZaE=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.6/go.mod h1:SgHzKjEVsdQr6Opor0ihgWtkWdfRAIwxYzSJ8O85VHY=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 h1:80+uETIWS1BqjnN9uJ0dBUaETh+P1XwFy5vwHwK5r9k=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16/go.mod h1:wOOsYuxYuB/7FlnVtzeBYRcjSRtQpAW0hCP7tIULMwo=
+github.com/aws/aws-sdk-go-v2 v1.40.0 h1:/WMUA0kjhZExjOQN2z3oLALDREea1A7TobfuiBrKlwc=
+github.com/aws/aws-sdk-go-v2 v1.40.0/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2 h1:t9yYsydLYNBk9cJ73rgPhPWqOh/52fcWDQB5b1JsKSY=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.2/go.mod h1:IusfVNTmiSN3t4rhxWFaBAqn+mcNdwKtPcV16eYdgko=
+github.com/aws/aws-sdk-go-v2/config v1.31.3 h1:RIb3yr/+PZ18YYNe6MDiG/3jVoJrPmdoCARwNkMGvco=
+github.com/aws/aws-sdk-go-v2/config v1.31.3/go.mod h1:jjgx1n7x0FAKl6TnakqrpkHWWKcX3xfWtdnIJs5K9CE=
+github.com/aws/aws-sdk-go-v2/credentials v1.18.20 h1:KFndAnHd9NUuzikHjQ8D5CfFVO+bgELkmcGY8yAw98Q=
+github.com/aws/aws-sdk-go-v2/credentials v1.18.20/go.mod h1:9mCi28a+fmBHSQ0UM79omkz6JtN+PEsvLrnG36uoUv0=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12 h1:VO3FIM2TDbm0kqp6sFNR0PbioXJb/HzCDW6NtIZpIWE=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.12/go.mod h1:6C39gB8kg82tx3r72muZSrNhHia9rjGkX7ORaS2GKNE=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 h1:0SzCLoPRSK3qSydsaFQWugP+lOBCTPwfcBOm6222+UA=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4/go.mod h1:JAet9FsBHjfdI+TnMBX4ModNNaQHAd3dc/Bk+cNsxeM=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 h1:rgGwPzb82iBYSvHMHXc8h9mRoOUBZIGFgKb9qniaZZc=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16/go.mod h1:L/UxsGeKpGoIj6DxfhOWHWQ/kGKcd4I1VncE4++IyKA=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 h1:1jtGzuV7c82xnqOVfx2F0xmJcOw5374L7N6juGW6x6U=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16/go.mod h1:M2E5OQf+XLe+SZGmmpaI2yy+J326aFf6/+54PoxSANc=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.15 h1:NLYTEyZmVZo0Qh183sC8nC+ydJXOOeIL/qI/sS3PdLY=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.15/go.mod h1:Z803iB3B0bc8oJV8zH2PERLRfQUJ2n2BXISpsA4+O1M=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 h1:0ryTNEdJbzUCEWkVXEXoqlXV72J5keC1GvILMOuD00E=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4/go.mod h1:HQ4qwNZh32C3CBeO6iJLQlgtMzqeG17ziAA/3KDJFow=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.6 h1:P1MU/SuhadGvg2jtviDXPEejU3jBNhoeeAlRadHzvHI=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.6/go.mod h1:5KYaMG6wmVKMFBSfWoyG/zH8pWwzQFnKgpoSRlXHKdQ=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 h1:oHjJHeUy0ImIV0bsrX0X91GkV5nJAyv1l1CC9lnO0TI=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16/go.mod h1:iRSNGgOYmiYwSCXxXaKb9HfOEj40+oTKn8pTxMlYkRM=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.15 h1:wsSQ4SVz5YE1crz0Ap7VBZrV4nNqZt4CIBBT8mnwoNc=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.15/go.mod h1:I7sditnFGtYMIqPRU1QoHZAUrXkGp4SczmlLwrNPlD0=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.93.0 h1:IrbE3B8O9pm3lsg96AXIN5MXX4pECEuExh/A0Du3AuI=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.93.0/go.mod h1:/sJLzHtiiZvs6C1RbxS/anSAFwZD6oC6M/kotQzOiLw=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 h1:HpI7aMmJ+mm1wkSHIA2t5EaFFv5EFYXePW30p1EIrbQ=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.4/go.mod h1:C5RdGMYGlfM0gYq/tifqgn4EbyX99V15P2V3R+VHbQU=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 h1:aM/Q24rIlS3bRAhTyFurowU8A0SMyGDtEOY/l/s/1Uw=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.8/go.mod h1:+fWt2UHSb4kS7Pu8y+BMBvJF0EWx+4H0hzNwtDNRTrg=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 h1:AHDr0DaHIAo8c9t1emrzAlVDFp+iMMKnPdYy6XO4MCE=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12/go.mod h1:GQ73XawFFiWxyWXMHWfhiomvP3tXtdNar/fi8z18sx0=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 h1:SciGFVNZ4mHdm7gpD1dgZYnCuVdX1s+lFTg4+4DOy70=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.5/go.mod h1:iW40X4QBmUxdP+fZNOpfmkdMZqsovezbAeO+Ubiv2pk=
-github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk=
-github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.12 h1:p/9flfXdoAnwJnuW9xHEAFY22R3A6skYkW19JFF9F+8=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.12/go.mod h1:ZTLHakoVCTtW8AaLGSwJ3LXqHD9uQKnOcv1TrpO6u2k=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.12 h1:2lTWFvRcnWFFLzHWmtddu5MTchc5Oj2OOey++99tPZ0=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.12/go.mod h1:hI92pK+ho8HVcWMHKHrK3Uml4pfG7wvL86FzO0LVtQQ=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.12 h1:itu4KHu8JK/N6NcLIISlf3LL1LccMqruLUXZ9y7yBZw=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.12/go.mod h1:i+6vTU3xziikTY3vcox23X8pPGW5X3wVgd1VZ7ha+x8=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2 h1:xtuxji5CS0JknaXoACOunXOYOQzgfTvGAc9s2QdCJA4=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.2/go.mod h1:zxwi0DIR0rcRcgdbl7E2MSOvxDyyXGBlScvBkARFaLQ=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.3 h1:NEe7FaViguRQEm8zl8Ay/kC/QRsMtWUiCGZajQIsLdc=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.3/go.mod h1:JLuCKu5VfiLBBBl/5IzZILU7rxS0koQpHzMOCzycOJU=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.12 h1:MM8imH7NZ0ovIVX7D2RxfMDv7Jt9OiUXkcQ+GqywA7M=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.12/go.mod h1:gf4OGwdNkbEsb7elw2Sy76odfhwNktWII3WgvQgQQ6w=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.12 h1:R3uW0iKl8rgNEXNjVGliW/oMEh9fO/LlUEV8RvIFr1I=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.12/go.mod h1:XEttbEr5yqsw8ebi7vlDoGJJjMXRez4/s9pibpJyL5s=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.89.1 h1:Dq82AV+Qxpno/fG162eAhnD8d48t9S+GZCfz7yv1VeA=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.89.1/go.mod h1:MbKLznDKpf7PnSonNRUVYZzfP0CeLkRIUexeblgKcU4=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.0 h1:xHXvxst78wBpJFgDW07xllOx0IAzbryrSdM4nMVQ4Dw=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.0/go.mod h1:/e8m+AO6HNPPqMyfKRtzZ9+mBF5/x1Wk8QiDva4m07I=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.4 h1:tBw2Qhf0kj4ZwtsVpDiVRU3zKLvjvjgIjHMKirxXg8M=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.4/go.mod h1:Deq4B7sRM6Awq/xyOBlxBdgW8/Z926KYNNaGMW2lrkA=
+github.com/aws/aws-sdk-go-v2/service/sts v1.39.0 h1:C+BRMnasSYFcgDw8o9H5hzehKzXyAb9GY5v/8bP9DUY=
+github.com/aws/aws-sdk-go-v2/service/sts v1.39.0/go.mod h1:4EjU+4mIx6+JqKQkruye+CaigV7alL3thVPfDd9VlMs=
+github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=
+github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bradenaw/juniper v0.15.3 h1:RHIAMEDTpvmzV1wg1jMAHGOoI2oJUSPx3lxRldXnFGo=
@@ -538,10 +536,10 @@ github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4
 github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
 github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8 h1:Y258uzXU/potCYnQd1r6wlAnoMB68BiCkCcCnKx1SH8=
 github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8/go.mod h1:bSJjRokAHHOhA+XFxplld8w2R/dXLH7Z3BZ532vhFwU=
-github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
-github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
-github.com/quic-go/quic-go v0.57.0 h1:AsSSrrMs4qI/hLrKlTH/TGQeTMY0ib1pAOX7vA3AdqE=
-github.com/quic-go/quic-go v0.57.0/go.mod h1:ly4QBAjHA2VhdnxhojRsCUOeJwKYg+taDlos92xb1+s=
+github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
+github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
+github.com/quic-go/quic-go v0.54.1 h1:4ZAWm0AhCb6+hE+l5Q1NAL0iRn/ZrMwqHRGQiFwj2eg=
+github.com/quic-go/quic-go v0.54.1/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY=
 github.com/rclone/rclone v1.71.2 h1:3Jk5xNPFrZhVABRuN/OPvApuZQddpE2tkhYMuEn1Ud4=
 github.com/rclone/rclone v1.71.2/go.mod h1:dCK9FzPDlpkbQJ9M7MmWsmv3X5nibfWe+ogJXu6gSgM=
 github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8AOIL7EB/X911+m4EHsnWEHeJ0c+3TTBrg=
@@ -710,6 +708,8 @@ go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJr
 go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
+go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
 go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
 go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
@@ -732,8 +732,8 @@ golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -748,8 +748,8 @@ golang.org/x/exp v0.0.0-20250811191247-51f88131bc50 h1:3yiSh9fhy5/RhCSntf4Sy0Tnx
 golang.org/x/exp v0.0.0-20250811191247-51f88131bc50/go.mod h1:rT6SFzZ7oxADUDx58pcaKFTcZ+inxAa9fTrYx/uVYwg=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.34.0 h1:33gCkyw9hmwbZJeZkct8XyR11yH889EQt/QH4VmXMn8=
-golang.org/x/image v0.34.0/go.mod h1:2RNFBZRB+vnwwFil8GkMdRvrJOFd1AzdZI6vOY+eJVU=
+golang.org/x/image v0.33.0 h1:LXRZRnv1+zGd5XBUVRFmYEphyyKJjQjCRiOuAP3sZfQ=
+golang.org/x/image v0.33.0/go.mod h1:DD3OsTYT9chzuzTQt+zMcOlBHgfoKQb1gry8p76Y1sc=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -774,6 +774,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -813,8 +815,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -892,8 +894,8 @@ golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
-golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -906,8 +908,8 @@ golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
-golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
-golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -923,8 +925,8 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -977,8 +979,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
-golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -181,8 +181,7 @@ services:
      - -ip=seaweedfs-mq-broker
      - -port=17777
      - -logFlushInterval=0
-      - -debug
-      - -debug.port=18777
+      - -port.pprof=18777
    depends_on:
      seaweedfs-filer:
        condition: service_healthy
@@ -25,4 +25,3 @@ test-resume: build-weed
 clean:
 	rm -f ../../weed/weed

-
@@ -47,4 +47,3 @@ go test -v -timeout 5m ./test/metadata_subscribe/...
 - Tests create temporary directories that are cleaned up after completion
 - Tests use ports 9333 (master), 8080 (volume), 8888 (filer)

-
@@ -1,126 +0,0 @@
-# S3 SDK Compatibility Testing
-
-This document describes the SDK versions tested against SeaweedFS S3 API and known compatibility considerations.
-
-## Validated SDK Versions
-
-### Go SDKs
-
-| SDK | Version | Test Location | Status |
-|-----|---------|---------------|--------|
-| AWS SDK v2 for Go | 1.20+ | `test/s3/etag/`, `test/s3/copying/` | ✅ Tested |
-| AWS SDK v1 for Go | 1.x | `test/s3/basic/` | ✅ Tested |
-
-### Java SDKs
-
-| SDK | Version | Test Location | Status |
-|-----|---------|---------------|--------|
-| AWS SDK v2 for Java | 2.20.127+ | `other/java/s3copier/` | ✅ Tested |
-| AWS SDK v1 for Java | 1.12.600+ | `other/java/s3copier/` | ✅ Tested |
-
-### Python SDKs
-
-| SDK | Version | Test Location | Status |
-|-----|---------|---------------|--------|
-| boto3 | 1.x | `test/s3/parquet/` | ✅ Tested |
-| PyArrow S3 | 14+ | `test/s3/parquet/` | ✅ Tested |
-
-## SDK-Specific Considerations
-
-### AWS SDK v2 for Java - ETag Validation
-
-**Issue**: [GitHub #7768](https://github.com/seaweedfs/seaweedfs/issues/7768)
-
-AWS SDK v2 for Java includes strict ETag validation in `ChecksumsEnabledValidator.validatePutObjectChecksum`. It decodes the ETag as a hexadecimal MD5 hash using `Base16Codec.decode()`.
-
-**Impact**: If the ETag contains non-hexadecimal characters (like `-` in composite format), the SDK fails with:
-```text
-java.lang.IllegalArgumentException: Invalid base 16 character: '-'
-```
-
-**Resolution**: SeaweedFS now correctly returns:
- **PutObject**: Pure MD5 hex ETag (32 characters) regardless of internal chunking
- **CompleteMultipartUpload**: Composite ETag (`<md5>-<partcount>`)
-
-**Test Coverage**: `test/s3/etag/` and `other/java/s3copier/ETagValidationTest.java`
-
-### AWS SDK v1 vs v2 Differences
-
-| Feature | SDK v1 | SDK v2 |
-|---------|--------|--------|
-| ETag hex validation | No | Yes (strict) |
-| Checksum validation | Basic | Enhanced |
-| Async support | Limited | Full |
-| Default retry behavior | Lenient | Stricter |
-
-### Large File Handling
-
-SeaweedFS auto-chunks files larger than **8MB** for efficient storage. This is transparent to clients, but previously affected ETag format. The current implementation ensures:
-
-1. Regular `PutObject` (any size): Returns pure MD5 ETag
-2. Multipart upload: Returns composite ETag per AWS S3 specification
-
-## Test Categories by File Size
-
-| Category | Size | Chunks | ETag Format |
-|----------|------|--------|-------------|
-| Small | < 256KB | 1 (inline) | Pure MD5 |
-| Medium | 256KB - 8MB | 1 | Pure MD5 |
-| Large | 8MB - 24MB | 2-3 | Pure MD5 |
-| Extra Large | > 24MB | 4+ | Pure MD5 |
-| Multipart | N/A | Per part | Composite |
-
-## Running SDK Compatibility Tests
-
-### Go Tests
-
-```bash
-# Run all ETag tests
-cd test/s3/etag && make test
-
-# Run large file tests only
-cd test/s3/etag && make test-large
-```
-
-### Java Tests
-
-```bash
-# Run all Java SDK tests
-cd other/java/s3copier && mvn test
-
-# Run only ETag validation tests
-cd other/java/s3copier && mvn test -Dtest=ETagValidationTest
-```
-
-### Python Tests
-
-```bash
-# Run PyArrow S3 tests
-cd test/s3/parquet && make test
-```
-
-## Adding New SDK Tests
-
-When adding tests for new SDKs, ensure:
-
-1. **Large file tests (>8MB)**: Critical for verifying ETag format with auto-chunking
-2. **Multipart upload tests**: Verify composite ETag format
-3. **Checksum validation**: Test SDK-specific checksum validation if applicable
-4. **Document SDK version**: Add to this compatibility matrix
-
-## Known Issues and Workarounds
-
-### Issue: Older SDK Versions
-
-Some very old SDK versions (e.g., AWS SDK v1 for Java < 1.11.x) may have different behavior. Testing with the versions listed above is recommended.
-
-### Issue: Custom Checksum Algorithms
-
-AWS SDK v2 supports SHA-256 and CRC32 checksums in addition to MD5. SeaweedFS currently returns MD5-based ETags. For checksums other than MD5, use the `x-amz-checksum-*` headers.
-
-## References
-
- [AWS S3 ETag Documentation](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Object.html)
- [AWS SDK v2 Migration Guide](https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/migration.html)
- [GitHub Issue #7768](https://github.com/seaweedfs/seaweedfs/issues/7768)
-
@@ -1,44 +0,0 @@
-# Makefile for SeaweedFS S3 ACL tests
-# Tests auto-manage server via TestMain using weed mini
-
-.PHONY: test test-quick test-external test-with-server clean check-deps build
-
-# Build SeaweedFS binary if not exists
-build:
-	@echo "Building SeaweedFS binary..."
-	@cd ../../../ && make install
-	@which weed > /dev/null 2>&1 || (echo "SeaweedFS binary not found in PATH" && exit 1)
-
-# Check dependencies
-check-deps: build
-	@which weed > /dev/null 2>&1 || (echo "SeaweedFS binary not found in PATH" && exit 1)
-	@echo "✅ Dependencies available"
-
-# Run all tests (auto-manages weed mini server via TestMain)
-test: check-deps
-	@echo "Running all S3 ACL tests..."
-	@go test -v -timeout=10m ./...
-
-# Run quick tests (uses TEST_PATTERN if provided)
-test-quick: check-deps
-	@echo "Running quick S3 ACL tests..."
-	@if [ -z "$(TEST_PATTERN)" ]; then \
-		go test -v -timeout=10m ./...; \
-	else \
-		go test -v -timeout=10m -run "$(TEST_PATTERN)" ./...; \
-	fi
-
-# Run tests against external server (CI/CD mode)
-test-external: check-deps
-	@echo "Running tests against external server (USE_EXTERNAL_SERVER=true)..."
-	@USE_EXTERNAL_SERVER=true go test -v -timeout=10m ./...
-
-# Run tests with auto-managed server (CI/CD target)
-test-with-server: test
-
-# Clean up test artifacts
-clean:
-	@echo "Cleaning up test artifacts..."
-	@rm -f *.log *.pid
-	@go clean -testcache
-	@echo "✅ Cleanup completed"
@@ -1,335 +0,0 @@
-package acl
-
-import (
-	"context"
-	"os"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/config"
-	"github.com/aws/aws-sdk-go-v2/credentials"
-	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func getS3Client(t *testing.T) *s3.Client {
-	endpoint := os.Getenv("S3_ENDPOINT")
-	if endpoint == "" {
-		endpoint = "http://localhost:8333"
-	}
-	accessKey := os.Getenv("S3_ACCESS_KEY")
-	if accessKey == "" {
-		accessKey = "some_access_key1"
-	}
-	secretKey := os.Getenv("S3_SECRET_KEY")
-	if secretKey == "" {
-		secretKey = "some_secret_key1"
-	}
-
-	cfg, err := config.LoadDefaultConfig(
-		context.TODO(),
-		config.WithRegion("us-east-1"),
-		config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(
-			accessKey,
-			secretKey,
-			"",
-		)),
-	)
-	require.NoError(t, err)
-	return s3.NewFromConfig(cfg, func(o *s3.Options) {
-		o.UsePathStyle = true
-		o.BaseEndpoint = aws.String(endpoint)
-	})
-}
-
-func createVersionedTestBucket(t *testing.T, client *s3.Client) string {
-	bucketName := "test-acl-versioned-" + strings.ToLower(strings.ReplaceAll(time.Now().Format("2006-01-02-15-04-05.000"), ":", "-"))
-	_, err := client.CreateBucket(context.TODO(), &s3.CreateBucketInput{
-		Bucket: aws.String(bucketName),
-	})
-	require.NoError(t, err)
-
-	_, err = client.PutBucketVersioning(context.TODO(), &s3.PutBucketVersioningInput{
-		Bucket: aws.String(bucketName),
-		VersioningConfiguration: &types.VersioningConfiguration{
-			Status: types.BucketVersioningStatusEnabled,
-		},
-	})
-	require.NoError(t, err)
-	time.Sleep(100 * time.Millisecond)
-	return bucketName
-}
-
-func cleanupTestBucket(t *testing.T, client *s3.Client, bucketName string) {
-	listResp, err := client.ListObjectsV2(context.TODO(), &s3.ListObjectsV2Input{
-		Bucket: aws.String(bucketName),
-	})
-	if err == nil {
-		for _, obj := range listResp.Contents {
-			client.DeleteObject(context.TODO(), &s3.DeleteObjectInput{
-				Bucket: aws.String(bucketName),
-				Key:    obj.Key,
-			})
-		}
-	}
-
-	listVersionsResp, err := client.ListObjectVersions(context.TODO(), &s3.ListObjectVersionsInput{
-		Bucket: aws.String(bucketName),
-	})
-	if err == nil {
-		for _, version := range listVersionsResp.Versions {
-			client.DeleteObject(context.TODO(), &s3.DeleteObjectInput{
-				Bucket:    aws.String(bucketName),
-				Key:       version.Key,
-				VersionId: version.VersionId,
-			})
-		}
-		for _, marker := range listVersionsResp.DeleteMarkers {
-			client.DeleteObject(context.TODO(), &s3.DeleteObjectInput{
-				Bucket:    aws.String(bucketName),
-				Key:       marker.Key,
-				VersionId: marker.VersionId,
-			})
-		}
-	}
-
-	client.DeleteBucket(context.TODO(), &s3.DeleteBucketInput{
-		Bucket: aws.String(bucketName),
-	})
-}
-
-// TestGetObjectAclOnVersionedBucket tests retrieving ACL from versioned objects
-func TestGetObjectAclOnVersionedBucket(t *testing.T) {
-	client := getS3Client(t)
-	bucketName := createVersionedTestBucket(t, client)
-	defer cleanupTestBucket(t, client, bucketName)
-
-	objectKey := "versioned-object-acl"
-	putResp, err := client.PutObject(context.TODO(), &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   strings.NewReader("Hello, ACL World!"),
-	})
-	require.NoError(t, err)
-
-	aclResp, err := client.GetObjectAcl(context.TODO(), &s3.GetObjectAclInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	})
-	require.NoError(t, err)
-	assert.NotNil(t, aclResp.Owner)
-
-	t.Logf("Successfully retrieved ACL for versioned object %s (versionId: %s)", objectKey, *putResp.VersionId)
-}
-
-// TestGetObjectAclOnSpecificVersionInVersionedBucket tests retrieving ACL for specific versions
-func TestGetObjectAclOnSpecificVersionInVersionedBucket(t *testing.T) {
-	client := getS3Client(t)
-	bucketName := createVersionedTestBucket(t, client)
-	defer cleanupTestBucket(t, client, bucketName)
-
-	objectKey := "multi-version-object-acl"
-
-	version1Resp, err := client.PutObject(context.TODO(), &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   strings.NewReader("Version 1"),
-	})
-	require.NoError(t, err)
-
-	time.Sleep(50 * time.Millisecond)
-
-	version2Resp, err := client.PutObject(context.TODO(), &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   strings.NewReader("Version 2"),
-	})
-	require.NoError(t, err)
-
-	versionId1 := *version1Resp.VersionId
-	versionId2 := *version2Resp.VersionId
-
-	aclResp1, err := client.GetObjectAcl(context.TODO(), &s3.GetObjectAclInput{
-		Bucket:    aws.String(bucketName),
-		Key:       aws.String(objectKey),
-		VersionId: aws.String(versionId1),
-	})
-	require.NoError(t, err)
-	assert.NotNil(t, aclResp1.Owner)
-
-	aclResp2, err := client.GetObjectAcl(context.TODO(), &s3.GetObjectAclInput{
-		Bucket:    aws.String(bucketName),
-		Key:       aws.String(objectKey),
-		VersionId: aws.String(versionId2),
-	})
-	require.NoError(t, err)
-	assert.NotNil(t, aclResp2.Owner)
-
-	t.Logf("Successfully retrieved ACL for both versions: v1=%s, v2=%s", versionId1, versionId2)
-}
-
-// TestPutObjectAclOnVersionedBucket tests setting ACL on versioned objects
-func TestPutObjectAclOnVersionedBucket(t *testing.T) {
-	client := getS3Client(t)
-	bucketName := createVersionedTestBucket(t, client)
-	defer cleanupTestBucket(t, client, bucketName)
-
-	objectKey := "versioned-object-put-acl"
-	putResp, err := client.PutObject(context.TODO(), &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   strings.NewReader("Hello, Put ACL!"),
-	})
-	require.NoError(t, err)
-
-	_, err = client.PutObjectAcl(context.TODO(), &s3.PutObjectAclInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		ACL:    types.ObjectCannedACLPublicRead,
-	})
-	require.NoError(t, err)
-
-	aclResp, err := client.GetObjectAcl(context.TODO(), &s3.GetObjectAclInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	})
-	require.NoError(t, err)
-	assert.NotNil(t, aclResp.Owner)
-
-	t.Logf("Successfully set and verified ACL for versioned object %s (versionId: %s)", objectKey, *putResp.VersionId)
-}
-
-// TestPutObjectAclOnSpecificVersionInVersionedBucket tests setting ACL on specific versions
-func TestPutObjectAclOnSpecificVersionInVersionedBucket(t *testing.T) {
-	client := getS3Client(t)
-	bucketName := createVersionedTestBucket(t, client)
-	defer cleanupTestBucket(t, client, bucketName)
-
-	objectKey := "multi-version-object-put-acl"
-
-	version1Resp, err := client.PutObject(context.TODO(), &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   strings.NewReader("Version 1"),
-	})
-	require.NoError(t, err)
-
-	time.Sleep(50 * time.Millisecond)
-
-	version2Resp, err := client.PutObject(context.TODO(), &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   strings.NewReader("Version 2"),
-	})
-	require.NoError(t, err)
-
-	versionId1 := *version1Resp.VersionId
-	versionId2 := *version2Resp.VersionId
-
-	_, err = client.PutObjectAcl(context.TODO(), &s3.PutObjectAclInput{
-		Bucket:    aws.String(bucketName),
-		Key:       aws.String(objectKey),
-		VersionId: aws.String(versionId1),
-		ACL:       types.ObjectCannedACLPublicRead,
-	})
-	require.NoError(t, err)
-
-	_, err = client.PutObjectAcl(context.TODO(), &s3.PutObjectAclInput{
-		Bucket:    aws.String(bucketName),
-		Key:       aws.String(objectKey),
-		VersionId: aws.String(versionId2),
-		ACL:       types.ObjectCannedACLPrivate,
-	})
-	require.NoError(t, err)
-
-	aclResp1, err := client.GetObjectAcl(context.TODO(), &s3.GetObjectAclInput{
-		Bucket:    aws.String(bucketName),
-		Key:       aws.String(objectKey),
-		VersionId: aws.String(versionId1),
-	})
-	require.NoError(t, err)
-	assert.NotNil(t, aclResp1.Owner)
-
-	aclResp2, err := client.GetObjectAcl(context.TODO(), &s3.GetObjectAclInput{
-		Bucket:    aws.String(bucketName),
-		Key:       aws.String(objectKey),
-		VersionId: aws.String(versionId2),
-	})
-	require.NoError(t, err)
-	assert.NotNil(t, aclResp2.Owner)
-
-	t.Logf("Successfully set ACL on both versions: v1=%s, v2=%s", versionId1, versionId2)
-}
-
-// TestModifyAclOnDifferentVersionsIndependently tests that ACL changes on one version don't affect others
-func TestModifyAclOnDifferentVersionsIndependently(t *testing.T) {
-	client := getS3Client(t)
-	bucketName := createVersionedTestBucket(t, client)
-	defer cleanupTestBucket(t, client, bucketName)
-
-	objectKey := "versioned-independent-acl"
-
-	version1Resp, err := client.PutObject(context.TODO(), &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   strings.NewReader("Version 1"),
-	})
-	require.NoError(t, err)
-
-	time.Sleep(50 * time.Millisecond)
-
-	version2Resp, err := client.PutObject(context.TODO(), &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   strings.NewReader("Version 2"),
-	})
-	require.NoError(t, err)
-
-	versionId1 := *version1Resp.VersionId
-	versionId2 := *version2Resp.VersionId
-
-	_, err = client.PutObjectAcl(context.TODO(), &s3.PutObjectAclInput{
-		Bucket:    aws.String(bucketName),
-		Key:       aws.String(objectKey),
-		VersionId: aws.String(versionId1),
-		ACL:       types.ObjectCannedACLPublicRead,
-	})
-	require.NoError(t, err)
-
-	_, err = client.PutObjectAcl(context.TODO(), &s3.PutObjectAclInput{
-		Bucket:    aws.String(bucketName),
-		Key:       aws.String(objectKey),
-		VersionId: aws.String(versionId2),
-		ACL:       types.ObjectCannedACLPrivate,
-	})
-	require.NoError(t, err)
-
-	aclRespLatest, err := client.GetObjectAcl(context.TODO(), &s3.GetObjectAclInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	})
-	require.NoError(t, err)
-	assert.NotNil(t, aclRespLatest.Owner)
-
-	aclResp1, err := client.GetObjectAcl(context.TODO(), &s3.GetObjectAclInput{
-		Bucket:    aws.String(bucketName),
-		Key:       aws.String(objectKey),
-		VersionId: aws.String(versionId1),
-	})
-	require.NoError(t, err)
-	assert.NotNil(t, aclResp1.Owner)
-
-	aclResp2, err := client.GetObjectAcl(context.TODO(), &s3.GetObjectAclInput{
-		Bucket:    aws.String(bucketName),
-		Key:       aws.String(objectKey),
-		VersionId: aws.String(versionId2),
-	})
-	require.NoError(t, err)
-	assert.NotNil(t, aclResp2.Owner)
-
-	t.Logf("Successfully verified independent ACL management across versions")
-}
@@ -1,42 +0,0 @@
-package acl
-
-import (
-	"fmt"
-	"os"
-	"testing"
-
-	"github.com/seaweedfs/seaweedfs/test/s3/testutil"
-)
-
-var testServer *testutil.TestServer
-
-// TestMain sets up and tears down the test environment using weed mini
-func TestMain(m *testing.M) {
-	var exitCode int
-
-	fmt.Println("TestMain: Starting test setup...")
-
-	// Check if we should manage the server or use an existing one
-	if os.Getenv("USE_EXTERNAL_SERVER") != "true" {
-		// Start server using weed mini
-		fmt.Println("TestMain: Starting weed mini server...")
-		config := testutil.DefaultServerConfig(nil)
-		config.AccessKey = "some_access_key1"
-		config.SecretKey = "some_secret_key1"
-
-		var err error
-		testServer, err = testutil.StartServer(config)
-		if err != nil {
-			fmt.Printf("TestMain: ERROR - Failed to start test server: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println("TestMain: Server started successfully")
-		defer testServer.Stop()
-	}
-
-	// Run tests
-	fmt.Println("TestMain: Running tests...")
-	exitCode = m.Run()
-	fmt.Printf("TestMain: Tests completed with exit code %d\n", exitCode)
-	os.Exit(exitCode)
-}
@@ -1,44 +0,0 @@
-# Makefile for SeaweedFS S3 Basic tests
-# Tests auto-manage server via TestMain using weed mini
-
-.PHONY: test test-quick test-external test-with-server clean check-deps build
-
-# Build SeaweedFS binary if not exists
-build:
-	@echo "Building SeaweedFS binary..."
-	@cd ../../../ && make install
-	@which weed > /dev/null 2>&1 || (echo "SeaweedFS binary not found in PATH" && exit 1)
-
-# Check dependencies
-check-deps: build
-	@which weed > /dev/null 2>&1 || (echo "SeaweedFS binary not found in PATH" && exit 1)
-	@echo "✅ Dependencies available"
-
-# Run all tests (auto-manages weed mini server via TestMain)
-test: check-deps
-	@echo "Running all S3 basic tests..."
-	@go test -v -timeout=10m ./...
-
-# Run quick tests (uses TEST_PATTERN if provided)
-test-quick: check-deps
-	@echo "Running quick S3 basic tests..."
-	@if [ -z "$(TEST_PATTERN)" ]; then \
-		go test -v -timeout=10m ./...; \
-	else \
-		go test -v -timeout=10m -run "$(TEST_PATTERN)" ./...; \
-	fi
-
-# Run tests against external server (CI/CD mode)
-test-external: check-deps
-	@echo "Running tests against external server (USE_EXTERNAL_SERVER=true)..."
-	@USE_EXTERNAL_SERVER=true go test -v -timeout=10m ./...
-
-# Run tests with auto-managed server (CI/CD target)
-test-with-server: test
-
-# Clean up test artifacts
-clean:
-	@echo "Cleaning up test artifacts..."
-	@rm -f *.log *.pid
-	@go clean -testcache
-	@echo "✅ Cleanup completed"
@@ -9,7 +9,6 @@ import (

 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 )
@@ -19,46 +18,25 @@ var (
 )

 func init() {
-	// Session will be created lazily in tests after environment variables are set
-}
-
-func getS3Client() *s3.S3 {
-	if svc == nil {
-		// Get credentials from environment or use defaults
-		accessKey := os.Getenv("AWS_ACCESS_KEY_ID")
-		secretKey := os.Getenv("AWS_SECRET_ACCESS_KEY")
-		if accessKey == "" {
-			accessKey = "some_access_key1"
-		}
-		if secretKey == "" {
-			secretKey = "some_secret_key1"
-		}
-
-		// Create session with explicit credentials
-		sess, err := session.NewSession(&aws.Config{
-			Region:      aws.String("us-east-1"),
-			Endpoint:    aws.String("localhost:8333"),
-			DisableSSL:  aws.Bool(true),
-			Credentials: credentials.NewStaticCredentials(accessKey, secretKey, ""),
-		})
-		if err != nil {
-			panic(fmt.Sprintf("create session: %v", err))
-		}
-
-		// Create S3 service client
-		svc = s3.New(sess)
+	// Initialize a session in us-west-2 that the SDK will use to load
+	// credentials from the shared credentials file ~/.aws/credentials.
+	sess, err := session.NewSession(&aws.Config{
+		Region:     aws.String("us-west-2"),
+		Endpoint:   aws.String("localhost:8333"),
+		DisableSSL: aws.Bool(true),
+	})
+	if err != nil {
+		exitErrorf("create session, %v", err)
 	}
-	return svc
+
+	// Create S3 service client
+	svc = s3.New(sess)
 }

 func TestCreateBucket(t *testing.T) {
-	fmt.Printf("TestCreateBucket: AWS_ACCESS_KEY_ID=%s, AWS_SECRET_ACCESS_KEY=%s\n",
-		os.Getenv("AWS_ACCESS_KEY_ID"), strings.Repeat("*", len(os.Getenv("AWS_SECRET_ACCESS_KEY"))))
-
-	svc := getS3Client()

 	input := &s3.CreateBucketInput{
-		Bucket: aws.String(Bucket),
+		Bucket: aws.String("theBucket"),
 	}

 	result, err := svc.CreateBucket(input)
@@ -85,12 +63,11 @@ func TestCreateBucket(t *testing.T) {
 }

 func TestPutObject(t *testing.T) {
-	svc := getS3Client()

 	input := &s3.PutObjectInput{
 		ACL:    aws.String("authenticated-read"),
 		Body:   aws.ReadSeekCloser(strings.NewReader("filetoupload")),
-		Bucket: aws.String(Bucket),
+		Bucket: aws.String("theBucket"),
 		Key:    aws.String("exampleobject"),
 	}

@@ -114,7 +91,6 @@ func TestPutObject(t *testing.T) {
 }

 func TestListBucket(t *testing.T) {
-	svc := getS3Client()

 	result, err := svc.ListBuckets(nil)
 	if err != nil {
@@ -131,7 +107,6 @@ func TestListBucket(t *testing.T) {
 }

 func TestListObjectV2(t *testing.T) {
-	svc := getS3Client()

 	listObj, err := svc.ListObjectsV2(&s3.ListObjectsV2Input{
 		Bucket:    aws.String(Bucket),
@@ -154,30 +129,17 @@ func exitErrorf(msg string, args ...interface{}) {
 }

 const (
-	Bucket = "test-bucket"
+	Bucket = "theBucket"
 	object = "foo/bar"
 	Data   = "<data>"
 )

 func TestObjectOp(t *testing.T) {
-	svc := getS3Client()
 	_, err := svc.CreateBucket(&s3.CreateBucketInput{
 		Bucket: aws.String(Bucket),
 	})
 	if err != nil {
-		if aerr, ok := err.(awserr.Error); ok {
-			switch aerr.Code() {
-			case s3.ErrCodeBucketAlreadyExists:
-				fmt.Println(s3.ErrCodeBucketAlreadyExists, aerr.Error())
-			case s3.ErrCodeBucketAlreadyOwnedByYou:
-				fmt.Println(s3.ErrCodeBucketAlreadyOwnedByYou, aerr.Error())
-			default:
-				fmt.Println(aerr.Error())
-			}
-		} else {
-			// Handle non-AWS errors (like MethodNotAllowed)
-			fmt.Printf("Bucket creation failed (possibly already exists): %v\n", err)
-		}
+		exitErrorf("Unable to create bucket, %v", err)
 	}

 	_, err = svc.PutObject(&s3.PutObjectInput{
@@ -1,51 +0,0 @@
-package basic
-
-import (
-	"fmt"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/seaweedfs/seaweedfs/test/s3/testutil"
-)
-
-var testServer *testutil.TestServer
-
-// TestMain sets up and tears down the test environment using weed mini
-func TestMain(m *testing.M) {
-	var exitCode int
-
-	fmt.Println("TestMain: Starting test setup...")
-
-	// Check if we should manage the server or use an existing one
-	if os.Getenv("USE_EXTERNAL_SERVER") != "true" {
-		// Start server using weed mini
-		fmt.Println("TestMain: Starting weed mini server...")
-		config := testutil.DefaultServerConfig(nil)
-		config.AccessKey = "some_access_key1"
-		config.SecretKey = "some_secret_key1"
-
-		fmt.Println("TestMain: Setting environment variables...")
-		// Set AWS credentials for tests
-		os.Setenv("AWS_ACCESS_KEY_ID", config.AccessKey)
-		os.Setenv("AWS_SECRET_ACCESS_KEY", config.SecretKey)
-		os.Setenv("AWS_REGION", "us-east-1")
-		fmt.Printf("TestMain: Set AWS_ACCESS_KEY_ID=%s, AWS_SECRET_ACCESS_KEY=%s, AWS_REGION=us-east-1\n",
-			config.AccessKey, strings.Repeat("*", len(config.SecretKey)))
-
-		var err error
-		testServer, err = testutil.StartServer(config)
-		if err != nil {
-			fmt.Printf("TestMain: ERROR - Failed to start test server: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println("TestMain: Server started successfully")
-		defer testServer.Stop()
-	}
-
-	// Run tests
-	fmt.Println("TestMain: Running tests...")
-	exitCode = m.Run()
-	fmt.Printf("TestMain: Tests completed with exit code %d\n", exitCode)
-	os.Exit(exitCode)
-}
@@ -1 +0,0 @@
-79189
@@ -23,7 +23,7 @@ GREEN := \033[0;32m
 YELLOW := \033[1;33m
 NC := \033[0m # No Color

-.PHONY: all test clean start-seaweedfs stop-seaweedfs check-binary help test-with-server
+.PHONY: all test clean start-seaweedfs stop-seaweedfs check-binary help

 all: test-basic

@@ -203,13 +203,7 @@ manual-start: start-seaweedfs

 manual-stop: stop-seaweedfs clean

-# CI/CD targets - use auto-managed server via TestMain
-test-with-server: check-binary
-	@echo "$(YELLOW)Running S3 copying tests with auto-managed server...$(NC)"
-	@cd $(SEAWEEDFS_ROOT) && go test -v -timeout=$(TEST_TIMEOUT) ./test/s3/copying || (echo "$(RED)Tests failed$(NC)" && exit 1)
-	@echo "$(GREEN)Tests completed successfully!$(NC)"
-
-# Old CI target
+# CI/CD targets
 ci-test: test-quick

 # Benchmark targets
@@ -1,37 +0,0 @@
-package copying_test
-
-import (
-"fmt"
-"os"
-"testing"
-
-	"github.com/seaweedfs/seaweedfs/test/s3/testutil"
-func TestMain(m *testing.M) {
-	var exitCode int
-
-	fmt.Println("TestMain: Starting test setup...")
-
-	// Check if we should manage the server or use an existing one
-	if os.Getenv("USE_EXTERNAL_SERVER") != "true" {
-		// Start server using weed mini
-		fmt.Println("TestMain: Starting weed mini server...")
-		config := testutil.DefaultServerConfig(nil)
-		config.AccessKey = "some_access_key1"
-		config.SecretKey = "some_secret_key1"
-
-		var err error
-		testServer, err = testutil.StartServer(config)
-		if err != nil {
-			fmt.Printf("TestMain: ERROR - Failed to start test server: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println("TestMain: Server started successfully")
-		defer testServer.Stop()
-	}
-
-	// Run tests
-	fmt.Println("TestMain: Running tests...")
-	exitCode = m.Run()
-	fmt.Printf("TestMain: Tests completed with exit code %d\n", exitCode)
-	os.Exit(exitCode)
-}
@@ -204,11 +204,13 @@ test-cors-simple: check-deps
 	@go test -v -timeout=$(TEST_TIMEOUT) .
 	@echo "✅ All CORS tests completed"

-# Run tests with auto-managed server via TestMain
-test-with-server: check-deps
-	@echo "Running CORS tests with auto-managed server..."
-	@go test -v -timeout=10m ./...
-	@echo "✅ All tests completed"
+# Start server, run tests, stop server
+test-with-server: start-server
+	@echo "Running CORS tests with managed server..."
+	@sleep 5  # Give server time to fully start
+	@make test-cors-comprehensive || (echo "Tests failed, stopping server..." && make stop-server && exit 1)
+	@make stop-server
+	@echo "✅ All tests completed with managed server"

 # Health check
 health-check:
@@ -1,37 +0,0 @@
-package cors
-
-import (
-"fmt"
-"os"
-"testing"
-
-	"github.com/seaweedfs/seaweedfs/test/s3/testutil"
-func TestMain(m *testing.M) {
-	var exitCode int
-
-	fmt.Println("TestMain: Starting test setup...")
-
-	// Check if we should manage the server or use an existing one
-	if os.Getenv("USE_EXTERNAL_SERVER") != "true" {
-		// Start server using weed mini
-		fmt.Println("TestMain: Starting weed mini server...")
-		config := testutil.DefaultServerConfig(nil)
-		config.AccessKey = "some_access_key1"
-		config.SecretKey = "some_secret_key1"
-
-		var err error
-		testServer, err = testutil.StartServer(config)
-		if err != nil {
-			fmt.Printf("TestMain: ERROR - Failed to start test server: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println("TestMain: Server started successfully")
-		defer testServer.Stop()
-	}
-
-	// Run tests
-	fmt.Println("TestMain: Running tests...")
-	exitCode = m.Run()
-	fmt.Printf("TestMain: Tests completed with exit code %d\n", exitCode)
-	os.Exit(exitCode)
-}
@@ -1,44 +0,0 @@
-# Makefile for SeaweedFS S3 Delete tests
-# Tests auto-manage server via TestMain using weed mini
-
-.PHONY: test test-quick test-external test-with-server clean check-deps build
-
-# Build SeaweedFS binary if not exists
-build:
-	@echo "Building SeaweedFS binary..."
-	@cd ../../../ && make install
-	@which weed > /dev/null 2>&1 || (echo "SeaweedFS binary not found in PATH" && exit 1)
-
-# Check dependencies
-check-deps: build
-	@which weed > /dev/null 2>&1 || (echo "SeaweedFS binary not found in PATH" && exit 1)
-	@echo "✅ Dependencies available"
-
-# Run all tests (auto-manages weed mini server via TestMain)
-test: check-deps
-	@echo "Running all S3 delete tests..."
-	@go test -v -timeout=10m ./...
-
-# Run quick tests (uses TEST_PATTERN if provided)
-test-quick: check-deps
-	@echo "Running quick S3 delete tests..."
-	@if [ -z "$(TEST_PATTERN)" ]; then \
-		go test -v -timeout=10m ./...; \
-	else \
-		go test -v -timeout=10m -run "$(TEST_PATTERN)" ./...; \
-	fi
-
-# Run tests against external server (CI/CD mode)
-test-external: check-deps
-	@echo "Running tests against external server (USE_EXTERNAL_SERVER=true)..."
-	@USE_EXTERNAL_SERVER=true go test -v -timeout=10m ./...
-
-# Run tests with auto-managed server (CI/CD target)
-test-with-server: test
-
-# Clean up test artifacts
-clean:
-	@echo "Cleaning up test artifacts..."
-	@rm -f *.log *.pid
-	@go clean -testcache
-	@echo "✅ Cleanup completed"
@@ -1,164 +0,0 @@
-package delete
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/config"
-	"github.com/aws/aws-sdk-go-v2/credentials"
-	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-const (
-	testEndpoint  = "http://localhost:8333"
-	testAccessKey = "admin"
-	testSecretKey = "admin"
-	testRegion    = "us-east-1"
-)
-
-func getTestClient(t *testing.T) *s3.Client {
-	cfg, err := config.LoadDefaultConfig(context.TODO(),
-		config.WithRegion(testRegion),
-		config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(
-			testAccessKey,
-			testSecretKey,
-			"",
-		)),
-	)
-	require.NoError(t, err)
-
-	client := s3.NewFromConfig(cfg, func(o *s3.Options) {
-		o.BaseEndpoint = aws.String(testEndpoint)
-		o.UsePathStyle = true
-	})
-
-	return client
-}
-
-func createTestBucket(t *testing.T, client *s3.Client) string {
-	bucketName := fmt.Sprintf("test-multi-delete-%d", time.Now().UnixNano())
-	_, err := client.CreateBucket(context.TODO(), &s3.CreateBucketInput{
-		Bucket: aws.String(bucketName),
-	})
-	require.NoError(t, err)
-
-	_, err = client.PutBucketVersioning(context.TODO(), &s3.PutBucketVersioningInput{
-		Bucket: aws.String(bucketName),
-		VersioningConfiguration: &types.VersioningConfiguration{
-			Status: types.BucketVersioningStatusEnabled,
-		},
-	})
-	require.NoError(t, err)
-
-	return bucketName
-}
-
-func cleanupBucket(t *testing.T, client *s3.Client, bucket string) {
-	listResp, _ := client.ListObjectVersions(context.TODO(), &s3.ListObjectVersionsInput{
-		Bucket: aws.String(bucket),
-	})
-
-	if listResp != nil {
-		var objectsToDelete []types.ObjectIdentifier
-
-		for _, version := range listResp.Versions {
-			objectsToDelete = append(objectsToDelete, types.ObjectIdentifier{
-				Key:       version.Key,
-				VersionId: version.VersionId,
-			})
-		}
-
-		for _, marker := range listResp.DeleteMarkers {
-			objectsToDelete = append(objectsToDelete, types.ObjectIdentifier{
-				Key:       marker.Key,
-				VersionId: marker.VersionId,
-			})
-		}
-
-		if len(objectsToDelete) > 0 {
-			_, _ = client.DeleteObjects(context.TODO(), &s3.DeleteObjectsInput{
-				Bucket: aws.String(bucket),
-				Delete: &types.Delete{
-					Objects: objectsToDelete,
-					Quiet:   aws.Bool(false),
-				},
-			})
-		}
-	}
-
-	_, _ = client.DeleteBucket(context.TODO(), &s3.DeleteBucketInput{
-		Bucket: aws.String(bucket),
-	})
-}
-
-func TestVersioningMultiObjectDelete(t *testing.T) {
-	client := getTestClient(t)
-	bucket := createTestBucket(t, client)
-	defer cleanupBucket(t, client, bucket)
-
-	key := "key"
-	numVersions := 2
-	var versionIds []string
-
-	for i := 0; i < numVersions; i++ {
-		content := fmt.Sprintf("content-%d", i)
-		putResp, err := client.PutObject(context.TODO(), &s3.PutObjectInput{
-			Bucket: aws.String(bucket),
-			Key:    aws.String(key),
-			Body:   bytes.NewReader([]byte(content)),
-		})
-		require.NoError(t, err)
-		require.NotNil(t, putResp.VersionId)
-		versionIds = append(versionIds, *putResp.VersionId)
-	}
-
-	assert.Len(t, versionIds, 2)
-
-	var objectsToDelete []types.ObjectIdentifier
-	for _, vid := range versionIds {
-		objectsToDelete = append(objectsToDelete, types.ObjectIdentifier{
-			Key:       aws.String(key),
-			VersionId: aws.String(vid),
-		})
-	}
-
-	deleteResp, err := client.DeleteObjects(context.TODO(), &s3.DeleteObjectsInput{
-		Bucket: aws.String(bucket),
-		Delete: &types.Delete{
-			Objects: objectsToDelete,
-		},
-	})
-	require.NoError(t, err)
-	t.Logf("Delete response: Deleted=%d, Errors=%d", len(deleteResp.Deleted), len(deleteResp.Errors))
-
-	listResp, err := client.ListObjectVersions(context.TODO(), &s3.ListObjectVersionsInput{
-		Bucket: aws.String(bucket),
-	})
-	require.NoError(t, err)
-
-	if listResp.Versions != nil && len(listResp.Versions) > 0 {
-		t.Errorf("FAIL: Expected no versions, but found %d versions:", len(listResp.Versions))
-		for _, v := range listResp.Versions {
-			t.Logf("  - Key=%s, VersionId=%s, IsLatest=%v", *v.Key, *v.VersionId, v.IsLatest)
-		}
-	} else {
-		t.Logf("PASS: Versions correctly deleted")
-	}
-	assert.Nil(t, listResp.Versions, "Expected no versions after deletion")
-
-	deleteResp2, err := client.DeleteObjects(context.TODO(), &s3.DeleteObjectsInput{
-		Bucket: aws.String(bucket),
-		Delete: &types.Delete{
-			Objects: objectsToDelete,
-		},
-	})
-	require.NoError(t, err)
-	assert.Empty(t, deleteResp2.Errors, "Idempotent delete should not return errors")
-}
@@ -1,37 +0,0 @@
-package delete
-
-import (
-"fmt"
-"os"
-"testing"
-
-	"github.com/seaweedfs/seaweedfs/test/s3/testutil"
-func TestMain(m *testing.M) {
-	var exitCode int
-
-	fmt.Println("TestMain: Starting test setup...")
-
-	// Check if we should manage the server or use an existing one
-	if os.Getenv("USE_EXTERNAL_SERVER") != "true" {
-		// Start server using weed mini
-		fmt.Println("TestMain: Starting weed mini server...")
-		config := testutil.DefaultServerConfig(nil)
-		config.AccessKey = "some_access_key1"
-		config.SecretKey = "some_secret_key1"
-
-		var err error
-		testServer, err = testutil.StartServer(config)
-		if err != nil {
-			fmt.Printf("TestMain: ERROR - Failed to start test server: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println("TestMain: Server started successfully")
-		defer testServer.Stop()
-	}
-
-	// Run tests
-	fmt.Println("TestMain: Running tests...")
-	exitCode = m.Run()
-	fmt.Printf("TestMain: Tests completed with exit code %d\n", exitCode)
-	os.Exit(exitCode)
-}
@@ -1,52 +0,0 @@
-# ETag Format Integration Tests
-#
-# These tests verify S3 ETag format compatibility, particularly for large files
-# that trigger SeaweedFS auto-chunking. This addresses GitHub Issue #7768.
-#
-# Prerequisites:
-#   - SeaweedFS running with S3 API enabled on port 8333
-#   - Go 1.21+
-#
-# Usage:
-#   make test          - Run all tests
-#   make test-large    - Run only large file tests
-#   make test-verbose  - Run with verbose output
-#   make clean         - Clean test artifacts
-
-.PHONY: all test test-large test-verbose test-quick clean help
-
-# Default S3 endpoint
-S3_ENDPOINT ?= http://127.0.0.1:8333
-
-all: test
-
-test:
-	@echo "Running ETag format tests against $(S3_ENDPOINT)..."
-	S3_ENDPOINT=$(S3_ENDPOINT) go test -v -timeout 5m ./...
-
-test-large:
-	@echo "Running large file ETag tests..."
-	S3_ENDPOINT=$(S3_ENDPOINT) go test -v -timeout 5m -run "LargeFile|ExtraLarge" ./...
-
-test-verbose:
-	S3_ENDPOINT=$(S3_ENDPOINT) go test -v -timeout 5m -count=1 ./...
-
-test-quick:
-	@echo "Running quick ETag tests (small files only)..."
-	S3_ENDPOINT=$(S3_ENDPOINT) go test -v -timeout 1m -run "SmallFile|Consistency" ./...
-
-test-with-server: test
-
-clean:
-	go clean -testcache
-
-help:
-	@echo "ETag Format Integration Tests"
-	@echo "Targets:"
-	@echo "  test          Run all ETag format tests"
-	@echo "  test-large    Run only large file tests (>8MB)"
-	@echo "  test-quick    Run quick tests (small files only)"
-	@echo "  test-verbose  Run with verbose output"
-	@echo "  clean         Clean test cache"
-	@echo "Environment Variables:"
-	@echo "  S3_ENDPOINT   S3 endpoint URL (default: http://127.0.0.1:8333)"
@@ -1,93 +0,0 @@
-# S3 ETag Format Integration Tests
-
-This test suite verifies that SeaweedFS returns correct ETag formats for S3 operations, ensuring compatibility with AWS S3 SDKs.
-
-## Background
-
-**GitHub Issue #7768**: AWS S3 SDK for Java v2 was failing with `Invalid base 16 character: '-'` when performing `PutObject` on large files.
-
-### Root Cause
-
-SeaweedFS internally auto-chunks large files (>8MB) for efficient storage. Previously, when a regular `PutObject` request resulted in multiple internal chunks, SeaweedFS returned a composite ETag format (`<md5>-<count>`) instead of a pure MD5 hash.
-
-### AWS S3 Specification
-
-| Operation | ETag Format | Example |
-|-----------|-------------|---------|
-| PutObject (any size) | Pure MD5 hex (32 chars) | `d41d8cd98f00b204e9800998ecf8427e` |
-| CompleteMultipartUpload | Composite (`<md5>-<partcount>`) | `d41d8cd98f00b204e9800998ecf8427e-3` |
-
-AWS S3 SDK v2 for Java validates `PutObject` ETags as hexadecimal, which fails when the ETag contains a hyphen.
-
-## Test Coverage
-
-| Test | File Size | Purpose |
-|------|-----------|---------|
-| `TestPutObjectETagFormat_SmallFile` | 1KB | Verify single-chunk uploads return pure MD5 |
-| `TestPutObjectETagFormat_LargeFile` | 10MB | **Critical**: Verify auto-chunked uploads return pure MD5 |
-| `TestPutObjectETagFormat_ExtraLargeFile` | 25MB | Verify multi-chunk auto-chunked uploads return pure MD5 |
-| `TestMultipartUploadETagFormat` | 15MB | Verify multipart uploads correctly return composite ETag |
-| `TestPutObjectETagConsistency` | Various | Verify ETag consistency across PUT/HEAD/GET |
-| `TestETagHexValidation` | 10MB | Simulate AWS SDK v2 hex validation |
-| `TestMultipleLargeFileUploads` | 10MB x5 | Stress test multiple large uploads |
-
-## Prerequisites
-
-1. SeaweedFS running with S3 API enabled:
-   ```bash
-   weed server -s3
-   ```
-
-2. Go 1.21 or later
-
-3. AWS SDK v2 for Go (installed via go modules)
-
-## Running Tests
-
-```bash
-# Run all tests
-make test
-
-# Run only large file tests (the critical ones for issue #7768)
-make test-large
-
-# Run quick tests (small files only)
-make test-quick
-
-# Run with verbose output
-make test-verbose
-```
-
-## Configuration
-
-By default, tests connect to `http://127.0.0.1:8333`. To use a different endpoint:
-
-```bash
-S3_ENDPOINT=http://localhost:8333 make test
-```
-
-Or modify `defaultConfig` in `s3_etag_test.go`.
-
-## SDK Compatibility
-
-These tests use **AWS SDK v2 for Go**, which has the same ETag validation behavior as AWS SDK v2 for Java. The tests include:
-
- ETag format validation (pure MD5 vs composite)
- Hex decoding validation (simulates `Base16Codec.decode`)
- Content integrity verification
-
-## Validated SDK Versions
-
-| SDK | Version | Status |
-|-----|---------|--------|
-| AWS SDK v2 for Go | 1.20+ | ✅ Tested |
-| AWS SDK v2 for Java | 2.20+ | ✅ Compatible (issue #7768 fixed) |
-| AWS SDK v1 for Go | 1.x | ✅ Compatible (less strict validation) |
-| AWS SDK v1 for Java | 1.x | ✅ Compatible (less strict validation) |
-
-## Related
-
- [GitHub Issue #7768](https://github.com/seaweedfs/seaweedfs/issues/7768)
- [AWS S3 ETag Documentation](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Object.html)
-
-
@@ -1,543 +0,0 @@
-// Package etag_test provides integration tests for S3 ETag format validation.
-//
-// These tests verify that SeaweedFS returns correct ETag formats for different
-// upload scenarios, ensuring compatibility with AWS S3 SDKs that validate ETags.
-//
-// Background (GitHub Issue #7768):
-// AWS S3 SDK for Java v2 validates ETags as hexadecimal MD5 hashes for PutObject
-// responses. SeaweedFS was incorrectly returning composite ETags ("<md5>-<count>")
-// for regular PutObject when files were internally auto-chunked (>8MB), causing
-// the SDK to fail with "Invalid base 16 character: '-'".
-//
-// Per AWS S3 specification:
-// - Regular PutObject: ETag is always a pure MD5 hex string (32 chars)
-// - Multipart Upload (CompleteMultipartUpload): ETag is "<md5>-<partcount>"
-//
-// These tests ensure this behavior is maintained.
-package etag_test
-
-import (
-	"bytes"
-	"context"
-	"crypto/md5"
-	"crypto/rand"
-	"encoding/hex"
-	"fmt"
-	"io"
-	mathrand "math/rand"
-	"regexp"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/config"
-	"github.com/aws/aws-sdk-go-v2/credentials"
-	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// S3TestConfig holds configuration for S3 tests
-type S3TestConfig struct {
-	Endpoint     string
-	AccessKey    string
-	SecretKey    string
-	Region       string
-	BucketPrefix string
-}
-
-// Default test configuration
-var defaultConfig = &S3TestConfig{
-	Endpoint:     "http://127.0.0.1:8333",
-	AccessKey:    "some_access_key1",
-	SecretKey:    "some_secret_key1",
-	Region:       "us-east-1",
-	BucketPrefix: "test-etag-",
-}
-
-// Constants for auto-chunking thresholds (must match s3api_object_handlers_put.go)
-const (
-	// SeaweedFS auto-chunks files larger than 8MB
-	autoChunkSize = 8 * 1024 * 1024
-
-	// Test sizes
-	smallFileSize  = 1 * 1024              // 1KB - single chunk
-	mediumFileSize = 256 * 1024            // 256KB - single chunk (at threshold)
-	largeFileSize  = 10 * 1024 * 1024      // 10MB - triggers auto-chunking (2 chunks)
-	xlFileSize     = 25 * 1024 * 1024      // 25MB - triggers auto-chunking (4 chunks)
-	multipartSize  = 5 * 1024 * 1024       // 5MB per part for multipart uploads
-)
-
-// ETag format patterns
-var (
-	// Pure MD5 ETag: 32 hex characters (with or without quotes)
-	pureMD5Pattern = regexp.MustCompile(`^"?[a-f0-9]{32}"?$`)
-
-	// Composite ETag for multipart: 32 hex chars, hyphen, part count (with or without quotes)
-	compositePattern = regexp.MustCompile(`^"?[a-f0-9]{32}-\d+"?$`)
-)
-
-func init() {
-	mathrand.Seed(time.Now().UnixNano())
-}
-
-// getS3Client creates an AWS S3 v2 client for testing
-func getS3Client(t *testing.T) *s3.Client {
-	cfg, err := config.LoadDefaultConfig(context.TODO(),
-		config.WithRegion(defaultConfig.Region),
-		config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(
-			defaultConfig.AccessKey,
-			defaultConfig.SecretKey,
-			"",
-		)),
-		config.WithEndpointResolverWithOptions(aws.EndpointResolverWithOptionsFunc(
-			func(service, region string, options ...interface{}) (aws.Endpoint, error) {
-				return aws.Endpoint{
-					URL:               defaultConfig.Endpoint,
-					SigningRegion:     defaultConfig.Region,
-					HostnameImmutable: true,
-				}, nil
-			})),
-	)
-	require.NoError(t, err)
-
-	return s3.NewFromConfig(cfg, func(o *s3.Options) {
-		o.UsePathStyle = true
-	})
-}
-
-// getNewBucketName generates a unique bucket name
-func getNewBucketName() string {
-	timestamp := time.Now().UnixNano()
-	randomSuffix := mathrand.Intn(100000)
-	return fmt.Sprintf("%s%d-%d", defaultConfig.BucketPrefix, timestamp, randomSuffix)
-}
-
-// generateRandomData generates random test data of specified size
-func generateRandomData(size int) []byte {
-	data := make([]byte, size)
-	if _, err := rand.Read(data); err != nil {
-		panic(fmt.Sprintf("failed to generate random test data: %v", err))
-	}
-	return data
-}
-
-// calculateMD5 calculates the MD5 hash of data and returns hex string
-func calculateMD5(data []byte) string {
-	hash := md5.Sum(data)
-	return hex.EncodeToString(hash[:])
-}
-
-// cleanETag removes quotes from ETag
-func cleanETag(etag string) string {
-	return strings.Trim(etag, `"`)
-}
-
-// isPureMD5ETag checks if ETag is a pure MD5 hex string (no composite format)
-func isPureMD5ETag(etag string) bool {
-	return pureMD5Pattern.MatchString(etag)
-}
-
-// isCompositeETag checks if ETag is in composite format (md5-count)
-func isCompositeETag(etag string) bool {
-	return compositePattern.MatchString(etag)
-}
-
-// createTestBucket creates a new bucket for testing
-func createTestBucket(ctx context.Context, client *s3.Client, bucketName string) error {
-	_, err := client.CreateBucket(ctx, &s3.CreateBucketInput{
-		Bucket: aws.String(bucketName),
-	})
-	return err
-}
-
-// cleanupTestBucket deletes all objects and the bucket
-func cleanupTestBucket(ctx context.Context, client *s3.Client, bucketName string) {
-	// Delete all objects
-	paginator := s3.NewListObjectsV2Paginator(client, &s3.ListObjectsV2Input{
-		Bucket: aws.String(bucketName),
-	})
-
-	for paginator.HasMorePages() {
-		page, err := paginator.NextPage(ctx)
-		if err != nil {
-			break
-		}
-		for _, obj := range page.Contents {
-			client.DeleteObject(ctx, &s3.DeleteObjectInput{
-				Bucket: aws.String(bucketName),
-				Key:    obj.Key,
-			})
-		}
-	}
-
-	// Abort any in-progress multipart uploads
-	mpPaginator := s3.NewListMultipartUploadsPaginator(client, &s3.ListMultipartUploadsInput{
-		Bucket: aws.String(bucketName),
-	})
-	for mpPaginator.HasMorePages() {
-		page, err := mpPaginator.NextPage(ctx)
-		if err != nil {
-			break
-		}
-		for _, upload := range page.Uploads {
-			client.AbortMultipartUpload(ctx, &s3.AbortMultipartUploadInput{
-				Bucket:   aws.String(bucketName),
-				Key:      upload.Key,
-				UploadId: upload.UploadId,
-			})
-		}
-	}
-
-	// Delete bucket
-	client.DeleteBucket(ctx, &s3.DeleteBucketInput{
-		Bucket: aws.String(bucketName),
-	})
-}
-
-// TestPutObjectETagFormat_SmallFile verifies ETag format for small files (single chunk)
-func TestPutObjectETagFormat_SmallFile(t *testing.T) {
-	ctx := context.Background()
-	client := getS3Client(t)
-
-	bucketName := getNewBucketName()
-	err := createTestBucket(ctx, client, bucketName)
-	require.NoError(t, err, "Failed to create test bucket")
-	defer cleanupTestBucket(ctx, client, bucketName)
-
-	testData := generateRandomData(smallFileSize)
-	expectedMD5 := calculateMD5(testData)
-	objectKey := "small-file.bin"
-
-	// Upload small file
-	putResp, err := client.PutObject(ctx, &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   bytes.NewReader(testData),
-	})
-	require.NoError(t, err, "Failed to upload small file")
-
-	// Verify ETag format
-	etag := aws.ToString(putResp.ETag)
-	t.Logf("Small file (%d bytes) ETag: %s", smallFileSize, etag)
-
-	assert.True(t, isPureMD5ETag(etag),
-		"Small file ETag should be pure MD5, got: %s", etag)
-	assert.False(t, isCompositeETag(etag),
-		"Small file ETag should NOT be composite format, got: %s", etag)
-	assert.Equal(t, expectedMD5, cleanETag(etag),
-		"ETag should match calculated MD5")
-}
-
-// TestPutObjectETagFormat_LargeFile verifies ETag format for large files that trigger auto-chunking
-// This is the critical test for GitHub Issue #7768
-func TestPutObjectETagFormat_LargeFile(t *testing.T) {
-	ctx := context.Background()
-	client := getS3Client(t)
-
-	bucketName := getNewBucketName()
-	err := createTestBucket(ctx, client, bucketName)
-	require.NoError(t, err, "Failed to create test bucket")
-	defer cleanupTestBucket(ctx, client, bucketName)
-
-	testData := generateRandomData(largeFileSize)
-	expectedMD5 := calculateMD5(testData)
-	objectKey := "large-file.bin"
-
-	t.Logf("Uploading large file (%d bytes, > %d byte auto-chunk threshold)...",
-		largeFileSize, autoChunkSize)
-
-	// Upload large file (triggers auto-chunking internally)
-	putResp, err := client.PutObject(ctx, &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   bytes.NewReader(testData),
-	})
-	require.NoError(t, err, "Failed to upload large file")
-
-	// Verify ETag format - MUST be pure MD5, NOT composite
-	etag := aws.ToString(putResp.ETag)
-	t.Logf("Large file (%d bytes, ~%d internal chunks) ETag: %s",
-		largeFileSize, (largeFileSize/autoChunkSize)+1, etag)
-
-	assert.True(t, isPureMD5ETag(etag),
-		"Large file PutObject ETag MUST be pure MD5 (not composite), got: %s", etag)
-	assert.False(t, isCompositeETag(etag),
-		"Large file PutObject ETag should NOT contain '-' (composite format), got: %s", etag)
-	assert.False(t, strings.Contains(cleanETag(etag), "-"),
-		"ETag should not contain hyphen for regular PutObject, got: %s", etag)
-	assert.Equal(t, expectedMD5, cleanETag(etag),
-		"ETag should match calculated MD5 of entire content")
-
-	// Verify we can read back the object correctly
-	getResp, err := client.GetObject(ctx, &s3.GetObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	})
-	require.NoError(t, err, "Failed to get large file")
-	defer getResp.Body.Close()
-
-	downloadedData, err := io.ReadAll(getResp.Body)
-	require.NoError(t, err, "Failed to read large file content")
-	assert.Equal(t, testData, downloadedData, "Downloaded content should match uploaded content")
-}
-
-// TestPutObjectETagFormat_ExtraLargeFile tests even larger files with multiple internal chunks
-func TestPutObjectETagFormat_ExtraLargeFile(t *testing.T) {
-	ctx := context.Background()
-	client := getS3Client(t)
-
-	bucketName := getNewBucketName()
-	err := createTestBucket(ctx, client, bucketName)
-	require.NoError(t, err, "Failed to create test bucket")
-	defer cleanupTestBucket(ctx, client, bucketName)
-
-	testData := generateRandomData(xlFileSize)
-	expectedMD5 := calculateMD5(testData)
-	objectKey := "xl-file.bin"
-
-	expectedChunks := (xlFileSize / autoChunkSize) + 1
-	t.Logf("Uploading XL file (%d bytes, expected ~%d internal chunks)...",
-		xlFileSize, expectedChunks)
-
-	// Upload extra large file
-	putResp, err := client.PutObject(ctx, &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   bytes.NewReader(testData),
-	})
-	require.NoError(t, err, "Failed to upload XL file")
-
-	// Verify ETag format
-	etag := aws.ToString(putResp.ETag)
-	t.Logf("XL file (%d bytes) ETag: %s", xlFileSize, etag)
-
-	assert.True(t, isPureMD5ETag(etag),
-		"XL file PutObject ETag MUST be pure MD5, got: %s", etag)
-	assert.False(t, isCompositeETag(etag),
-		"XL file PutObject ETag should NOT be composite, got: %s", etag)
-	assert.Equal(t, expectedMD5, cleanETag(etag),
-		"ETag should match calculated MD5")
-}
-
-// TestMultipartUploadETagFormat verifies that ONLY multipart uploads get composite ETags
-func TestMultipartUploadETagFormat(t *testing.T) {
-	ctx := context.Background()
-	client := getS3Client(t)
-
-	bucketName := getNewBucketName()
-	err := createTestBucket(ctx, client, bucketName)
-	require.NoError(t, err, "Failed to create test bucket")
-	defer cleanupTestBucket(ctx, client, bucketName)
-
-	// Create test data for multipart upload (15MB = 3 parts of 5MB each)
-	totalSize := 15 * 1024 * 1024
-	testData := generateRandomData(totalSize)
-	objectKey := "multipart-file.bin"
-
-	expectedPartCount := (totalSize + multipartSize - 1) / multipartSize // ceiling division
-	t.Logf("Performing multipart upload (%d bytes, %d parts)...",
-		totalSize, expectedPartCount)
-
-	// Initiate multipart upload
-	createResp, err := client.CreateMultipartUpload(ctx, &s3.CreateMultipartUploadInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	})
-	require.NoError(t, err, "Failed to create multipart upload")
-
-	uploadId := createResp.UploadId
-	var completedParts []types.CompletedPart
-	partNumber := int32(1)
-
-	// Upload parts
-	for offset := 0; offset < totalSize; offset += multipartSize {
-		end := offset + multipartSize
-		if end > totalSize {
-			end = totalSize
-		}
-		partData := testData[offset:end]
-
-		uploadResp, err := client.UploadPart(ctx, &s3.UploadPartInput{
-			Bucket:     aws.String(bucketName),
-			Key:        aws.String(objectKey),
-			UploadId:   uploadId,
-			PartNumber: aws.Int32(partNumber),
-			Body:       bytes.NewReader(partData),
-		})
-		require.NoError(t, err, "Failed to upload part %d", partNumber)
-
-		completedParts = append(completedParts, types.CompletedPart{
-			ETag:       uploadResp.ETag,
-			PartNumber: aws.Int32(partNumber),
-		})
-		partNumber++
-	}
-
-	// Complete multipart upload
-	completeResp, err := client.CompleteMultipartUpload(ctx, &s3.CompleteMultipartUploadInput{
-		Bucket:   aws.String(bucketName),
-		Key:      aws.String(objectKey),
-		UploadId: uploadId,
-		MultipartUpload: &types.CompletedMultipartUpload{
-			Parts: completedParts,
-		},
-	})
-	require.NoError(t, err, "Failed to complete multipart upload")
-
-	// Verify ETag format - SHOULD be composite for multipart
-	etag := aws.ToString(completeResp.ETag)
-	t.Logf("Multipart upload ETag: %s", etag)
-
-	assert.True(t, isCompositeETag(etag),
-		"Multipart upload ETag SHOULD be composite format (md5-count), got: %s", etag)
-	assert.True(t, strings.Contains(cleanETag(etag), "-"),
-		"Multipart ETag should contain hyphen, got: %s", etag)
-
-	// Verify the part count in the ETag matches
-	parts := strings.Split(cleanETag(etag), "-")
-	require.Len(t, parts, 2, "Composite ETag should have format 'hash-count'")
-	assert.Equal(t, fmt.Sprintf("%d", len(completedParts)), parts[1],
-		"Part count in ETag should match number of parts uploaded")
-}
-
-// TestPutObjectETagConsistency verifies ETag consistency between PUT and GET
-func TestPutObjectETagConsistency(t *testing.T) {
-	ctx := context.Background()
-	client := getS3Client(t)
-
-	bucketName := getNewBucketName()
-	err := createTestBucket(ctx, client, bucketName)
-	require.NoError(t, err, "Failed to create test bucket")
-	defer cleanupTestBucket(ctx, client, bucketName)
-
-	testCases := []struct {
-		name string
-		size int
-	}{
-		{"tiny", 100},
-		{"small", smallFileSize},
-		{"medium", mediumFileSize},
-		{"large", largeFileSize},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			testData := generateRandomData(tc.size)
-			objectKey := fmt.Sprintf("consistency-test-%s.bin", tc.name)
-
-			// PUT object
-			putResp, err := client.PutObject(ctx, &s3.PutObjectInput{
-				Bucket: aws.String(bucketName),
-				Key:    aws.String(objectKey),
-				Body:   bytes.NewReader(testData),
-			})
-			require.NoError(t, err)
-			putETag := aws.ToString(putResp.ETag)
-
-			// HEAD object
-			headResp, err := client.HeadObject(ctx, &s3.HeadObjectInput{
-				Bucket: aws.String(bucketName),
-				Key:    aws.String(objectKey),
-			})
-			require.NoError(t, err)
-			headETag := aws.ToString(headResp.ETag)
-
-			// GET object
-			getResp, err := client.GetObject(ctx, &s3.GetObjectInput{
-				Bucket: aws.String(bucketName),
-				Key:    aws.String(objectKey),
-			})
-			require.NoError(t, err)
-			getETag := aws.ToString(getResp.ETag)
-			getResp.Body.Close()
-
-			// All ETags should match
-			t.Logf("%s (%d bytes): PUT=%s, HEAD=%s, GET=%s",
-				tc.name, tc.size, putETag, headETag, getETag)
-
-			assert.Equal(t, putETag, headETag,
-				"PUT and HEAD ETags should match")
-			assert.Equal(t, putETag, getETag,
-				"PUT and GET ETags should match")
-
-			// All should be pure MD5 (not composite) for regular PutObject
-			assert.True(t, isPureMD5ETag(putETag),
-				"PutObject ETag should be pure MD5, got: %s", putETag)
-		})
-	}
-}
-
-// TestETagHexValidation simulates the AWS SDK v2 validation that caused issue #7768
-func TestETagHexValidation(t *testing.T) {
-	ctx := context.Background()
-	client := getS3Client(t)
-
-	bucketName := getNewBucketName()
-	err := createTestBucket(ctx, client, bucketName)
-	require.NoError(t, err, "Failed to create test bucket")
-	defer cleanupTestBucket(ctx, client, bucketName)
-
-	// Test with a file large enough to trigger auto-chunking
-	testData := generateRandomData(largeFileSize)
-	objectKey := "hex-validation-test.bin"
-
-	putResp, err := client.PutObject(ctx, &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   bytes.NewReader(testData),
-	})
-	require.NoError(t, err)
-
-	etag := cleanETag(aws.ToString(putResp.ETag))
-
-	// Simulate AWS SDK v2's hex validation (Base16Codec.decode)
-	// This is what fails in issue #7768 when ETag contains '-'
-	t.Logf("Validating ETag as hex: %s", etag)
-
-	_, err = hex.DecodeString(etag)
-	assert.NoError(t, err,
-		"ETag should be valid hexadecimal (AWS SDK v2 validation). "+
-			"Got ETag: %s. If this fails with 'invalid byte', the ETag contains non-hex chars like '-'",
-		etag)
-}
-
-// TestMultipleLargeFileUploads verifies ETag format across multiple large uploads
-func TestMultipleLargeFileUploads(t *testing.T) {
-	ctx := context.Background()
-	client := getS3Client(t)
-
-	bucketName := getNewBucketName()
-	err := createTestBucket(ctx, client, bucketName)
-	require.NoError(t, err, "Failed to create test bucket")
-	defer cleanupTestBucket(ctx, client, bucketName)
-
-	numFiles := 5
-	for i := 0; i < numFiles; i++ {
-		testData := generateRandomData(largeFileSize)
-		expectedMD5 := calculateMD5(testData)
-		objectKey := fmt.Sprintf("large-file-%d.bin", i)
-
-		putResp, err := client.PutObject(ctx, &s3.PutObjectInput{
-			Bucket: aws.String(bucketName),
-			Key:    aws.String(objectKey),
-			Body:   bytes.NewReader(testData),
-		})
-		require.NoError(t, err, "Failed to upload file %d", i)
-
-		etag := aws.ToString(putResp.ETag)
-		t.Logf("File %d ETag: %s (expected MD5: %s)", i, etag, expectedMD5)
-
-		assert.True(t, isPureMD5ETag(etag),
-			"File %d ETag should be pure MD5, got: %s", i, etag)
-		assert.Equal(t, expectedMD5, cleanETag(etag),
-			"File %d ETag should match MD5", i)
-
-		// Validate as hex (AWS SDK v2 check)
-		_, err = hex.DecodeString(cleanETag(etag))
-		assert.NoError(t, err, "File %d ETag should be valid hex", i)
-	}
-}
-
@@ -1,37 +0,0 @@
-package s3api
-
-import (
-"fmt"
-"os"
-"testing"
-
-	"github.com/seaweedfs/seaweedfs/test/s3/testutil"
-func TestMain(m *testing.M) {
-	var exitCode int
-
-	fmt.Println("TestMain: Starting test setup...")
-
-	// Check if we should manage the server or use an existing one
-	if os.Getenv("USE_EXTERNAL_SERVER") != "true" {
-		// Start server using weed mini
-		fmt.Println("TestMain: Starting weed mini server...")
-		config := testutil.DefaultServerConfig(nil)
-		config.AccessKey = "some_access_key1"
-		config.SecretKey = "some_secret_key1"
-
-		var err error
-		testServer, err = testutil.StartServer(config)
-		if err != nil {
-			fmt.Printf("TestMain: ERROR - Failed to start test server: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println("TestMain: Server started successfully")
-		defer testServer.Stop()
-	}
-
-	// Run tests
-	fmt.Println("TestMain: Running tests...")
-	exitCode = m.Run()
-	fmt.Printf("TestMain: Tests completed with exit code %d\n", exitCode)
-	os.Exit(exitCode)
-}
@@ -1,20 +0,0 @@
-{
-  "endpoint": "http://127.0.0.1:8333",
-  "access_key": "some_access_key1",
-  "secret_key": "some_secret_key1",
-  "region": "us-east-1",
-  "bucket_prefix": "test-etag-",
-  "notes": {
-    "description": "S3 ETag format integration tests",
-    "issue": "https://github.com/seaweedfs/seaweedfs/issues/7768",
-    "auto_chunk_size": "8MB - files larger than this trigger auto-chunking",
-    "test_sizes": {
-      "small": "1KB - single chunk",
-      "medium": "256KB - at inline threshold", 
-      "large": "10MB - 2 internal chunks",
-      "xl": "25MB - 4 internal chunks"
-    }
-  }
-}
-
-
@@ -1,166 +0,0 @@
-# S3 Filer Group Test Makefile
-# This Makefile provides targets for running S3 filer group integration tests
-# These tests verify that S3 bucket operations work correctly when a filer group is configured.
-
-.PHONY: help build-weed check-deps start-server stop-server test test-with-server clean logs health-check
-
-# Configuration
-WEED_BINARY := ../../../weed/weed_binary
-S3_PORT := 8333
-MASTER_PORT := 9333
-MASTER_GRPC_PORT := 19333
-VOLUME_PORT := 8080
-FILER_PORT := 8888
-TEST_TIMEOUT := 10m
-TEST_PATTERN := Test
-
-# Filer group configuration
-FILER_GROUP := testgroup
-
-# Default target
-help:
-	@echo "S3 Filer Group Test Makefile"
-	@echo ""
-	@echo "Available targets:"
-	@echo "  help                    - Show this help message"
-	@echo "  build-weed             - Build the SeaweedFS binary"
-	@echo "  check-deps             - Check dependencies and build binary if needed"
-	@echo "  start-server           - Start SeaweedFS server with filer group"
-	@echo "  stop-server            - Stop SeaweedFS server"
-	@echo "  test                   - Run filer group tests (server must be running)"
-	@echo "  test-with-server       - Start server, run tests, stop server"
-	@echo "  logs                   - Show server logs"
-	@echo "  clean                  - Clean up test artifacts and stop server"
-	@echo "  health-check           - Check if server is accessible"
-	@echo ""
-	@echo "Configuration:"
-	@echo "  S3_PORT=${S3_PORT}"
-	@echo "  MASTER_GRPC_PORT=${MASTER_GRPC_PORT}"
-	@echo "  FILER_GROUP=${FILER_GROUP}"
-	@echo "  TEST_TIMEOUT=${TEST_TIMEOUT}"
-
-# Build the SeaweedFS binary
-build-weed:
-	@echo "Building SeaweedFS binary..."
-	@cd ../../../weed && go build -o weed_binary .
-	@chmod +x $(WEED_BINARY)
-	@echo "✅ SeaweedFS binary built at $(WEED_BINARY)"
-
-check-deps: build-weed
-	@echo "Checking dependencies..."
-	@command -v go >/dev/null 2>&1 || (echo "Go is required but not installed" && exit 1)
-	@echo "Go version: $$(go version)"
-	@test -f $(WEED_BINARY) || (echo "SeaweedFS binary not found at $(WEED_BINARY)" && exit 1)
-	@go list -m github.com/aws/aws-sdk-go-v2 >/dev/null 2>&1 || (echo "AWS SDK Go v2 not found. Run 'go mod tidy'." && exit 1)
-	@go list -m github.com/stretchr/testify >/dev/null 2>&1 || (echo "Testify not found. Run 'go mod tidy'." && exit 1)
-	@echo "✅ All dependencies are available"
-
-# Start SeaweedFS server with filer group configured
-start-server: check-deps
-	@echo "Starting SeaweedFS server with filer group: $(FILER_GROUP)..."
-	@rm -f weed-server.pid
-	@mkdir -p ./test-volume-data
-	@if netstat -tlnp 2>/dev/null | grep $(S3_PORT) >/dev/null; then \
-		echo "⚠️  Port $(S3_PORT) is already in use"; \
-		exit 1; \
-	fi
-	@echo "Launching SeaweedFS server with filer group $(FILER_GROUP)..."
-	@$(WEED_BINARY) server \
-		-debug \
-		-s3 \
-		-s3.port=$(S3_PORT) \
-		-s3.allowDeleteBucketNotEmpty=true \
-		-s3.config=../../../docker/compose/s3.json \
-		-filer \
-		-filer.maxMB=64 \
-		-filer.filerGroup=$(FILER_GROUP) \
-		-master.volumeSizeLimitMB=50 \
-		-volume.max=100 \
-		-dir=./test-volume-data \
-		-volume.preStopSeconds=1 \
-		-metricsPort=9325 \
-		> weed-test.log 2>&1 & echo $$! > weed-server.pid
-	@echo "Server PID: $$(cat weed-server.pid 2>/dev/null || echo 'PID file not found')"
-	@echo "Waiting for server to start (up to 90 seconds)..."
-	@for i in $$(seq 1 90); do \
-		if curl -s http://localhost:$(S3_PORT) >/dev/null 2>&1; then \
-			echo "✅ SeaweedFS server started successfully on port $(S3_PORT) with filer group $(FILER_GROUP)"; \
-			exit 0; \
-		fi; \
-		if [ $$i -eq 30 ]; then \
-			echo "⚠️  Server taking longer than expected (30s), checking logs..."; \
-			if [ -f weed-test.log ]; then \
-				tail -20 weed-test.log; \
-			fi; \
-		fi; \
-		sleep 1; \
-	done; \
-	echo "❌ Server failed to start within 90 seconds"; \
-	if [ -f weed-test.log ]; then \
-		cat weed-test.log; \
-	fi; \
-	exit 1
-
-# Stop SeaweedFS server
-stop-server:
-	@echo "Stopping SeaweedFS server..."
-	@if [ -f weed-server.pid ]; then \
-		SERVER_PID=$$(cat weed-server.pid); \
-		echo "Killing server PID $$SERVER_PID"; \
-		if ps -p $$SERVER_PID >/dev/null 2>&1; then \
-			kill -TERM $$SERVER_PID 2>/dev/null || true; \
-			sleep 2; \
-			if ps -p $$SERVER_PID >/dev/null 2>&1; then \
-				echo "Process still running, sending KILL signal..."; \
-				kill -KILL $$SERVER_PID 2>/dev/null || true; \
-				sleep 1; \
-			fi; \
-		else \
-			echo "Process $$SERVER_PID not found (already stopped)"; \
-		fi; \
-		rm -f weed-server.pid; \
-	else \
-		echo "No PID file found"; \
-	fi
-	@echo "✅ SeaweedFS server stopped"
-
-# Show server logs
-logs:
-	@if test -f weed-test.log; then \
-		echo "=== SeaweedFS Server Logs ==="; \
-		tail -f weed-test.log; \
-	else \
-		echo "No log file found. Server may not be running."; \
-	fi
-
-# Run filer group tests (assumes server is already running)
-test: check-deps
-	@echo "Running filer group S3 tests..."
-	@FILER_GROUP=$(FILER_GROUP) S3_ENDPOINT=http://localhost:$(S3_PORT) MASTER_ADDRESS=localhost:$(MASTER_GRPC_PORT) \
-		go test -v -timeout=$(TEST_TIMEOUT) -run "$(TEST_PATTERN)" .
-	@echo "✅ Filer group tests completed"
-
-# Run tests with auto-managed server via TestMain
-test-with-server: check-deps
-	@echo "Running filer group tests with auto-managed server..."
-	@if [ -z "$(TEST_PATTERN)" ]; then \
-		go test -v -timeout=$(TEST_TIMEOUT) ./...; \
-	else \
-		go test -v -timeout=$(TEST_TIMEOUT) -run "$(TEST_PATTERN)" ./...; \
-	fi
-	@echo "✅ Tests completed"
-
-# Clean up test artifacts
-clean:
-	@echo "Cleaning up test artifacts..."
-	@$(MAKE) stop-server
-	@rm -f weed-test*.log weed-server.pid
-	@rm -rf test-volume-data/
-	@go clean -testcache
-	@echo "✅ Cleanup completed"
-
-# Quick health check
-health-check:
-	@echo "Running health check..."
-	@curl -s http://localhost:$(S3_PORT) >/dev/null 2>&1 && echo "✅ S3 API is accessible" || echo "❌ S3 API is not accessible"
-	@curl -s http://localhost:9325/metrics >/dev/null 2>&1 && echo "✅ Metrics endpoint is accessible" || echo "❌ Metrics endpoint is not accessible"
@@ -1,99 +0,0 @@
-# Filer Group S3 Tests
-
-These tests verify that S3 bucket operations work correctly when a filer group is configured.
-
-## Background
-
-When SeaweedFS is configured with a filer group (via `-filer.group` option), collections are named with the filer group prefix:
-
-```text
-Collection name = {filerGroup}_{bucketName}
-```
-
-For example, with filer group `mygroup` and bucket `mybucket`, the collection will be named `mygroup_mybucket`.
-
-## Issue Being Tested
-
-This test suite was created to verify the fix for a bug where:
- The admin UI was using just the bucket name when deleting collections
- This caused collection deletion to fail when a filer group was configured
- After bucket deletion via admin UI, the collection data would be orphaned
-
-## Running the Tests
-
-### Prerequisites
-
-1. SeaweedFS servers must be running with a filer group configured
-2. The S3 gateway must be accessible
-3. Master server must be accessible for collection verification
-
-### Quick Start
-
-```bash
-# Set environment variables
-export FILER_GROUP=testgroup
-export S3_ENDPOINT=http://localhost:8333
-export MASTER_ADDRESS=localhost:9333
-
-# Run tests
-go test -v ./...
-```
-
-### Using the Makefile
-
-```bash
-# Start test servers with filer group configured
-make start-servers FILER_GROUP=testgroup
-
-# Run tests
-make test
-
-# Stop servers
-make stop-servers
-
-# Or run full test cycle
-make full-test
-```
-
-### Configuration
-
-Tests can be configured via:
-
-1. Environment variables:
-   - `FILER_GROUP`: The filer group name (required for tests to run)
-   - `S3_ENDPOINT`: S3 API endpoint (default: `http://localhost:8333`)
-   - `MASTER_ADDRESS`: Master server address (default: localhost:9333)
-
-2. `test_config.json` file
-
-## Test Cases
-
-### TestFilerGroupCollectionNaming
-Verifies that when a bucket is created and objects are uploaded:
-1. The collection is created with the correct filer group prefix
-2. Bucket deletion removes the correctly-named collection
-
-### TestBucketDeletionWithFilerGroup
-Specifically tests that bucket deletion via S3 API correctly deletes
-the collection when filer group is configured.
-
-### TestMultipleBucketsWithFilerGroup
-Tests creating and deleting multiple buckets to ensure the filer group
-prefix is correctly applied and removed for all buckets.
-
-## Expected Behavior
-
-With filer group `testgroup`:
-
-| Bucket Name | Expected Collection Name |
-|-------------|-------------------------|
-| mybucket    | testgroup_mybucket      |
-| test-123    | testgroup_test-123      |
-
-Without filer group:
-
-| Bucket Name | Expected Collection Name |
-|-------------|-------------------------|
-| mybucket    | mybucket                |
-| test-123    | test-123                |
-
@@ -1,332 +0,0 @@
-package filer_group
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"os"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/config"
-	"github.com/aws/aws-sdk-go-v2/credentials"
-	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
-	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
-)
-
-// TestConfig holds configuration for filer group S3 tests
-type TestConfig struct {
-	S3Endpoint    string `json:"s3_endpoint"`
-	MasterAddress string `json:"master_address"`
-	AccessKey     string `json:"access_key"`
-	SecretKey     string `json:"secret_key"`
-	Region        string `json:"region"`
-	FilerGroup    string `json:"filer_group"`
-}
-
-var testConfig = &TestConfig{
-	S3Endpoint:    "http://localhost:8333",
-	MasterAddress: "localhost:19333", // gRPC port = 10000 + master HTTP port (9333)
-	AccessKey:     "some_access_key1",
-	SecretKey:     "some_secret_key1",
-	Region:        "us-east-1",
-	FilerGroup:    "testgroup", // Expected filer group for these tests
-}
-
-func init() {
-	// Load config from file if exists
-	if data, err := os.ReadFile("test_config.json"); err == nil {
-		if err := json.Unmarshal(data, testConfig); err != nil {
-			// Log but don't fail - env vars can still override
-			fmt.Fprintf(os.Stderr, "Warning: failed to parse test_config.json: %v\n", err)
-		}
-	}
-
-	// Override from environment variables
-	if v := os.Getenv("S3_ENDPOINT"); v != "" {
-		testConfig.S3Endpoint = v
-	}
-	if v := os.Getenv("MASTER_ADDRESS"); v != "" {
-		testConfig.MasterAddress = v
-	}
-	if v := os.Getenv("FILER_GROUP"); v != "" {
-		testConfig.FilerGroup = v
-	}
-}
-
-func getS3Client(t *testing.T) *s3.Client {
-	cfg, err := config.LoadDefaultConfig(context.TODO(),
-		config.WithRegion(testConfig.Region),
-		config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(
-			testConfig.AccessKey,
-			testConfig.SecretKey,
-			"",
-		)),
-	)
-	require.NoError(t, err)
-
-	return s3.NewFromConfig(cfg, func(o *s3.Options) {
-		o.BaseEndpoint = aws.String(testConfig.S3Endpoint)
-		o.UsePathStyle = true
-	})
-}
-
-func getMasterClient(t *testing.T) master_pb.SeaweedClient {
-	conn, err := grpc.NewClient(testConfig.MasterAddress, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	require.NoError(t, err)
-	t.Cleanup(func() { conn.Close() })
-	return master_pb.NewSeaweedClient(conn)
-}
-
-func getNewBucketName() string {
-	return fmt.Sprintf("filergroup-test-%d", time.Now().UnixNano())
-}
-
-// getExpectedCollectionName returns the expected collection name for a bucket
-// When filer group is configured, collections are named: {filerGroup}_{bucketName}
-func getExpectedCollectionName(bucketName string) string {
-	if testConfig.FilerGroup != "" {
-		return fmt.Sprintf("%s_%s", testConfig.FilerGroup, bucketName)
-	}
-	return bucketName
-}
-
-// listAllCollections returns a list of all collection names from the master
-func listAllCollections(t *testing.T, masterClient master_pb.SeaweedClient) []string {
-	collectionResp, err := masterClient.CollectionList(context.Background(), &master_pb.CollectionListRequest{
-		IncludeNormalVolumes: true,
-		IncludeEcVolumes:     true,
-	})
-	if err != nil {
-		t.Logf("Warning: failed to list collections: %v", err)
-		return nil
-	}
-	var names []string
-	for _, c := range collectionResp.Collections {
-		names = append(names, c.Name)
-	}
-	return names
-}
-
-// collectionExists checks if a collection exists in the master
-func collectionExists(t *testing.T, masterClient master_pb.SeaweedClient, collectionName string) bool {
-	for _, name := range listAllCollections(t, masterClient) {
-		if name == collectionName {
-			return true
-		}
-	}
-	return false
-}
-
-// waitForCollectionExists waits for a collection to exist using polling
-func waitForCollectionExists(t *testing.T, masterClient master_pb.SeaweedClient, collectionName string) {
-	var lastCollections []string
-	success := assert.Eventually(t, func() bool {
-		lastCollections = listAllCollections(t, masterClient)
-		for _, name := range lastCollections {
-			if name == collectionName {
-				return true
-			}
-		}
-		return false
-	}, 10*time.Second, 200*time.Millisecond)
-	if !success {
-		t.Fatalf("collection %s should be created; existing collections: %v", collectionName, lastCollections)
-	}
-}
-
-// waitForCollectionDeleted waits for a collection to be deleted using polling
-func waitForCollectionDeleted(t *testing.T, masterClient master_pb.SeaweedClient, collectionName string) {
-	require.Eventually(t, func() bool {
-		return !collectionExists(t, masterClient, collectionName)
-	}, 10*time.Second, 200*time.Millisecond, "collection %s should be deleted", collectionName)
-}
-
-// TestFilerGroupCollectionNaming verifies that when a filer group is configured,
-// collections are created with the correct prefix ({filerGroup}_{bucketName})
-func TestFilerGroupCollectionNaming(t *testing.T) {
-	if testConfig.FilerGroup == "" {
-		t.Skip("Skipping test: FILER_GROUP not configured. Set FILER_GROUP environment variable or configure in test_config.json")
-	}
-
-	s3Client := getS3Client(t)
-	masterClient := getMasterClient(t)
-	bucketName := getNewBucketName()
-	expectedCollection := getExpectedCollectionName(bucketName)
-
-	t.Logf("Testing with filer group: %s", testConfig.FilerGroup)
-	t.Logf("Bucket name: %s", bucketName)
-	t.Logf("Expected collection name: %s", expectedCollection)
-
-	// Create bucket
-	_, err := s3Client.CreateBucket(context.Background(), &s3.CreateBucketInput{
-		Bucket: aws.String(bucketName),
-	})
-	require.NoError(t, err, "CreateBucket should succeed")
-
-	// Upload an object to trigger collection creation
-	_, err = s3Client.PutObject(context.Background(), &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String("test-object"),
-		Body:   strings.NewReader("test content"),
-	})
-	require.NoError(t, err, "PutObject should succeed")
-
-	// Wait for collection to be visible using polling
-	waitForCollectionExists(t, masterClient, expectedCollection)
-
-	// Verify collection exists with correct name
-	require.True(t, collectionExists(t, masterClient, expectedCollection),
-		"Collection %s should exist (filer group prefix applied)", expectedCollection)
-
-	// Cleanup: delete object and bucket
-	_, err = s3Client.DeleteObject(context.Background(), &s3.DeleteObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String("test-object"),
-	})
-	require.NoError(t, err, "DeleteObject should succeed")
-
-	_, err = s3Client.DeleteBucket(context.Background(), &s3.DeleteBucketInput{
-		Bucket: aws.String(bucketName),
-	})
-	require.NoError(t, err, "DeleteBucket should succeed")
-
-	// Wait for collection to be deleted using polling
-	waitForCollectionDeleted(t, masterClient, expectedCollection)
-
-	t.Log("SUCCESS: Collection naming with filer group works correctly")
-}
-
-// TestBucketDeletionWithFilerGroup verifies that bucket deletion correctly
-// deletes the collection when filer group is configured
-func TestBucketDeletionWithFilerGroup(t *testing.T) {
-	if testConfig.FilerGroup == "" {
-		t.Skip("Skipping test: FILER_GROUP not configured")
-	}
-
-	s3Client := getS3Client(t)
-	masterClient := getMasterClient(t)
-	bucketName := getNewBucketName()
-	expectedCollection := getExpectedCollectionName(bucketName)
-
-	// Create bucket and add an object
-	_, err := s3Client.CreateBucket(context.Background(), &s3.CreateBucketInput{
-		Bucket: aws.String(bucketName),
-	})
-	require.NoError(t, err)
-
-	_, err = s3Client.PutObject(context.Background(), &s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String("test-object"),
-		Body:   strings.NewReader("test content"),
-	})
-	require.NoError(t, err)
-
-	// Wait for collection to be created using polling
-	waitForCollectionExists(t, masterClient, expectedCollection)
-
-	// Verify collection exists before deletion
-	require.True(t, collectionExists(t, masterClient, expectedCollection),
-		"Collection should exist before bucket deletion")
-
-	// Delete object first
-	_, err = s3Client.DeleteObject(context.Background(), &s3.DeleteObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String("test-object"),
-	})
-	require.NoError(t, err)
-
-	// Delete bucket
-	_, err = s3Client.DeleteBucket(context.Background(), &s3.DeleteBucketInput{
-		Bucket: aws.String(bucketName),
-	})
-	require.NoError(t, err, "DeleteBucket should succeed")
-
-	// Wait for collection to be deleted using polling
-	waitForCollectionDeleted(t, masterClient, expectedCollection)
-
-	// Verify collection was deleted
-	require.False(t, collectionExists(t, masterClient, expectedCollection),
-		"Collection %s should be deleted after bucket deletion", expectedCollection)
-
-	t.Log("SUCCESS: Bucket deletion with filer group correctly deletes collection")
-}
-
-// TestMultipleBucketsWithFilerGroup tests creating and deleting multiple buckets
-func TestMultipleBucketsWithFilerGroup(t *testing.T) {
-	if testConfig.FilerGroup == "" {
-		t.Skip("Skipping test: FILER_GROUP not configured")
-	}
-
-	s3Client := getS3Client(t)
-	masterClient := getMasterClient(t)
-
-	buckets := make([]string, 3)
-	for i := 0; i < 3; i++ {
-		buckets[i] = getNewBucketName()
-	}
-
-	// Create all buckets and add objects
-	for _, bucket := range buckets {
-		_, err := s3Client.CreateBucket(context.Background(), &s3.CreateBucketInput{
-			Bucket: aws.String(bucket),
-		})
-		require.NoError(t, err)
-
-		_, err = s3Client.PutObject(context.Background(), &s3.PutObjectInput{
-			Bucket: aws.String(bucket),
-			Key:    aws.String("test-object"),
-			Body:   strings.NewReader("test content"),
-		})
-		require.NoError(t, err)
-	}
-
-	// Wait for all collections to be created using polling
-	for _, bucket := range buckets {
-		expectedCollection := getExpectedCollectionName(bucket)
-		waitForCollectionExists(t, masterClient, expectedCollection)
-	}
-
-	// Verify all collections exist with correct naming
-	for _, bucket := range buckets {
-		expectedCollection := getExpectedCollectionName(bucket)
-		require.True(t, collectionExists(t, masterClient, expectedCollection),
-			"Collection %s should exist for bucket %s", expectedCollection, bucket)
-	}
-
-	// Delete all buckets
-	for _, bucket := range buckets {
-		_, err := s3Client.DeleteObject(context.Background(), &s3.DeleteObjectInput{
-			Bucket: aws.String(bucket),
-			Key:    aws.String("test-object"),
-		})
-		require.NoError(t, err)
-
-		_, err = s3Client.DeleteBucket(context.Background(), &s3.DeleteBucketInput{
-			Bucket: aws.String(bucket),
-		})
-		require.NoError(t, err)
-	}
-
-	// Wait for all collections to be deleted using polling
-	for _, bucket := range buckets {
-		expectedCollection := getExpectedCollectionName(bucket)
-		waitForCollectionDeleted(t, masterClient, expectedCollection)
-	}
-
-	// Verify all collections are deleted
-	for _, bucket := range buckets {
-		expectedCollection := getExpectedCollectionName(bucket)
-		require.False(t, collectionExists(t, masterClient, expectedCollection),
-			"Collection %s should be deleted for bucket %s", expectedCollection, bucket)
-	}
-
-	t.Log("SUCCESS: Multiple bucket operations with filer group work correctly")
-}
@@ -1,37 +0,0 @@
-package filer_group
-
-import (
-"fmt"
-"os"
-"testing"
-
-	"github.com/seaweedfs/seaweedfs/test/s3/testutil"
-func TestMain(m *testing.M) {
-	var exitCode int
-
-	fmt.Println("TestMain: Starting test setup...")
-
-	// Check if we should manage the server or use an existing one
-	if os.Getenv("USE_EXTERNAL_SERVER") != "true" {
-		// Start server using weed mini
-		fmt.Println("TestMain: Starting weed mini server...")
-		config := testutil.DefaultServerConfig(nil)
-		config.AccessKey = "some_access_key1"
-		config.SecretKey = "some_secret_key1"
-
-		var err error
-		testServer, err = testutil.StartServer(config)
-		if err != nil {
-			fmt.Printf("TestMain: ERROR - Failed to start test server: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println("TestMain: Server started successfully")
-		defer testServer.Stop()
-	}
-
-	// Run tests
-	fmt.Println("TestMain: Running tests...")
-	exitCode = m.Run()
-	fmt.Printf("TestMain: Tests completed with exit code %d\n", exitCode)
-	os.Exit(exitCode)
-}
@@ -1,8 +0,0 @@
-{
-  "s3_endpoint": "http://localhost:8333",
-  "master_address": "localhost:9333",
-  "access_key": "some_access_key1",
-  "secret_key": "some_secret_key1",
-  "region": "us-east-1",
-  "filer_group": "testgroup"
-}
@@ -1,6 +1,6 @@
 # SeaweedFS S3 IAM Integration Tests Makefile

-.PHONY: all test clean setup start-services stop-services wait-for-services help test-with-server
+.PHONY: all test clean setup start-services stop-services wait-for-services help

 # Default target
 all: test
@@ -48,8 +48,6 @@ test: clean setup start-services run-tests stop-services ## Run complete IAM int

 test-quick: run-tests ## Run tests assuming services are already running

-test-with-server: run-tests ## Run tests with auto-managed server (TestMain)
-
 run-tests: ## Execute the Go tests
 	@echo "🧪 Running S3 IAM Integration Tests..."
 	go test -v -timeout $(TEST_TIMEOUT) ./...
@@ -558,14 +558,13 @@ func TestS3IAMPresignedURLIntegration(t *testing.T) {
 	adminClient, err := framework.CreateS3ClientWithJWT("admin-user", "TestAdminRole")
 	require.NoError(t, err)

-	// Use unique bucket name to avoid conflicts with other tests
-	bucketName := framework.GenerateUniqueBucketName("test-iam-presigned")
-	err = framework.CreateBucket(adminClient, bucketName)
+	// Use static bucket name but with cleanup to handle conflicts
+	err = framework.CreateBucketWithCleanup(adminClient, testBucket)
 	require.NoError(t, err)

 	// Put test object
 	_, err = adminClient.PutObject(&s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
+		Bucket: aws.String(testBucket),
 		Key:    aws.String(testObjectKey),
 		Body:   strings.NewReader(testObjectData),
 	})
@@ -587,7 +586,7 @@ func TestS3IAMPresignedURLIntegration(t *testing.T) {

 		// Test direct object access with JWT Bearer token (recommended approach)
 		_, err := adminClient.GetObject(&s3.GetObjectInput{
-			Bucket: aws.String(bucketName),
+			Bucket: aws.String(testBucket),
 			Key:    aws.String(testObjectKey),
 		})
 		require.NoError(t, err, "Direct object access with JWT Bearer token works correctly")
@@ -598,13 +597,13 @@ func TestS3IAMPresignedURLIntegration(t *testing.T) {

 	// Cleanup
 	_, err = adminClient.DeleteObject(&s3.DeleteObjectInput{
-		Bucket: aws.String(bucketName),
+		Bucket: aws.String(testBucket),
 		Key:    aws.String(testObjectKey),
 	})
 	require.NoError(t, err)

 	_, err = adminClient.DeleteBucket(&s3.DeleteBucketInput{
-		Bucket: aws.String(bucketName),
+		Bucket: aws.String(testBucket),
 	})
 	require.NoError(t, err)
 }
@@ -1,42 +0,0 @@
-package iam
-
-import (
-	"fmt"
-	"os"
-	"testing"
-
-	"github.com/seaweedfs/seaweedfs/test/s3/testutil"
-)
-
-var testServer *testutil.TestServer
-
-// TestMain sets up and tears down the test environment using weed mini
-func TestMain(m *testing.M) {
-	var exitCode int
-
-	fmt.Println("TestMain: Starting test setup...")
-
-	// Check if we should manage the server or use an existing one
-	if os.Getenv("USE_EXTERNAL_SERVER") != "true" {
-		// Start server using weed mini
-		fmt.Println("TestMain: Starting weed mini server...")
-		config := testutil.DefaultServerConfig(nil)
-		config.AccessKey = "some_access_key1"
-		config.SecretKey = "some_secret_key1"
-
-		var err error
-		testServer, err = testutil.StartServer(config)
-		if err != nil {
-			fmt.Printf("TestMain: ERROR - Failed to start test server: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println("TestMain: Server started successfully")
-		defer testServer.Stop()
-	}
-
-	// Run tests
-	fmt.Println("TestMain: Running tests...")
-	exitCode = m.Run()
-	fmt.Printf("TestMain: Tests completed with exit code %d\n", exitCode)
-	os.Exit(exitCode)
-}
@@ -36,7 +36,7 @@
    "sts": {
      "tokenDuration": "15m",
      "issuer": "seaweedfs-sts",
-      "signingKey": "dGVzdC1zaWduaW5nLWtleS0zMi1jaGFyYWN0ZXJzLWxvbmc="
+      "signingKey": "test-sts-signing-key-for-integration-tests"
    },
    "policy": {
      "defaultEffect": "Deny"
@@ -1,86 +0,0 @@
-#!/usr/bin/env python3
-"""Debug script to understand what pads.write_dataset creates."""
-
-import sys
-import pyarrow as pa
-import pyarrow.dataset as pads
-import s3fs
-
-# Create a simple test table
-table = pa.table({'id': [1, 2, 3], 'value': [1.0, 2.0, 3.0]})
-
-# Initialize S3 filesystem
-fs = s3fs.S3FileSystem(
-    client_kwargs={'endpoint_url': 'http://localhost:8333'},
-    key='some_access_key1',
-    secret='some_secret_key1',
-    use_listings_cache=False,
-)
-
-# Create bucket
-if not fs.exists('test-bucket'):
-    fs.mkdir('test-bucket')
-
-# Write with pads.write_dataset
-test_path = 's3://test-bucket/test-write-simple/'
-print(f"Writing to: {test_path}")
-print(f"Table schema: {table.schema}")
-print(f"Table rows: {table.num_rows}")
-
-try:
-    pads.write_dataset(table, test_path, format='parquet', filesystem=fs)
-    print("\n✓ Write succeeded")
-    
-    # List all files recursively
-    print(f"\nListing all files recursively under {test_path}:")
-    import os
-    base_path = 'test-bucket/test-write-simple'
-    def list_recursive(path, indent=0):
-        try:
-            items = fs.ls(path, detail=False)
-            for item in items:
-                is_dir = fs.isdir(item)
-                item_name = item.split('/')[-1] if '/' in item else item
-                if is_dir:
-                    print(f"{'  ' * indent}📁 {item_name}/")
-                    list_recursive(item, indent + 1)
-                else:
-                    # Get file size
-                    try:
-                        info = fs.info(item)
-                        size = info.get('size', 0)
-                        print(f"{'  ' * indent}📄 {item_name} ({size} bytes)")
-                    except:
-                        print(f"{'  ' * indent}📄 {item_name}")
-        except Exception as e:
-            print(f"{'  ' * indent}Error listing {path}: {e}")
-
-    list_recursive(base_path)
-    
-    # Try to read back with different methods
-    print(f"\n\nTrying to read back using different methods:")
-    
-    # Method 1: pads.dataset with the same path
-    print(f"\n1. pads.dataset('{test_path}'):")
-    try:
-        dataset = pads.dataset(test_path, format='parquet', filesystem=fs)
-        result = dataset.to_table()
-        print(f"   ✓ Success: {result.num_rows} rows")
-    except Exception as e:
-        print(f"   ✗ Failed: {e}")
-    
-    # Method 2: pads.dataset with the dir containing parquet files
-    print(f"\n2. pads.dataset without trailing slash:")
-    test_path_no_slash = 's3://test-bucket/test-write-simple'
-    try:
-        dataset = pads.dataset(test_path_no_slash, format='parquet', filesystem=fs)
-        result = dataset.to_table()
-        print(f"   ✓ Success: {result.num_rows} rows")
-    except Exception as e:
-        print(f"   ✗ Failed: {e}")
-
-except Exception as e:
-    import traceback
-    print(f"✗ Error: {e}")
-    traceback.print_exc()
-    sys.exit(1)
@@ -182,7 +182,7 @@ def test_explicit_directory_marker(fs, s3_client):
    logger.info("="*80)
    
    # Create an explicit directory marker
-    logger.info(f"Creating explicit directory: {BUCKET_NAME}/explicit_dir/")
+    logger.info(f"\nCreating explicit directory: {BUCKET_NAME}/explicit_dir/")
    try:
        s3_client.put_object(
            Bucket=BUCKET_NAME,
@@ -1,206 +0,0 @@
-# Remote Storage Cache Integration Tests
-# Tests the remote object caching functionality with singleflight deduplication
-# Uses two SeaweedFS instances: primary (with caching) and secondary (as remote storage)
-
-.PHONY: all help build-weed check-deps start-remote stop-remote start-primary stop-primary \
-        setup-remote test test-with-server clean logs logs-primary logs-remote health
-
-all: test-with-server
-
-# Configuration
-WEED_BINARY := ../../../weed/weed_binary
-
-# Primary SeaweedFS (the one being tested - has remote caching)
-PRIMARY_S3_PORT := 8333
-PRIMARY_FILER_PORT := 8888
-PRIMARY_MASTER_PORT := 9333
-PRIMARY_VOLUME_PORT := 8080
-PRIMARY_METRICS_PORT := 9324
-PRIMARY_DIR := ./test-primary-data
-
-# Secondary SeaweedFS (acts as "remote" S3 storage)
-REMOTE_S3_PORT := 8334
-REMOTE_FILER_PORT := 8889
-REMOTE_MASTER_PORT := 9334
-REMOTE_VOLUME_PORT := 8081
-REMOTE_METRICS_PORT := 9325
-REMOTE_DIR := ./test-remote-data
-
-# Test configuration
-TEST_TIMEOUT := 10m
-TEST_PATTERN := TestRemoteCache
-
-# Buckets
-REMOTE_BUCKET := remotesourcebucket
-
-# Default target
-help:
-	@echo "Remote Storage Cache Integration Tests"
-	@echo ""
-	@echo "Uses two SeaweedFS instances:"
-	@echo "  - Primary (port $(PRIMARY_S3_PORT)): Being tested, has remote caching"
-	@echo "  - Remote  (port $(REMOTE_S3_PORT)): Acts as remote S3 storage"
-	@echo ""
-	@echo "Available targets:"
-	@echo "  help              - Show this help message"
-	@echo "  build-weed        - Build the SeaweedFS binary"
-	@echo "  check-deps        - Check dependencies"
-	@echo "  start-remote      - Start remote SeaweedFS (secondary)"
-	@echo "  stop-remote       - Stop remote SeaweedFS"
-	@echo "  start-primary     - Start primary SeaweedFS"
-	@echo "  stop-primary      - Stop primary SeaweedFS"
-	@echo "  setup-remote      - Configure remote storage mount"
-	@echo "  test              - Run tests (assumes servers are running)"
-	@echo "  test-with-server  - Start servers, run tests, stop servers"
-	@echo "  clean             - Clean up all resources"
-	@echo "  logs              - Show server logs"
-
-# Build the SeaweedFS binary
-build-weed:
-	@echo "Building SeaweedFS binary..."
-	@cd ../../../weed && go build -o weed_binary .
-	@chmod +x $(WEED_BINARY)
-	@echo "SeaweedFS binary built"
-
-check-deps: build-weed
-	@echo "Checking dependencies..."
-	@command -v go >/dev/null 2>&1 || (echo "Go is required" && exit 1)
-	@test -f $(WEED_BINARY) || (echo "SeaweedFS binary not found" && exit 1)
-	@echo "All dependencies available"
-
-# Start remote SeaweedFS (acts as the "remote" S3 storage)
-start-remote: check-deps
-	@echo "Starting remote SeaweedFS (secondary instance)..."
-	@rm -f remote-server.pid
-	@mkdir -p $(REMOTE_DIR)
-	@$(WEED_BINARY) server \
-		-s3 \
-		-s3.port=$(REMOTE_S3_PORT) \
-		-s3.allowDeleteBucketNotEmpty=true \
-		-filer \
-		-filer.port=$(REMOTE_FILER_PORT) \
-		-master.port=$(REMOTE_MASTER_PORT) \
-		-volume.port=$(REMOTE_VOLUME_PORT) \
-		-master.volumeSizeLimitMB=50 \
-		-volume.max=100 \
-		-dir=$(REMOTE_DIR) \
-		-volume.preStopSeconds=1 \
-		-metricsPort=$(REMOTE_METRICS_PORT) \
-		> remote-weed.log 2>&1 & echo $$! > remote-server.pid
-	@echo "Waiting for remote SeaweedFS to start..."
-	@for i in $$(seq 1 60); do \
-		if curl -s http://localhost:$(REMOTE_S3_PORT) >/dev/null 2>&1; then \
-			echo "Remote SeaweedFS started on port $(REMOTE_S3_PORT)"; \
-			exit 0; \
-		fi; \
-		sleep 1; \
-	done; \
-	echo "ERROR: Remote SeaweedFS failed to start"; \
-	cat remote-weed.log; \
-	exit 1
-
-stop-remote:
-	@echo "Stopping remote SeaweedFS..."
-	@if [ -f remote-server.pid ]; then \
-		kill -TERM $$(cat remote-server.pid) 2>/dev/null || true; \
-		sleep 2; \
-		kill -KILL $$(cat remote-server.pid) 2>/dev/null || true; \
-		rm -f remote-server.pid; \
-	fi
-	@echo "Remote SeaweedFS stopped"
-
-# Start primary SeaweedFS (the one being tested)
-start-primary: check-deps
-	@echo "Starting primary SeaweedFS..."
-	@rm -f primary-server.pid
-	@mkdir -p $(PRIMARY_DIR)
-	@$(WEED_BINARY) server \
-		-s3 \
-		-s3.port=$(PRIMARY_S3_PORT) \
-		-s3.allowDeleteBucketNotEmpty=true \
-		-filer \
-		-filer.port=$(PRIMARY_FILER_PORT) \
-		-master.port=$(PRIMARY_MASTER_PORT) \
-		-volume.port=$(PRIMARY_VOLUME_PORT) \
-		-master.volumeSizeLimitMB=50 \
-		-volume.max=100 \
-		-dir=$(PRIMARY_DIR) \
-		-volume.preStopSeconds=1 \
-		-metricsPort=$(PRIMARY_METRICS_PORT) \
-		> primary-weed.log 2>&1 & echo $$! > primary-server.pid
-	@echo "Waiting for primary SeaweedFS to start..."
-	@for i in $$(seq 1 60); do \
-		if curl -s http://localhost:$(PRIMARY_S3_PORT) >/dev/null 2>&1; then \
-			echo "Primary SeaweedFS started on port $(PRIMARY_S3_PORT)"; \
-			exit 0; \
-		fi; \
-		sleep 1; \
-	done; \
-	echo "ERROR: Primary SeaweedFS failed to start"; \
-	cat primary-weed.log; \
-	exit 1
-
-stop-primary:
-	@echo "Stopping primary SeaweedFS..."
-	@if [ -f primary-server.pid ]; then \
-		kill -TERM $$(cat primary-server.pid) 2>/dev/null || true; \
-		sleep 2; \
-		kill -KILL $$(cat primary-server.pid) 2>/dev/null || true; \
-		rm -f primary-server.pid; \
-	fi
-	@echo "Primary SeaweedFS stopped"
-
-# Create bucket on remote and configure remote storage mount on primary
-setup-remote:
-	@echo "Creating bucket on remote SeaweedFS..."
-	@curl -s -X PUT "http://localhost:$(REMOTE_S3_PORT)/$(REMOTE_BUCKET)" || echo "Bucket may already exist"
-	@sleep 1
-	@echo "Configuring remote storage on primary..."
-	@printf 'remote.configure -name=seaweedremote -type=s3 -s3.access_key=any -s3.secret_key=any -s3.endpoint=http://localhost:$(REMOTE_S3_PORT) -s3.region=us-east-1\nexit\n' | $(WEED_BINARY) shell -master=localhost:$(PRIMARY_MASTER_PORT) 2>&1 || echo "remote.configure done"
-	@sleep 2
-	@echo "Mounting remote bucket on primary..."
-	@printf 'remote.mount -dir=/buckets/remotemounted -remote=seaweedremote/$(REMOTE_BUCKET) -nonempty\nexit\n' | $(WEED_BINARY) shell -master=localhost:$(PRIMARY_MASTER_PORT) 2>&1 || echo "remote.mount done"
-	@sleep 1
-	@echo "Remote storage configured"
-
-# Run tests
-test: check-deps
-	@echo "Running remote cache tests..."
-	@go test -v -timeout=$(TEST_TIMEOUT) -run "$(TEST_PATTERN)" .
-	@echo "Tests completed"
-
-# Full test workflow - use auto-managed server via TestMain
-test-with-server: check-deps
-	@echo "Running remote cache tests with auto-managed servers..."
-	@go test -v -timeout=$(TEST_TIMEOUT) ./...
-	@echo "All tests passed"
-
-# Show logs
-logs:
-	@echo "=== Primary SeaweedFS Logs ==="
-	@if [ -f primary-weed.log ]; then tail -50 primary-weed.log; else echo "No log file"; fi
-	@echo ""
-	@echo "=== Remote SeaweedFS Logs ==="
-	@if [ -f remote-weed.log ]; then tail -50 remote-weed.log; else echo "No log file"; fi
-
-logs-primary:
-	@if [ -f primary-weed.log ]; then tail -f primary-weed.log; else echo "No log file"; fi
-
-logs-remote:
-	@if [ -f remote-weed.log ]; then tail -f remote-weed.log; else echo "No log file"; fi
-
-# Clean up
-clean:
-	@$(MAKE) stop-primary
-	@$(MAKE) stop-remote
-	@rm -f primary-weed.log remote-weed.log primary-server.pid remote-server.pid
-	@rm -rf $(PRIMARY_DIR) $(REMOTE_DIR)
-	@rm -f remote_cache.test
-	@go clean -testcache
-	@echo "Cleanup completed"
-
-# Health check
-health:
-	@echo "Checking server status..."
-	@curl -s http://localhost:$(PRIMARY_S3_PORT) >/dev/null 2>&1 && echo "Primary S3 ($(PRIMARY_S3_PORT)): UP" || echo "Primary S3 ($(PRIMARY_S3_PORT)): DOWN"
-	@curl -s http://localhost:$(REMOTE_S3_PORT) >/dev/null 2>&1 && echo "Remote S3 ($(REMOTE_S3_PORT)): UP" || echo "Remote S3 ($(REMOTE_S3_PORT)): DOWN"
@@ -1,157 +0,0 @@
-# Remote Object Cache Integration Tests
-
-This directory contains integration tests for the remote object caching feature with singleflight deduplication.
-
-## Test Flow
-
-Each test follows this pattern:
-1. **Write to local** - Upload data to primary SeaweedFS (local storage)
-2. **Uncache** - Push data to remote storage and remove local chunks
-3. **Read** - Read data (triggers caching from remote back to local)
-
-This tests the full remote caching workflow including singleflight deduplication.
-
-## Architecture
-
-```text
-┌─────────────────────────────────────────────────────────────────┐
-│                        Test Client                               │
-│                                                                  │
-│    1. PUT data to primary SeaweedFS                             │
-│    2. remote.cache.uncache (push to remote, purge local)        │
-│    3. GET data (triggers caching from remote)                   │
-│    4. Verify singleflight deduplication                         │
-└──────────────────────────────────┬──────────────────────────────┘
-                                   │
-                 ┌─────────────────┴─────────────────┐
-                 ▼                                   ▼
-┌────────────────────────────────────┐   ┌────────────────────────────────┐
-│     Primary SeaweedFS              │   │     Remote SeaweedFS           │
-│        (port 8333)                 │   │        (port 8334)             │
-│                                    │   │                                │
-│  - Being tested                    │   │  - Acts as "remote" S3         │
-│  - Has remote storage mounted      │──▶│  - Receives uncached data      │
-│  - Caches remote objects           │   │  - Serves data for caching     │
-│  - Singleflight deduplication      │   │                                │
-└────────────────────────────────────┘   └────────────────────────────────┘
-```
-
-## What's Being Tested
-
-1. **Basic Remote Caching**: Write → Uncache → Read workflow
-2. **Singleflight Deduplication**: Concurrent reads only trigger ONE caching operation
-3. **Large Object Caching**: 5MB files cache correctly
-4. **Range Requests**: Partial reads work with cached objects
-5. **Not Found Handling**: Proper error for non-existent objects
-
-## Quick Start
-
-### Run Full Test Suite (Recommended)
-
-```bash
-# Build SeaweedFS, start both servers, run tests, stop servers
-make test-with-server
-```
-
-### Manual Steps
-
-```bash
-# 1. Build SeaweedFS binary
-make build-weed
-
-# 2. Start remote SeaweedFS (acts as "remote" storage)
-make start-remote
-
-# 3. Start primary SeaweedFS (the one being tested)
-make start-primary
-
-# 4. Configure remote storage mount
-make setup-remote
-
-# 5. Run tests
-make test
-
-# 6. Clean up
-make clean
-```
-
-## Configuration
-
-### Primary SeaweedFS (Being Tested)
-
-| Service | Port |
-|---------|------|
-| S3 API | 8333 |
-| Filer | 8888 |
-| Master | 9333 |
-| Volume | 8080 |
-
-### Remote SeaweedFS (Remote Storage)
-
-| Service | Port |
-|---------|------|
-| S3 API | 8334 |
-| Filer | 8889 |
-| Master | 9334 |
-| Volume | 8081 |
-
-## Makefile Targets
-
-```bash
-make help           # Show all available targets
-make build-weed     # Build SeaweedFS binary
-make start-remote   # Start remote SeaweedFS
-make start-primary  # Start primary SeaweedFS
-make setup-remote   # Configure remote storage mount
-make test           # Run tests
-make test-with-server  # Full automated test workflow
-make logs           # Show server logs
-make health         # Check server status
-make clean          # Stop servers and clean up
-```
-
-## Test Details
-
-### TestRemoteCacheBasic
-Basic workflow test:
-1. Write object to primary (local)
-2. Uncache (push to remote, remove local chunks)
-3. Read (triggers caching from remote)
-4. Read again (from local cache - should be faster)
-
-### TestRemoteCacheConcurrent
-Singleflight deduplication test:
-1. Write 1MB object
-2. Uncache to remote
-3. Launch 10 concurrent reads
-4. All should succeed with correct data
-5. Only ONE caching operation should run (singleflight)
-
-### TestRemoteCacheLargeObject
-Large file test (5MB) to verify chunked transfer works correctly.
-
-### TestRemoteCacheRangeRequest
-Tests HTTP range requests work correctly after caching.
-
-### TestRemoteCacheNotFound
-Tests proper error handling for non-existent objects.
-
-## Troubleshooting
-
-### View logs
-```bash
-make logs           # Show recent logs from both servers
-make logs-primary   # Follow primary logs in real-time
-make logs-remote    # Follow remote logs in real-time
-```
-
-### Check server health
-```bash
-make health
-```
-
-### Clean up and retry
-```bash
-make clean
-make test-with-server
-```
@@ -1,375 +0,0 @@
-package remote_cache
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"os/exec"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// Test configuration
-// Uses two SeaweedFS instances:
-// - Primary: The one being tested (has remote caching)
-// - Remote: Acts as the "remote" S3 storage
-const (
-	// Primary SeaweedFS
-	primaryEndpoint   = "http://localhost:8333"
-	primaryMasterPort = "9333"
-
-	// Remote SeaweedFS (acts as remote storage)
-	remoteEndpoint = "http://localhost:8334"
-
-	// Credentials (anonymous access for testing)
-	accessKey = "any"
-	secretKey = "any"
-
-	// Bucket name - mounted on primary as remote storage
-	testBucket = "remotemounted"
-
-	// Path to weed binary
-	weedBinary = "../../../weed/weed_binary"
-)
-
-var (
-	primaryClient     *s3.S3
-	primaryClientOnce sync.Once
-)
-
-func getPrimaryClient() *s3.S3 {
-	primaryClientOnce.Do(func() {
-		primaryClient = createS3Client(primaryEndpoint)
-	})
-	return primaryClient
-}
-
-func createS3Client(endpoint string) *s3.S3 {
-	sess, err := session.NewSession(&aws.Config{
-		Region:           aws.String("us-east-1"),
-		Endpoint:         aws.String(endpoint),
-		Credentials:      credentials.NewStaticCredentials(accessKey, secretKey, ""),
-		DisableSSL:       aws.Bool(!strings.HasPrefix(endpoint, "https")),
-		S3ForcePathStyle: aws.Bool(true),
-	})
-	if err != nil {
-		panic(fmt.Sprintf("failed to create session: %v", err))
-	}
-	return s3.New(sess)
-}
-
-// skipIfNotRunning skips the test if the servers aren't running
-func skipIfNotRunning(t *testing.T) {
-	resp, err := http.Get(primaryEndpoint)
-	if err != nil {
-		t.Skipf("Primary SeaweedFS not running at %s: %v", primaryEndpoint, err)
-	}
-	resp.Body.Close()
-
-	resp, err = http.Get(remoteEndpoint)
-	if err != nil {
-		t.Skipf("Remote SeaweedFS not running at %s: %v", remoteEndpoint, err)
-	}
-	resp.Body.Close()
-}
-
-// runWeedShell executes a weed shell command
-func runWeedShell(t *testing.T, command string) (string, error) {
-	cmd := exec.Command(weedBinary, "shell", "-master=localhost:"+primaryMasterPort)
-	cmd.Stdin = strings.NewReader(command + "\nexit\n")
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Logf("weed shell command '%s' failed: %v, output: %s", command, err, string(output))
-		return string(output), err
-	}
-	return string(output), nil
-}
-
-// uploadToPrimary uploads an object to the primary SeaweedFS (local write)
-func uploadToPrimary(t *testing.T, key string, data []byte) {
-	_, err := getPrimaryClient().PutObject(&s3.PutObjectInput{
-		Bucket: aws.String(testBucket),
-		Key:    aws.String(key),
-		Body:   bytes.NewReader(data),
-	})
-	require.NoError(t, err, "failed to upload to primary SeaweedFS")
-}
-
-// getFromPrimary gets an object from primary SeaweedFS
-func getFromPrimary(t *testing.T, key string) []byte {
-	resp, err := getPrimaryClient().GetObject(&s3.GetObjectInput{
-		Bucket: aws.String(testBucket),
-		Key:    aws.String(key),
-	})
-	require.NoError(t, err, "failed to get from primary SeaweedFS")
-	defer resp.Body.Close()
-
-	data, err := io.ReadAll(resp.Body)
-	require.NoError(t, err, "failed to read response body")
-	return data
-}
-
-// syncToRemote syncs local data to remote storage
-func syncToRemote(t *testing.T) {
-	t.Log("Syncing to remote storage...")
-	output, err := runWeedShell(t, "remote.cache.uncache -dir=/buckets/"+testBucket+" -include=*")
-	if err != nil {
-		t.Logf("syncToRemote warning: %v", err)
-	}
-	t.Log(output)
-	time.Sleep(1 * time.Second)
-}
-
-// uncacheLocal purges the local cache, forcing data to be fetched from remote
-func uncacheLocal(t *testing.T, pattern string) {
-	t.Logf("Purging local cache for pattern: %s", pattern)
-	output, err := runWeedShell(t, fmt.Sprintf("remote.uncache -dir=/buckets/%s -include=%s", testBucket, pattern))
-	if err != nil {
-		t.Logf("uncacheLocal warning: %v", err)
-	}
-	t.Log(output)
-	time.Sleep(500 * time.Millisecond)
-}
-
-// TestRemoteCacheBasic tests the basic caching workflow:
-// 1. Write to local
-// 2. Uncache (push to remote, remove local chunks)
-// 3. Read (triggers caching from remote)
-func TestRemoteCacheBasic(t *testing.T) {
-	skipIfNotRunning(t)
-
-	testKey := fmt.Sprintf("test-basic-%d.txt", time.Now().UnixNano())
-	testData := []byte("Hello, this is test data for remote caching!")
-
-	// Step 1: Write to local
-	t.Log("Step 1: Writing object to primary SeaweedFS (local)...")
-	uploadToPrimary(t, testKey, testData)
-
-	// Verify it's readable
-	result := getFromPrimary(t, testKey)
-	assert.Equal(t, testData, result, "initial read mismatch")
-
-	// Step 2: Uncache - push to remote and remove local chunks
-	t.Log("Step 2: Uncaching (pushing to remote, removing local chunks)...")
-	uncacheLocal(t, testKey)
-
-	// Step 3: Read - this should trigger caching from remote
-	t.Log("Step 3: Reading object (should trigger caching from remote)...")
-	start := time.Now()
-	result = getFromPrimary(t, testKey)
-	firstReadDuration := time.Since(start)
-
-	assert.Equal(t, testData, result, "data mismatch after cache")
-	t.Logf("First read (from remote) took %v", firstReadDuration)
-
-	// Step 4: Read again - should be from local cache
-	t.Log("Step 4: Reading again (should be from local cache)...")
-	start = time.Now()
-	result = getFromPrimary(t, testKey)
-	secondReadDuration := time.Since(start)
-
-	assert.Equal(t, testData, result, "data mismatch on cached read")
-	t.Logf("Second read (from cache) took %v", secondReadDuration)
-
-	t.Log("Basic caching test passed")
-}
-
-// TestRemoteCacheConcurrent tests that concurrent reads of the same
-// remote object only trigger ONE caching operation (singleflight deduplication)
-func TestRemoteCacheConcurrent(t *testing.T) {
-	skipIfNotRunning(t)
-
-	testKey := fmt.Sprintf("test-concurrent-%d.txt", time.Now().UnixNano())
-	// Use larger data to make caching take measurable time
-	testData := make([]byte, 1024*1024) // 1MB
-	for i := range testData {
-		testData[i] = byte(i % 256)
-	}
-
-	// Step 1: Write to local
-	t.Log("Step 1: Writing 1MB object to primary SeaweedFS...")
-	uploadToPrimary(t, testKey, testData)
-
-	// Verify it's readable
-	result := getFromPrimary(t, testKey)
-	assert.Equal(t, len(testData), len(result), "initial size mismatch")
-
-	// Step 2: Uncache
-	t.Log("Step 2: Uncaching (pushing to remote)...")
-	uncacheLocal(t, testKey)
-
-	// Step 3: Launch many concurrent reads - singleflight should deduplicate
-	numRequests := 10
-	var wg sync.WaitGroup
-	var successCount atomic.Int32
-	var errorCount atomic.Int32
-	results := make(chan []byte, numRequests)
-
-	t.Logf("Step 3: Launching %d concurrent requests...", numRequests)
-	startTime := time.Now()
-
-	for i := 0; i < numRequests; i++ {
-		wg.Add(1)
-		go func(idx int) {
-			defer wg.Done()
-			resp, err := getPrimaryClient().GetObject(&s3.GetObjectInput{
-				Bucket: aws.String(testBucket),
-				Key:    aws.String(testKey),
-			})
-			if err != nil {
-				t.Logf("Request %d failed: %v", idx, err)
-				errorCount.Add(1)
-				return
-			}
-			defer resp.Body.Close()
-
-			data, err := io.ReadAll(resp.Body)
-			if err != nil {
-				t.Logf("Request %d read failed: %v", idx, err)
-				errorCount.Add(1)
-				return
-			}
-
-			results <- data
-			successCount.Add(1)
-		}(i)
-	}
-
-	wg.Wait()
-	close(results)
-	totalDuration := time.Since(startTime)
-
-	t.Logf("All %d requests completed in %v", numRequests, totalDuration)
-	t.Logf("Successful: %d, Failed: %d", successCount.Load(), errorCount.Load())
-
-	// Verify all successful requests returned correct data
-	for data := range results {
-		assert.Equal(t, len(testData), len(data), "data length mismatch")
-	}
-
-	// All requests should succeed
-	assert.Equal(t, int32(numRequests), successCount.Load(), "some requests failed")
-	assert.Equal(t, int32(0), errorCount.Load(), "no requests should fail")
-
-	t.Log("Concurrent caching test passed")
-}
-
-// TestRemoteCacheLargeObject tests caching of larger objects
-func TestRemoteCacheLargeObject(t *testing.T) {
-	skipIfNotRunning(t)
-
-	testKey := fmt.Sprintf("test-large-%d.bin", time.Now().UnixNano())
-	// 5MB object
-	testData := make([]byte, 5*1024*1024)
-	for i := range testData {
-		testData[i] = byte(i % 256)
-	}
-
-	// Step 1: Write to local
-	t.Log("Step 1: Writing 5MB object to primary SeaweedFS...")
-	uploadToPrimary(t, testKey, testData)
-
-	// Verify it's readable
-	result := getFromPrimary(t, testKey)
-	assert.Equal(t, len(testData), len(result), "initial size mismatch")
-
-	// Step 2: Uncache
-	t.Log("Step 2: Uncaching...")
-	uncacheLocal(t, testKey)
-
-	// Step 3: Read from remote
-	t.Log("Step 3: Reading 5MB object (should cache from remote)...")
-	start := time.Now()
-	result = getFromPrimary(t, testKey)
-	duration := time.Since(start)
-
-	assert.Equal(t, len(testData), len(result), "size mismatch")
-	assert.Equal(t, testData, result, "data mismatch")
-	t.Logf("Large object cached in %v", duration)
-
-	t.Log("Large object caching test passed")
-}
-
-// TestRemoteCacheRangeRequest tests that range requests work after caching
-func TestRemoteCacheRangeRequest(t *testing.T) {
-	skipIfNotRunning(t)
-
-	testKey := fmt.Sprintf("test-range-%d.txt", time.Now().UnixNano())
-	testData := []byte("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ")
-
-	// Write, uncache, then test range request
-	t.Log("Writing and uncaching object...")
-	uploadToPrimary(t, testKey, testData)
-	uncacheLocal(t, testKey)
-
-	// Range request should work and trigger caching
-	t.Log("Testing range request (bytes 10-19)...")
-	resp, err := getPrimaryClient().GetObject(&s3.GetObjectInput{
-		Bucket: aws.String(testBucket),
-		Key:    aws.String(testKey),
-		Range:  aws.String("bytes=10-19"),
-	})
-	require.NoError(t, err)
-	defer resp.Body.Close()
-
-	rangeData, err := io.ReadAll(resp.Body)
-	require.NoError(t, err)
-
-	expected := testData[10:20] // "ABCDEFGHIJ"
-	assert.Equal(t, expected, rangeData, "range data mismatch")
-	t.Logf("Range request returned: %s", string(rangeData))
-
-	t.Log("Range request test passed")
-}
-
-// TestRemoteCacheNotFound tests that non-existent objects return proper errors
-func TestRemoteCacheNotFound(t *testing.T) {
-	skipIfNotRunning(t)
-
-	testKey := fmt.Sprintf("non-existent-object-%d", time.Now().UnixNano())
-
-	_, err := getPrimaryClient().GetObject(&s3.GetObjectInput{
-		Bucket: aws.String(testBucket),
-		Key:    aws.String(testKey),
-	})
-
-	assert.Error(t, err, "should get error for non-existent object")
-	t.Logf("Got expected error: %v", err)
-
-	t.Log("Not found test passed")
-}
-
-// TestMain sets up and tears down the test environment
-func TestMain(m *testing.M) {
-	if !isServerRunning(primaryEndpoint) {
-		fmt.Println("WARNING: Primary SeaweedFS not running at", primaryEndpoint)
-		fmt.Println("   Run 'make test-with-server' to start servers automatically")
-	}
-	if !isServerRunning(remoteEndpoint) {
-		fmt.Println("WARNING: Remote SeaweedFS not running at", remoteEndpoint)
-		fmt.Println("   Run 'make test-with-server' to start servers automatically")
-	}
-
-	os.Exit(m.Run())
-}
-
-func isServerRunning(url string) bool {
-	resp, err := http.Get(url)
-	if err != nil {
-		return false
-	}
-	resp.Body.Close()
-	return true
-}
@@ -1,37 +0,0 @@
-package remote_cache
-
-import (
-"fmt"
-"os"
-"testing"
-
-	"github.com/seaweedfs/seaweedfs/test/s3/testutil"
-func TestMain(m *testing.M) {
-	var exitCode int
-
-	fmt.Println("TestMain: Starting test setup...")
-
-	// Check if we should manage the server or use an existing one
-	if os.Getenv("USE_EXTERNAL_SERVER") != "true" {
-		// Start server using weed mini
-		fmt.Println("TestMain: Starting weed mini server...")
-		config := testutil.DefaultServerConfig(nil)
-		config.AccessKey = "some_access_key1"
-		config.SecretKey = "some_secret_key1"
-
-		var err error
-		testServer, err = testutil.StartServer(config)
-		if err != nil {
-			fmt.Printf("TestMain: ERROR - Failed to start test server: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println("TestMain: Server started successfully")
-		defer testServer.Stop()
-	}
-
-	// Run tests
-	fmt.Println("TestMain: Running tests...")
-	exitCode = m.Run()
-	fmt.Printf("TestMain: Tests completed with exit code %d\n", exitCode)
-	os.Exit(exitCode)
-}
@@ -209,14 +209,16 @@ test-retention-comprehensive: check-deps
 # All tests without server management
 test-retention-simple: check-deps
 	@echo "Running retention tests (assuming server is already running)..."
-	@go test -v -timeout=$(TEST_TIMEOUT) ./...
+	@go test -v -timeout=$(TEST_TIMEOUT) .
 	@echo "✅ All retention tests completed"

-# Run tests with auto-managed server via TestMain
-test-with-server: check-deps
-	@echo "Running retention tests with auto-managed server..."
-	@go test -v -timeout=$(TEST_TIMEOUT) ./...
-	@echo "✅ All tests completed"
+# Start server, run tests, stop server
+test-with-server: start-server
+	@echo "Running retention tests with managed server..."
+	@sleep 5  # Give server time to fully start
+	@make test-retention-comprehensive || (echo "Tests failed, stopping server..." && make stop-server && exit 1)
+	@make stop-server
+	@echo "✅ All tests completed with managed server"

 # Health check
 health-check:
@@ -1,37 +0,0 @@
-package retention
-
-import (
-"fmt"
-"os"
-"testing"
-
-	"github.com/seaweedfs/seaweedfs/test/s3/testutil"
-func TestMain(m *testing.M) {
-	var exitCode int
-
-	fmt.Println("TestMain: Starting test setup...")
-
-	// Check if we should manage the server or use an existing one
-	if os.Getenv("USE_EXTERNAL_SERVER") != "true" {
-		// Start server using weed mini
-		fmt.Println("TestMain: Starting weed mini server...")
-		config := testutil.DefaultServerConfig(nil)
-		config.AccessKey = "some_access_key1"
-		config.SecretKey = "some_secret_key1"
-
-		var err error
-		testServer, err = testutil.StartServer(config)
-		if err != nil {
-			fmt.Printf("TestMain: ERROR - Failed to start test server: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println("TestMain: Server started successfully")
-		defer testServer.Stop()
-	}
-
-	// Run tests
-	fmt.Println("TestMain: Running tests...")
-	exitCode = m.Run()
-	fmt.Printf("TestMain: Tests completed with exit code %d\n", exitCode)
-	os.Exit(exitCode)
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
chrislusf	7e2d4c24de	test: fix master client timeout causing test hangs Use the main test context for KeepConnectedToMaster instead of creating a separate 60s context. The tests have 180s outer timeouts but the master client was disconnecting after 60s, causing subsequent commands to hang waiting for reconnection.	2025-12-10 23:40:48 -08:00
chrislusf	202872d88d	test: improve helper robustness - Make assertNoFlagError case-insensitive for pattern matching - Use defer in captureCommandOutput to restore stdout/stderr and close pipe ends to avoid FD leaks even if cmd.Do panics	2025-12-10 22:42:28 -08:00
chrislusf	cacfcf5eb2	test: fix missing unlock in ec_encode_with_disk_awareness Add defer unlock pattern to ensure lock is always released, matching the pattern used in other subtests.	2025-12-10 22:41:35 -08:00
chrislusf	62669040c6	test: add proper assertions for EC command results - ec_encode_with_ssd_disktype: check for expected volume-related errors - ec_balance_with_ssd_disktype: require success with require.NoError - ec_encode_with_source_disktype: check for expected no-volume errors - ec_decode_with_disktype: check for expected no-ec-volume errors - upload_to_ssd_and_hdd: use require.NoError for setup validation Tests now properly fail on unexpected errors rather than just logging.	2025-12-10 22:27:12 -08:00
chrislusf	777e36bcf3	test: add flag validation to ec_balance_targets_correct_disk_type Add assertNoFlagError calls after ec.balance commands to ensure -diskType flag is properly recognized for both SSD and HDD disk types.	2025-12-10 21:33:11 -08:00
chrislusf	edfe312216	test: extract captureCommandOutput helper and fix error handling - Add captureCommandOutput helper to reduce code duplication in diskType tests - Create commandRunner interface to match shell command Do method - Update ec_encode_with_ssd_disktype, ec_balance_with_ssd_disktype, ec_encode_with_source_disktype, ec_decode_with_disktype to use helper - Fix filepath.Glob error handling in countShardsPerRack instead of ignoring it	2025-12-10 21:27:27 -08:00
chrislusf	489dddf84e	test: improve EC integration tests with proper assertions - Add assertNoFlagError helper to detect flag parsing regressions - Update diskType subtests to fail on flag errors (ec.encode, ec.balance, ec.decode) - Update verify_disktype_flag_parsing to check help output contains diskType - Remove verify_fallback_disk_selection (was documentation-only, not executable) - Add assertion to verify_cross_rack_distribution for minimum 2 racks - Consolidate uploadTestDataWithDiskType to accept collection parameter - Remove duplicate uploadTestDataWithDiskTypeMixed function	2025-12-10 21:19:37 -08:00
chrislusf	232d58dc18	test: close log files in MultiDiskCluster.Stop() to prevent FD leaks Track log files in MultiDiskCluster.logFiles and close them in Stop() to prevent file descriptor accumulation in long-running or many-test scenarios. Addresses review comment about logging resources cleanup.	2025-12-10 21:14:56 -08:00
chrislusf	b2e4474bf2	test: fix collection mismatch in TestCrossRackECPlacement The EC commands were using collection 'rack_test' but uploaded test data uses collection 'test' (default). This caused ec.encode/ec.balance to not find the uploaded volume. Fix: Change EC commands to use '-collection test' to match the uploaded data. Addresses review comment from PR #7607.	2025-12-10 21:11:23 -08:00
chrislusf	e5fab95905	test: add evacuation fallback and cross-rack EC placement tests Add two new integration tests: 1. TestEvacuationFallbackBehavior: - Tests that when same disk type has no capacity, shards fall back to other disk types during evacuation - Creates cluster with 1 SSD + 2 HDD servers (limited SSD capacity) - Verifies pickBestDiskOnNode behavior with strictDiskType=false 2. TestCrossRackECPlacement: - Tests EC shard distribution across different racks - Creates cluster with 4 servers in 4 different racks - Verifies shards are spread across multiple racks - Tests that ec.balance respects rack placement Helper functions added: - startLimitedSsdCluster: 1 SSD + 2 HDD servers - startMultiRackCluster: 4 servers in 4 racks - countShardsPerRack: counts EC shards per rack from disk	2025-12-10 20:53:55 -08:00
chrislusf	0e8db10a54	ec: dynamically discover disk types from topology for evacuation Disk types are free-form tags (e.g., 'ssd', 'nvme', 'archive') that come from the topology, not a hardcoded set. Only 'hdd' (or empty) is the default disk type. Use collectVolumeDiskTypes() to discover all disk types present in the cluster topology instead of hardcoding [HardDriveType, SsdType].	2025-12-10 14:48:04 -08:00
chrislusf	0c5068cb28	test: use defer for lock/unlock to prevent lock leaks Use defer to ensure locks are always released, even on early returns or test failures. This prevents lock leaks that could cause subsequent tests to hang or fail. Changes: - Return early if lock acquisition fails - Immediately defer unlock after successful lock - Remove redundant explicit unlock calls at end of tests - Fix unused variable warning (err -> encodeErr/locErr)	2025-12-10 14:42:52 -08:00
chrislusf	d3dabd2d84	ec: allow disk type fallback during evacuation Update pickBestDiskOnNode to accept a strictDiskType parameter: - strictDiskType=true (balancing): Only use disks of matching type. This maintains storage tier isolation during normal rebalancing. - strictDiskType=false (evacuation): Prefer same disk type, but fall back to other disk types if no matching disk is available. This ensures evacuation can complete even when same-type capacity is insufficient. Priority order for evacuation: 1. Same disk type with lowest shard count (preferred) 2. Different disk type with lowest shard count (fallback)	2025-12-10 14:24:55 -08:00
chrislusf	3e76104d7e	ec: filter disk selection by disk type in pickBestDiskOnNode When evacuating or rebalancing EC shards, pickBestDiskOnNode now filters disks by the target disk type. This ensures: 1. EC shards from SSD disks are moved to SSD disks on destination nodes 2. EC shards from HDD disks are moved to HDD disks on destination nodes 3. No cross-disk-type shard movement occurs This maintains the storage tier isolation when moving EC shards between nodes during evacuation or rebalancing operations.	2025-12-10 14:24:55 -08:00
chrislusf	a770a4983b	test: add diskType field to ecBalancer in TestPickEcNodeToBalanceShardsInto Address nitpick comment: ensure test ecBalancer struct has diskType field set for consistency with other tests.	2025-12-10 14:24:55 -08:00
chrislusf	f2634e6a71	ec: fix variable shadowing and add -diskType to ec.rebuild and volumeServer.evacuate Address code review comments: 1. Fix variable shadowing in collectEcVolumeServersByDc(): - Rename loop variable 'diskType' to 'diskTypeKey' and 'diskTypeStr' to avoid shadowing the function parameter 2. Fix hardcoded HardDriveType in ecBalancer methods: - balanceEcRack(): use ecb.diskType instead of types.HardDriveType - collectVolumeIdToEcNodes(): use ecb.diskType 3. Add -diskType flag to ec.rebuild command: - Add diskType field to ecRebuilder struct - Pass diskType to collectEcNodes() and addEcVolumeShards() 4. Add -diskType flag to volumeServer.evacuate command: - Add diskType field to commandVolumeServerEvacuate struct - Pass diskType to collectEcVolumeServersByDc() and moveMountedShardToEcNode()	2025-12-10 14:24:55 -08:00
chrislusf	c1b190cdd6	ec: add -sourceDiskType to ec.encode and -diskType to ec.decode ec.encode: - Add -sourceDiskType flag to filter source volumes by disk type - This enables tier migration scenarios (e.g., SSD volumes → HDD EC shards) - -diskType specifies target disk type for EC shards ec.decode: - Add -diskType flag to specify source disk type where EC shards are stored - Update collectEcShardIds() and collectEcNodeShardBits() to accept diskType Examples: # Encode SSD volumes to HDD EC shards (tier migration) ec.encode -collection=mybucket -sourceDiskType=ssd -diskType=hdd # Decode EC shards from SSD ec.decode -collection=mybucket -diskType=ssd Integration tests updated to cover new flags.	2025-12-10 14:24:55 -08:00
chrislusf	78dda049e5	test: add integration tests for EC disk type support Add integration tests to verify the -diskType flag works correctly: - TestECDiskTypeSupport: Tests EC encode and balance with SSD disk type - TestECDiskTypeMixedCluster: Tests EC operations on a mixed HDD/SSD cluster The tests verify: - Volume servers can be configured with specific disk types - ec.encode accepts -diskType flag and encodes to the correct disk type - ec.balance accepts -diskType flag and balances on the correct disk type - Mixed disk type clusters work correctly with separate collections	2025-12-10 14:24:55 -08:00
chrislusf	503b0a283c	ec: add -diskType flag to ec.balance and ec.encode commands Add -diskType flag to specify the target disk type for EC operations: - ec.balance -diskType=ssd - ec.encode -diskType=ssd The disk type can be 'hdd', 'ssd', or empty for default (hdd). This allows placing EC shards on SSD or other disk types instead of only HDD. Example usage: ec.balance -collection=mybucket -diskType=ssd -apply ec.encode -collection=mybucket -diskType=ssd -force	2025-12-10 14:24:55 -08:00
chrislusf	eea5d91acb	ec: update helper functions to use configurable diskType Update the following functions to accept/use diskType parameter: - findEcVolumeShards() - addEcVolumeShards() - deleteEcVolumeShards() - moveMountedShardToEcNode() - countShardsByRack() - pickNEcShardsToMoveFrom() All ecBalancer methods now use ecb.diskType instead of hardcoded types.HardDriveType. Non-ecBalancer callers (like volumeServer.evacuate and ec.rebuild) use types.HardDriveType as the default. Update all test files to pass diskType where needed.	2025-12-10 14:24:55 -08:00
chrislusf	e05994ca7e	ec: add diskType parameter to core EC functions Add diskType parameter to: - ecBalancer struct - collectEcVolumeServersByDc() - collectEcNodesForDC() - collectEcNodes() - EcBalance() This allows EC operations to target specific disk types (hdd, ssd, etc.) instead of being hardcoded to HardDriveType only. For backward compatibility, all callers currently pass types.HardDriveType as the default value. Subsequent commits will add -diskType flags to the individual EC commands.	2025-12-10 14:24:55 -08:00
				`@@ -91,4 +91,3 @@ jobs:`
				`echo "\| readonly \| /public \| Read-only \|" >> $GITHUB_STEP_SUMMARY`