fix(iam): reject empty issuer in ComputeParentUser

Without iss, the same `sub` from two different IDPs would collapse to
the same parent_user hash. Short-circuit to empty when either input
is missing so callers see "no identity" instead of a colliding hash.

Addresses coderabbit review on PR #9318.

.github/workflows/container_dev.yml

@@ -111,7 +111,7 @@ jobs:
             org.opencontainers.image.vendor=Chris Lu
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4.1.0
+        uses: docker/setup-qemu-action@v4
 
       - name: Create BuildKit config
         run: |
@@ -128,14 +128,14 @@ jobs:
 
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v4.2.0
+        uses: docker/login-action@v4.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GHCR
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v4.2.0
+        uses: docker/login-action@v4.1.0
         with:
           registry: ghcr.io
           username: ${{ secrets.GHCR_USERNAME }}

.github/workflows/container_foundationdb_version.yml

@@ -126,14 +126,14 @@ jobs:
           echo "seaweedfs_ref=$seaweed" >> "$GITHUB_OUTPUT"
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4.1.0
+        uses: docker/setup-qemu-action@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v4.2.0
+        uses: docker/login-action@v4.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/container_latest.yml

@@ -1,10 +1,9 @@
 name: "docker: build latest container"
 
-# Manual fallback only. On tag push, container_release_unified.yml already
-# re-tags the released versioned image as `latest` / `latest_large_disk`,
-# so a full rebuild here is unnecessary. Run this manually if you need to
-# rebuild `latest` from an arbitrary ref.
 on:
+  push:
+    tags:
+      - '*'
   workflow_dispatch:
     inputs:
       source_ref:
@@ -207,7 +206,7 @@ jobs:
             org.opencontainers.image.vendor=Chris Lu
       - name: Set up QEMU
         if: matrix.platform != 'amd64'
-        uses: docker/setup-qemu-action@v4.1.0
+        uses: docker/setup-qemu-action@v4
       - name: Create BuildKit config
         run: |
           cat > /tmp/buildkitd.toml <<EOF
@@ -221,13 +220,13 @@ jobs:
           buildkitd-config: /tmp/buildkitd.toml
       - name: Login to Docker Hub
         if: needs.setup.outputs.publish == 'true'
-        uses: docker/login-action@v4.2.0
+        uses: docker/login-action@v4.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Login to GHCR
         if: needs.setup.outputs.publish == 'true'
-        uses: docker/login-action@v4.2.0
+        uses: docker/login-action@v4.1.0
         with:
           registry: ghcr.io
           username: ${{ secrets.GHCR_USERNAME }}
@@ -275,7 +274,7 @@ jobs:
           fi
       - name: Login to GHCR
         if: needs.setup.outputs.publish == 'true'
-        uses: docker/login-action@v4.2.0
+        uses: docker/login-action@v4.1.0
         with:
           registry: ghcr.io
           username: ${{ secrets.GHCR_USERNAME }}
@@ -430,12 +429,12 @@ jobs:
             ghcr.io/chrislusf/seaweedfs
           tags: type=raw,value=${{ github.event_name == 'workflow_dispatch' && github.event.inputs.image_tag || 'latest' }},suffix=${{ steps.config.outputs.tag_suffix }}
       - name: Login to Docker Hub
-        uses: docker/login-action@v4.2.0
+        uses: docker/login-action@v4.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Login to GHCR
-        uses: docker/login-action@v4.2.0
+        uses: docker/login-action@v4.1.0
         with:
           registry: ghcr.io
           username: ${{ secrets.GHCR_USERNAME }}

.github/workflows/container_release_foundationdb.yml

@@ -43,14 +43,14 @@ jobs:
             org.opencontainers.image.vendor=Chris Lu
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v4.1.0
+        uses: docker/setup-qemu-action@v4
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
       -
         name: Login to Docker Hub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v4.2.0
+        uses: docker/login-action@v4.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/container_release_unified.yml

@@ -29,7 +29,6 @@ on:
 
 permissions:
   contents: read
-  security-events: write
 
 env:
   RELEASE_TAG: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.release_tag || github.ref_name }}
@@ -118,9 +117,8 @@ jobs:
     needs: [build-rust-binaries]
     runs-on: ubuntu-latest
     strategy:
-      # All variants at once: pulls hit mirror.gcr.io and pushes go to GHCR only,
-      # so docker.io limits don't apply. Watch the 10 GB gha cache budget.
-      max-parallel: 5
+      # Build sequentially to avoid rate limits
+      max-parallel: 2
       matrix:
         include:
           # Normal volume - multi-arch
@@ -220,7 +218,7 @@ jobs:
             
       - name: Set up QEMU
         if: (github.event_name != 'workflow_dispatch' || github.event.inputs.variant == 'all' || github.event.inputs.variant == matrix.variant) && contains(matrix.platforms, 'arm')
-        uses: docker/setup-qemu-action@v4.1.0
+        uses: docker/setup-qemu-action@v4
         
       - name: Create BuildKit config
         if: github.event_name != 'workflow_dispatch' || github.event.inputs.variant == 'all' || github.event.inputs.variant == matrix.variant
@@ -238,14 +236,14 @@ jobs:
           
       - name: Login to Docker Hub
         if: (github.event_name != 'workflow_dispatch' || github.event.inputs.variant == 'all' || github.event.inputs.variant == matrix.variant) && github.event_name != 'pull_request'
-        uses: docker/login-action@v4.2.0
+        uses: docker/login-action@v4.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           
       - name: Login to GHCR
         if: (github.event_name != 'workflow_dispatch' || github.event.inputs.variant == 'all' || github.event.inputs.variant == matrix.variant) && github.event_name != 'pull_request'
-        uses: docker/login-action@v4.2.0
+        uses: docker/login-action@v4.1.0
         with:
           registry: ghcr.io
           username: ${{ secrets.GHCR_USERNAME }}
@@ -273,177 +271,97 @@ jobs:
             BRANCH=${{ github.sha }}
             ${{ matrix.variant == 'rocksdb' && format('ROCKSDB_VERSION={0}', github.event.inputs.rocksdb_version || 'v10.10.1') || '' }}
             
-      # Copy GHCR -> Docker Hub here, per variant, so it overlaps with the other
-      # variants still building instead of waiting on the whole matrix.
-      - name: Install crane
-        if: (github.event_name != 'workflow_dispatch' || github.event.inputs.variant == 'all' || github.event.inputs.variant == matrix.variant) && github.event_name != 'pull_request'
-        run: |
-          cd $(mktemp -d)
-          curl -sL "https://github.com/google/go-containerregistry/releases/latest/download/go-containerregistry_Linux_x86_64.tar.gz" | tar xz
-          sudo mv crane /usr/local/bin/
-          crane version
-
-      - name: Copy ${{ matrix.variant }} to Docker Hub
-        if: (github.event_name != 'workflow_dispatch' || github.event.inputs.variant == 'all' || github.event.inputs.variant == matrix.variant) && github.event_name != 'pull_request'
-        run: |
-          retry_with_backoff() {
-            local max_attempts=5
-            local timeout=1
-            local attempt=1
-            local exit_code=0
-            while [ $attempt -le $max_attempts ]; do
-              if "$@"; then
-                return 0
-              else
-                exit_code=$?
-              fi
-              if [ $attempt -lt $max_attempts ]; then
-                echo "Attempt $attempt failed. Retrying in ${timeout}s..." >&2
-                sleep $timeout
-                timeout=$((timeout * 2))
-              fi
-              attempt=$((attempt + 1))
-            done
-            echo "Command failed after $max_attempts attempts" >&2
-            return $exit_code
-          }
-
-          echo "Copying ${{ matrix.variant }} from GHCR to Docker Hub..."
-          retry_with_backoff crane copy \
-            ghcr.io/chrislusf/seaweedfs:${{ env.RELEASE_TAG }}${{ matrix.tag_suffix }} \
-            chrislusf/seaweedfs:${{ env.RELEASE_TAG }}${{ matrix.tag_suffix }}
-          echo "Copied ${{ matrix.variant }} to Docker Hub"
-
       - name: Clean up build artifacts
         if: always() && (github.event_name != 'workflow_dispatch' || github.event.inputs.variant == 'all' || github.event.inputs.variant == matrix.variant)
         run: |
           sudo docker system prune -f
           sudo rm -rf /tmp/go-build*
 
-  # Report-only trivy scan: uploads fixable HIGH/CRITICAL findings to GitHub
-  # Security for visibility, but never blocks the release. Releases (including
-  # `latest`) ship regardless — vulnerabilities are tracked, not gated, since
-  # we sometimes need to publish through known findings (e.g. unfixed upstream
-  # CVE, base-image lag).
-  trivy-scan:
+  copy-to-dockerhub:
     runs-on: ubuntu-latest
     needs: [build]
-    if: github.event_name == 'push'
-    continue-on-error: true
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - source_suffix: ""
-            variant: normal
-          - source_suffix: _large_disk
-            variant: large_disk
-    steps:
-      - name: Login to GHCR
-        uses: docker/login-action@v4.2.0
-        with:
-          registry: ghcr.io
-          username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_TOKEN }}
-
-      - name: Trivy report (${{ matrix.variant }})
-        # Pin to SHA - mutable tags were compromised (GHSA-69fq-xp46-6x23)
-        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
-        with:
-          scan-type: image
-          # Scan the multi-arch tag on GHCR (already pushed by the build job).
-          # Trivy scans the runner's native platform; OS packages are identical
-          # across architectures since they all share the same alpine base.
-          image-ref: ghcr.io/chrislusf/seaweedfs:${{ env.RELEASE_TAG }}${{ matrix.source_suffix }}
-          scanners: vuln
-          vuln-type: os,library
-          severity: HIGH,CRITICAL
-          ignore-unfixed: true
-          limit-severities-for-sarif: true
-          format: sarif
-          output: trivy-results.sarif
-          exit-code: '0'
-
-      - name: Upload Trivy scan results to GitHub Security
-        if: always()
-        uses: github/codeql-action/upload-sarif@v4
-        with:
-          sarif_file: trivy-results.sarif
-          category: trivy-${{ matrix.variant }}
-
-  # Point `latest` (and `latest_large_disk`) at the just-released versioned
-  # image. crane tag adds an extra tag to an existing manifest — no rebuild,
-  # no QEMU, no separate workflow. Replaces the old container_latest.yml
-  # rebuild that often failed or lagged behind the release. Independent of
-  # trivy-scan: vuln findings are reported but do not block `latest`.
-  tag-latest:
-    runs-on: ubuntu-latest
-    needs: [build]
-    if: github.event_name == 'push'
+    if: github.event_name != 'pull_request'
     strategy:
       matrix:
+        variant: [normal, large_disk, full, large_disk_full, rocksdb]
         include:
-          - source_suffix: ""
-            latest_tag: latest
-          - source_suffix: _large_disk
-            latest_tag: latest_large_disk
+          - variant: normal
+            tag_suffix: ""
+          - variant: large_disk
+            tag_suffix: _large_disk
+          - variant: full
+            tag_suffix: _full
+          - variant: large_disk_full
+            tag_suffix: _large_disk_full
+          - variant: rocksdb
+            tag_suffix: _large_disk_rocksdb
+            
     steps:
       - name: Login to Docker Hub
-        uses: docker/login-action@v4.2.0
+        if: github.event_name != 'workflow_dispatch' || github.event.inputs.variant == 'all' || github.event.inputs.variant == matrix.variant
+        uses: docker/login-action@v4.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-
+          
       - name: Login to GHCR
-        uses: docker/login-action@v4.2.0
+        if: github.event_name != 'workflow_dispatch' || github.event.inputs.variant == 'all' || github.event.inputs.variant == matrix.variant
+        uses: docker/login-action@v4.1.0
         with:
           registry: ghcr.io
           username: ${{ secrets.GHCR_USERNAME }}
           password: ${{ secrets.GHCR_TOKEN }}
-
+          
       - name: Install crane
+        if: github.event_name != 'workflow_dispatch' || github.event.inputs.variant == 'all' || github.event.inputs.variant == matrix.variant
         run: |
           cd $(mktemp -d)
           curl -sL "https://github.com/google/go-containerregistry/releases/latest/download/go-containerregistry_Linux_x86_64.tar.gz" | tar xz
           sudo mv crane /usr/local/bin/
           crane version
-
-      - name: Re-tag ${{ env.RELEASE_TAG }}${{ matrix.source_suffix }} as ${{ matrix.latest_tag }}
+          
+      - name: Copy ${{ matrix.variant }} from GHCR to Docker Hub
+        if: github.event_name != 'workflow_dispatch' || github.event.inputs.variant == 'all' || github.event.inputs.variant == matrix.variant
         run: |
+          # Function to retry with exponential backoff
           retry_with_backoff() {
             local max_attempts=5
             local timeout=1
             local attempt=1
             local exit_code=0
+            
             while [ $attempt -le $max_attempts ]; do
               if "$@"; then
                 return 0
               else
                 exit_code=$?
               fi
+              
               if [ $attempt -lt $max_attempts ]; then
                 echo "Attempt $attempt failed. Retrying in ${timeout}s..." >&2
                 sleep $timeout
                 timeout=$((timeout * 2))
               fi
+              
               attempt=$((attempt + 1))
             done
+            
             echo "Command failed after $max_attempts attempts" >&2
             return $exit_code
           }
-
-          SRC_TAG="${{ env.RELEASE_TAG }}${{ matrix.source_suffix }}"
-          DST_TAG="${{ matrix.latest_tag }}"
-
-          echo "Tagging ghcr.io/chrislusf/seaweedfs:${SRC_TAG} as ${DST_TAG}"
-          retry_with_backoff crane tag "ghcr.io/chrislusf/seaweedfs:${SRC_TAG}" "${DST_TAG}"
-
-          echo "Tagging chrislusf/seaweedfs:${SRC_TAG} as ${DST_TAG}"
-          retry_with_backoff crane tag "chrislusf/seaweedfs:${SRC_TAG}" "${DST_TAG}"
+          
+          # Copy multi-arch image from GHCR to Docker Hub with retry
+          # This is much more efficient than pulling/pushing individual arch images
+          echo "Copying ${{ matrix.variant }} from GHCR to Docker Hub..."
+          retry_with_backoff crane copy \
+            ghcr.io/chrislusf/seaweedfs:${{ env.RELEASE_TAG }}${{ matrix.tag_suffix }} \
+            chrislusf/seaweedfs:${{ env.RELEASE_TAG }}${{ matrix.tag_suffix }}
+          
+          echo "✓ Successfully copied ${{ matrix.variant }} to Docker Hub"
 
   helm-release:
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [copy-to-dockerhub]
     if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     permissions:
       contents: write

.github/workflows/container_rocksdb_version.yml

@@ -82,13 +82,13 @@ jobs:
           echo "seaweedfs_ref=$seaweed" >> "$GITHUB_OUTPUT"
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v1
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v1
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v1
 
       - name: Login to Docker Hub
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v1
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/depsreview.yml

@@ -11,4 +11,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294
+        uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48

.github/workflows/e2e.yml

@@ -31,11 +31,6 @@ jobs:
       with:
         go-version-file: 'go.mod'
 
-    - name: Configure Docker Hub mirror
-      run: |
-        echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-        sudo systemctl restart docker
-
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v4
       
@@ -62,12 +57,12 @@ jobs:
         echo "FUSE device: $(ls -la /dev/fuse 2>&1 || echo '/dev/fuse not found')"
 
     - name: Start SeaweedFS
-      timeout-minutes: 15
+      timeout-minutes: 10
       run: |
         # Enable Docker buildkit for better caching
         export DOCKER_BUILDKIT=1
         export COMPOSE_DOCKER_CLI_BUILD=1
-
+        
         # Build with retry logic
         for i in {1..3}; do
           echo "Build attempt $i/3"
@@ -82,18 +77,10 @@ jobs:
             sleep 30
           fi
         done
-
+        
         # Start services with wait
         docker compose -f ./compose/e2e-mount.yml up --wait
 
-    - name: Rotate buildx cache
-      if: always()
-      run: |
-        # Without this, --cache-to writes to .buildx-cache-new but actions/cache only
-        # uploads .buildx-cache, so layers (notably the slow apt RUN) never persist.
-        rm -rf /tmp/.buildx-cache
-        if [ -d /tmp/.buildx-cache-new ]; then mv /tmp/.buildx-cache-new /tmp/.buildx-cache; fi
-
     - name: Run FIO 4k
       timeout-minutes: 15
       run: |

.github/workflows/ec-integration.yml

@@ -0,0 +1,49 @@
+name: EC Integration Tests
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'weed/admin/**'
+      - 'weed/worker/**'
+      - 'test/erasure_coding/admin_dockertest/**'
+      - '.github/workflows/ec-integration.yml'
+  pull_request:
+    branches: [ master ]
+    paths:
+      - 'weed/admin/**'
+      - 'weed/worker/**'
+      - 'test/erasure_coding/admin_dockertest/**'
+      - '.github/workflows/ec-integration.yml'
+
+jobs:
+  ec-integration-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v6
+      
+    - name: Set up Go
+      uses: actions/setup-go@v6
+      with:
+        go-version-file: 'go.mod'
+        
+    - name: Build weed binary
+      run: |
+        cd weed
+        go build -o ../weed_bin
+        
+    - name: Run EC integration tests
+      run: |
+        cd test/erasure_coding/admin_dockertest
+        go test -v -timeout 15m ec_integration_test.go
+        
+    - name: Upload test logs on failure
+      if: failure()
+      uses: actions/upload-artifact@v7
+      with:
+        name: ec-test-logs
+        path: test/erasure_coding/admin_dockertest/tmp/logs/
+        retention-days: 7

.github/workflows/go.yml

@@ -37,21 +37,6 @@ jobs:
         # 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
 
-  vet-32bit:
-    name: Go Vet 32-bit
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v6
-    - name: Set up Go
-      uses: actions/setup-go@v6
-      with:
-        go-version-file: 'go.mod'
-    - name: Go Vet linux/386 (type-checks code and tests for 32-bit int overflows)
-      run: |
-        GOOS=linux GOARCH=386 go vet ./... 2>&1 | grep -v "MessageState contains sync.Mutex" | grep -v "IdentityAccessManagement contains sync.RWMutex" | tee vet-32bit-output.txt
-        if grep -q "vet:" vet-32bit-output.txt; then exit 1; fi
-
   build:
     name: Build
     runs-on: ubuntu-latest
@@ -77,19 +62,3 @@ jobs:
         go-version-file: 'go.mod'
     - name: Test
       run: cd weed; go test -tags "elastic gocdk sqlite ydb tarantool tikv rclone" -v ./...
-
-  test-32bit:
-    name: Test 32-bit
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v6
-    - name: Set up Go
-      uses: actions/setup-go@v6
-      with:
-        go-version-file: 'go.mod'
-    # 386 test binaries run natively on the amd64 runner. This catches what vet
-    # can't: unaligned 64-bit atomics and arithmetic that wraps at runtime.
-    # -short skips the e2e suites already covered on amd64.
-    - name: Test linux/386
-      run: cd weed; GOOS=linux GOARCH=386 go test -short ./...

.github/workflows/helm_ci.yml

@@ -51,207 +51,29 @@ jobs:
           
           echo "=== Testing default configuration ==="
           helm template test $CHART_DIR > /tmp/default.yaml
-          echo "Default configuration renders successfully"
+          echo "✓ Default configuration renders successfully"
           
           echo "=== Testing with S3 enabled ==="
           helm template test $CHART_DIR --set s3.enabled=true > /tmp/s3.yaml
           grep -q "kind: Deployment" /tmp/s3.yaml && grep -q "seaweedfs-s3" /tmp/s3.yaml
-          echo "S3 deployment renders correctly"
+          echo "✓ S3 deployment renders correctly"
           
           echo "=== Testing with all-in-one mode ==="
           helm template test $CHART_DIR --set allInOne.enabled=true > /tmp/allinone.yaml
           grep -q "seaweedfs-all-in-one" /tmp/allinone.yaml
-          echo "All-in-one deployment renders correctly"
+          echo "✓ All-in-one deployment renders correctly"
           
           echo "=== Testing with security enabled ==="
           helm template test $CHART_DIR --set global.seaweedfs.enableSecurity=true > /tmp/security.yaml
           grep -q "security-config" /tmp/security.yaml
-          echo "Security configuration renders correctly"
-
-          echo ""
-          echo "=== Testing JWT expiration overrides ==="
-          helm template test $CHART_DIR \
-            --set global.seaweedfs.securityConfig.jwtSigning.expiresAfterSeconds.volumeWrite=11 \
-            > /tmp/jwt-volume-write-expiration.yaml
-          grep -q "security-config" /tmp/jwt-volume-write-expiration.yaml
-          grep -q "expires_after_seconds = 11" /tmp/jwt-volume-write-expiration.yaml
-
-          helm template test $CHART_DIR \
-            --set global.seaweedfs.securityConfig.jwtSigning.volumeRead=true \
-            --set global.seaweedfs.securityConfig.jwtSigning.filerWrite=true \
-            --set global.seaweedfs.securityConfig.jwtSigning.filerRead=true \
-            --set global.seaweedfs.securityConfig.jwtSigning.expiresAfterSeconds.volumeWrite=11 \
-            --set global.seaweedfs.securityConfig.jwtSigning.expiresAfterSeconds.volumeRead=22 \
-            --set global.seaweedfs.securityConfig.jwtSigning.expiresAfterSeconds.filerWrite=33 \
-            --set global.seaweedfs.securityConfig.jwtSigning.expiresAfterSeconds.filerRead=44 \
-            > /tmp/jwt-expiration.yaml
-
-          assert_jwt_expiration() {
-            local section="$1"
-            local seconds="$2"
-            awk -v section="[$section]" -v seconds="$seconds" '
-              /^[[:space:]]*\[.*\][[:space:]]*$/ {
-                in_section = index($0, section) > 0
-              }
-              in_section && $0 ~ "^[[:space:]]*expires_after_seconds = " seconds "$" {
-                found = 1
-              }
-              END { exit !found }
-            ' /tmp/jwt-expiration.yaml
-          }
-
-          assert_jwt_expiration jwt.signing 11
-          assert_jwt_expiration jwt.signing.read 22
-          assert_jwt_expiration jwt.filer_signing 33
-          assert_jwt_expiration jwt.filer_signing.read 44
-
-          helm template test $CHART_DIR \
-            --set global.seaweedfs.enableSecurity=true \
-            --set global.seaweedfs.securityConfig.jwtSigning.volumeRead=true \
-            --set global.seaweedfs.securityConfig.jwtSigning.filerWrite=true \
-            --set global.seaweedfs.securityConfig.jwtSigning.filerRead=true \
-            > /tmp/jwt-default-expiration.yaml
-          if grep -q "expires_after_seconds =" /tmp/jwt-default-expiration.yaml; then
-            echo "FAIL: zero JWT expiration values should preserve runtime defaults"
-            exit 1
-          fi
-          echo "JWT expiration overrides render correctly"
-
-          echo ""
-          echo "=== Testing IAM gRPC opt-in path ==="
-          # Regression test: the filer registers the IAM gRPC service the
-          # Admin UI Users tab calls only when jwt.filer_signing.key is in
-          # security.toml. Operators must be able to enable that without
-          # the cert-manager mTLS bundle.
-          # Install PyYAML explicitly: this block runs before the later
-          # security+S3 block that does the same install, and we don't
-          # want to rely on the runner image shipping it.
-          pip install pyyaml -q
-          python3 - "$CHART_DIR" <<'PYEOF'
-          import subprocess, sys, yaml
-          chart = sys.argv[1]
-
-          def render(values):
-              args = ["helm", "template", "test", chart]
-              for k, v in values.items():
-                  args += ["--set", f"{k}={v}"]
-              return subprocess.check_output(args, text=True)
-
-          def docs(manifest):
-              return [d for d in yaml.safe_load_all(manifest) if d]
-
-          def configmap(manifest, name):
-              for d in docs(manifest):
-                  if d.get("kind") == "ConfigMap" and d["metadata"]["name"] == name:
-                      return d
-              return None
-
-          def workload_mounts(manifest, name):
-              for d in docs(manifest):
-                  if d.get("kind") not in ("Deployment", "StatefulSet"):
-                      continue
-                  if d["metadata"]["name"] != name:
-                      continue
-                  pod = d["spec"]["template"]["spec"]
-                  vols = {v["name"] for v in pod.get("volumes", [])}
-                  mounts = set()
-                  for c in pod.get("containers", []):
-                      for vm in c.get("volumeMounts", []):
-                          mounts.add(vm["name"])
-                  return vols, mounts
-              return None, None
-
-          failed = []
-
-          # Case 1: defaults. The chart historically rendered nothing
-          # security-related; preserve that so this PR is non-breaking on
-          # existing installs.
-          out = render({})
-          if configmap(out, "test-seaweedfs-security-config") is not None:
-              failed.append("defaults: security ConfigMap should not render")
-          else:
-              print("defaults: no security-config ConfigMap (unchanged)")
-
-          # Case 2: filerWrite=true alone is the documented opt-in for
-          # the Admin UI Users tab. Configmap must render with
-          # [jwt.filer_signing] and NO [grpc.*] sections (cert paths
-          # only exist with mTLS).
-          out = render({
-              "global.seaweedfs.securityConfig.jwtSigning.filerWrite": "true",
-              "admin.enabled": "true",
-          })
-          cm = configmap(out, "test-seaweedfs-security-config")
-          if cm is None:
-              failed.append("filerWrite=true: security ConfigMap missing")
-          else:
-              toml = cm["data"]["security.toml"]
-              if "[jwt.filer_signing]" not in toml:
-                  failed.append("filerWrite=true: security.toml missing [jwt.filer_signing]")
-              if "[grpc" in toml:
-                  failed.append("filerWrite=true: security.toml unexpectedly has [grpc.*] (would need cert mounts)")
-              if "[jwt.filer_signing]" in toml and "[grpc" not in toml:
-                  print("filerWrite=true: security.toml has [jwt.filer_signing], no [grpc.*]")
-
-          # Case 3: filer + admin pods must MOUNT the security ConfigMap
-          # under filerWrite=true so the JWT key reaches both processes.
-          # Cert volumes must NOT be present (no mTLS).
-          for wl in ("test-seaweedfs-filer", "test-seaweedfs-admin"):
-              vols, mounts = workload_mounts(out, wl)
-              if vols is None:
-                  failed.append(f"filerWrite=true: workload {wl} not found")
-                  continue
-              if "security-config" not in vols or "security-config" not in mounts:
-                  failed.append(f"filerWrite=true: {wl} does not mount security-config (IAM gRPC would still fail)")
-              else:
-                  print(f"filerWrite=true: {wl} mounts security-config")
-              cert_vols = {v for v in vols if v.endswith("-cert")}
-              if cert_vols:
-                  failed.append(f"filerWrite=true: {wl} unexpectedly has cert volumes {sorted(cert_vols)}")
-
-          # Case 4: enableSecurity=true must still render the full toml
-          # with both [jwt.signing] and [grpc.*]. Guards against the
-          # decoupling change accidentally regressing the mTLS path.
-          out = render({"global.seaweedfs.enableSecurity": "true"})
-          cm = configmap(out, "test-seaweedfs-security-config")
-          if cm is None:
-              failed.append("enableSecurity=true: security ConfigMap missing")
-          else:
-              toml = cm["data"]["security.toml"]
-              missing = [s for s in ("[jwt.signing]", "[grpc.master]") if s not in toml]
-              if missing:
-                  failed.append(f"enableSecurity=true: security.toml missing {missing}")
-              else:
-                  print("enableSecurity=true: security.toml has [jwt.signing] + [grpc.*] preserved")
-
-          # Case 5: helper must tolerate explicit nulls (gemini-code-assist
-          # PR review). securityConfig=null was the parens-pattern crash
-          # the helper review caught.
-          for null_path in ("global.seaweedfs.securityConfig",
-                            "global.seaweedfs.securityConfig.jwtSigning"):
-              try:
-                  out = render({null_path: "null"})
-              except subprocess.CalledProcessError as e:
-                  failed.append(f"{null_path}=null: render failed: {e.output[:200] if e.output else e}")
-                  continue
-              if configmap(out, "test-seaweedfs-security-config") is not None:
-                  failed.append(f"{null_path}=null: should not render configmap")
-              else:
-                  print(f"{null_path}=null: render tolerates explicit null")
-
-          if failed:
-              print("\nFAIL:", file=sys.stderr)
-              for f in failed:
-                  print(f"  - {f}", file=sys.stderr)
-              sys.exit(1)
-          PYEOF
-          echo "IAM gRPC decoupling tests passed"
+          echo "✓ Security configuration renders correctly"
 
           echo "=== Testing with monitoring enabled ==="
           helm template test $CHART_DIR \
             --set global.seaweedfs.monitoring.enabled=true \
             --set global.seaweedfs.monitoring.gatewayHost=prometheus \
             --set global.seaweedfs.monitoring.gatewayPort=9091 > /tmp/monitoring.yaml
-          echo "Monitoring configuration renders correctly"
+          echo "✓ Monitoring configuration renders correctly"
           
           echo "=== Testing with PVC storage ==="
           helm template test $CHART_DIR \
@@ -259,25 +81,25 @@ jobs:
             --set master.data.size=10Gi \
             --set master.data.storageClass=standard > /tmp/pvc.yaml
           grep -q "PersistentVolumeClaim" /tmp/pvc.yaml
-          echo "PVC configuration renders correctly"
+          echo "✓ PVC configuration renders correctly"
           
           echo "=== Testing with custom replicas ==="
           helm template test $CHART_DIR \
             --set master.replicas=3 \
             --set filer.replicas=2 \
             --set volume.replicas=3 > /tmp/replicas.yaml
-          echo "Custom replicas configuration renders correctly"
+          echo "✓ Custom replicas configuration renders correctly"
           
           echo "=== Testing filer with S3 gateway ==="
           helm template test $CHART_DIR \
             --set filer.s3.enabled=true \
             --set filer.s3.enableAuth=true > /tmp/filer-s3.yaml
-          echo "Filer S3 gateway renders correctly"
+          echo "✓ Filer S3 gateway renders correctly"
           
           echo "=== Testing SFTP enabled ==="
           helm template test $CHART_DIR --set sftp.enabled=true > /tmp/sftp.yaml
           grep -q "seaweedfs-sftp" /tmp/sftp.yaml
-          echo "SFTP deployment renders correctly"
+          echo "✓ SFTP deployment renders correctly"
           
           echo "=== Testing ingress configurations ==="
           helm template test $CHART_DIR \
@@ -286,12 +108,12 @@ jobs:
             --set s3.enabled=true \
             --set s3.ingress.enabled=true > /tmp/ingress.yaml
           grep -q "kind: Ingress" /tmp/ingress.yaml
-          echo "Ingress configurations render correctly"
+          echo "✓ Ingress configurations render correctly"
           
           echo "=== Testing COSI driver ==="
           helm template test $CHART_DIR --set cosi.enabled=true > /tmp/cosi.yaml
           grep -q "seaweedfs-cosi" /tmp/cosi.yaml
-          echo "COSI driver renders correctly"
+          echo "✓ COSI driver renders correctly"
           
           echo ""
           echo "=== Testing long release name: service names match DNS references ==="
@@ -334,7 +156,7 @@ jobs:
           [ "$MASTER_SVC" = "$MASTER_ADDR_SVC" ] || { echo "FAIL: master service name mismatch"; exit 1; }
           [ "$FILER_CLIENT_SVC" = "$FILER_ADDR_SVC" ] || { echo "FAIL: filer-client service name mismatch"; exit 1; }
           [ "$FILER_CLIENT_SVC" = "$S3_FILER_SVC" ] || { echo "FAIL: S3 -filer= does not match filer-client service"; exit 1; }
-          echo "Normal mode: service names match DNS references with long release name"
+          echo "✓ Normal mode: service names match DNS references with long release name"
 
           # --- All-in-one mode: all-in-one service vs both helper addresses ---
           helm template "$LONG_RELEASE" $CHART_DIR \
@@ -354,7 +176,7 @@ jobs:
 
           [ "$AIO_SVC" = "$AIO_MASTER_ADDR_SVC" ] || { echo "FAIL: all-in-one master address mismatch"; exit 1; }
           [ "$AIO_SVC" = "$AIO_FILER_ADDR_SVC" ] || { echo "FAIL: all-in-one filer address mismatch"; exit 1; }
-          echo "All-in-one mode: service names match DNS references with long release name"
+          echo "✓ All-in-one mode: service names match DNS references with long release name"
 
           echo ""
           echo "=== Testing security+S3: no blank lines in shell command blocks ==="
@@ -392,7 +214,7 @@ jobs:
                   print(f"FAIL: {e}", file=sys.stderr)
               print("Rendered with: global.seaweedfs.enableSecurity=true, filer.s3.enabled=true, s3.enabled=true, allInOne.enabled=true", file=sys.stderr)
               sys.exit(1)
-          print("No blank lines in security+S3 command blocks")
+          print("✓ No blank lines in security+S3 command blocks")
           PYEOF
 
           echo ""
@@ -470,7 +292,7 @@ jobs:
                             f"(got cert={has_cert} key={has_key} https={has_https})", file=sys.stderr)
                       failed = True
                   else:
-                      print(f"{label}: cert/key/https args emitted together")
+                      print(f"✓ {label}: cert/key/https args emitted together")
               else:
                   if has_cert or has_key or has_https:
                       print(f"FAIL: {label}: expected none of {cert_flag}/{key_flag}/{https_flag}; "
@@ -478,7 +300,7 @@ jobs:
                             f"(got cert={has_cert} key={has_key} https={has_https})", file=sys.stderr)
                       failed = True
                   else:
-                      print(f"{label}: no TLS args emitted, main -port stays HTTP")
+                      print(f"✓ {label}: no TLS args emitted, main -port stays HTTP")
 
               # bash -n: pin down that the rendered script parses. Guards against
               # a future helper change that leaves a dangling `\` with nothing
@@ -495,49 +317,7 @@ jobs:
           sys.exit(1 if failed else 0)
           PYEOF
 
-          echo ""
-          echo "=== Testing all-in-one env: a key in both global and component renders once ==="
-          # Regression: all-in-one looped global and component extraEnvironmentVars
-          # in two separate ranges, emitting duplicate env entries for any key set
-          # in both maps. Render a shared key and assert it appears exactly once in
-          # the all-in-one container, with the component value winning (consistent
-          # with the merge helper the other components already use). pyyaml is
-          # installed by the earlier IAM gRPC block in this same step.
-          helm template test $CHART_DIR \
-            --set allInOne.enabled=true \
-            --set global.seaweedfs.extraEnvironmentVars.WEED_SHARED=fromGlobal \
-            --set allInOne.extraEnvironmentVars.WEED_SHARED=fromComponent > /tmp/aio-env.yaml
-          python3 - /tmp/aio-env.yaml <<'PYEOF'
-          import sys, yaml
-          from collections import Counter
-          docs = [d for d in yaml.safe_load_all(open(sys.argv[1])) if d]
-          dep = next(d for d in docs if d.get("kind") == "Deployment"
-                     and d["metadata"]["name"].endswith("all-in-one"))
-          envs = [e["name"] for c in dep["spec"]["template"]["spec"]["containers"]
-                  for e in c.get("env", [])]
-          dups = {k: v for k, v in Counter(envs).items() if v > 1}
-          if dups:
-              print(f"FAIL: duplicate env entries in all-in-one container: {dups}", file=sys.stderr)
-              sys.exit(1)
-          val = next(e.get("value") for c in dep["spec"]["template"]["spec"]["containers"]
-                     for e in c.get("env", []) if e["name"] == "WEED_SHARED")
-          if val != "fromComponent":
-              print(f"FAIL: WEED_SHARED should take the component value 'fromComponent', got '{val}'",
-                    file=sys.stderr)
-              sys.exit(1)
-          print("all-in-one env: shared key renders once, component value wins")
-          PYEOF
-
-          echo "=== Testing bucket versioning: YAML bool false suspends like string \"false\" ==="
-          # bool false used to be a silent no-op while string "false" suspended.
-          BOOL_FALSE=$(helm template test $CHART_DIR \
-            --set s3.enabled=true \
-            --set s3.createBuckets[0].name=verbucket \
-            --set s3.createBuckets[0].versioning=false | grep 's3.bucket.versioning -name verbucket' || true)
-          echo "$BOOL_FALSE" | grep -q -- '-status Suspended' || { echo "FAIL: bool false versioning did not Suspend the bucket"; exit 1; }
-          echo "Bucket versioning: YAML bool false suspends consistently with string \"false\""
-
-          echo "All template rendering tests passed!"
+          echo "✅ All template rendering tests passed!"
 
       - name: Create kind cluster
         uses: helm/kind-action@v1.14.0

.github/workflows/kafka-quicktest.yml

@@ -32,11 +32,6 @@ jobs:
           **/go.sum
       id: go
 
-    - name: Configure Docker Hub mirror
-      run: |
-        echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-        sudo systemctl restart docker
-
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v4
 

.github/workflows/nfs-tests.yml

@@ -0,0 +1,137 @@
+name: "NFS Integration Tests"
+
+on:
+  push:
+    branches: [ master, main ]
+    paths:
+      - 'weed/server/nfs/**'
+      - 'weed/command/nfs.go'
+      - 'weed/filer/filer_inode.go'
+      - 'weed/filer/filer_inode_index.go'
+      - 'weed/filer/filerstore_wrapper.go'
+      - 'weed/server/filer_grpc_server_rename.go'
+      - 'test/nfs/**'
+      - '.github/workflows/nfs-tests.yml'
+  pull_request:
+    branches: [ master, main ]
+    paths:
+      - 'weed/server/nfs/**'
+      - 'weed/command/nfs.go'
+      - 'weed/filer/filer_inode.go'
+      - 'weed/filer/filer_inode_index.go'
+      - 'weed/filer/filerstore_wrapper.go'
+      - 'weed/server/filer_grpc_server_rename.go'
+      - 'test/nfs/**'
+      - '.github/workflows/nfs-tests.yml'
+
+concurrency:
+  group: ${{ github.head_ref }}/nfs-tests
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+env:
+  TEST_TIMEOUT: '15m'
+
+jobs:
+  nfs-integration:
+    name: NFS Integration Testing
+    runs-on: ubuntu-22.04
+    timeout-minutes: 20
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v6
+
+    - name: Set up Go
+      uses: actions/setup-go@v6
+      with:
+        go-version-file: 'go.mod'
+
+    - name: Build SeaweedFS
+      run: |
+        cd weed
+        go build -o weed .
+        chmod +x weed
+        ./weed version
+
+    - name: Run NFS Integration Tests
+      run: |
+        cd test/nfs
+
+        echo "Running NFS integration tests..."
+        echo "============================================"
+
+        # Install test dependencies
+        go mod download
+
+        # Run the protocol-layer tests. The kernel-mount tests require root
+        # for mount(2) and are exercised in their own privileged step below;
+        # skip them here so a "skipped because not root" line doesn't show
+        # up as noise on every CI run.
+        go test -v -timeout=${{ env.TEST_TIMEOUT }} -skip '^TestKernelMount' ./...
+
+        echo "============================================"
+        echo "NFS integration tests completed"
+
+    - name: Install kernel NFS client
+      run: |
+        # nfs-common provides mount.nfs; netbase provides /etc/protocols
+        # which mount.nfs's protocol-name lookups (`tcp`, `udp`) need.
+        sudo apt-get update
+        sudo apt-get install -y nfs-common netbase
+
+    - name: Run kernel-mount E2E tests
+      run: |
+        cd test/nfs
+
+        echo "Running kernel-mount end-to-end tests..."
+        echo "These mount the running 'weed nfs' subprocess via the actual"
+        echo "Linux NFS client to catch protocol regressions invisible to"
+        echo "the go-nfs-client-based tests above."
+        echo "============================================"
+
+        # mount(2) is privileged. Preserve PATH so 'go' (and the weed
+        # binary that test/nfs/framework.go locates via $PATH) resolve
+        # correctly under sudo, and pass through the Go module/cache dirs
+        # so we don't redownload modules under root.
+        sudo env "PATH=$PATH" \
+          GOMODCACHE="$(go env GOMODCACHE)" \
+          GOCACHE="$(go env GOCACHE)" \
+          go test -v -timeout=${{ env.TEST_TIMEOUT }} -run '^TestKernelMount' ./...
+
+        echo "============================================"
+        echo "Kernel-mount E2E tests completed"
+
+    - name: Test Summary
+      if: always()
+      run: |
+        echo "## NFS Integration Test Summary" >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        echo "### Test Coverage" >> $GITHUB_STEP_SUMMARY
+        echo "- **Read/Write Round Trip**: Basic file create + read" >> $GITHUB_STEP_SUMMARY
+        echo "- **Directory Operations**: Mkdir, ReadDirPlus, RmDir" >> $GITHUB_STEP_SUMMARY
+        echo "- **Nested Directories**: Deep tree creation and leaf I/O" >> $GITHUB_STEP_SUMMARY
+        echo "- **Rename**: Content preserved across rename" >> $GITHUB_STEP_SUMMARY
+        echo "- **Overwrite + Truncate**: Setattr(size=0) + shorter write" >> $GITHUB_STEP_SUMMARY
+        echo "- **Large Files**: 3 MiB binary round trip" >> $GITHUB_STEP_SUMMARY
+        echo "- **Edge Payloads**: All 256 byte values + empty files" >> $GITHUB_STEP_SUMMARY
+        echo "- **Symlinks**: Symlink + Lookup" >> $GITHUB_STEP_SUMMARY
+        echo "- **Missing Path**: Remove on missing entry errors cleanly" >> $GITHUB_STEP_SUMMARY
+        echo "- **FSINFO**: Non-zero rtpref/wtpref advertised" >> $GITHUB_STEP_SUMMARY
+        echo "- **Sequential Append**: Two-part concatenation" >> $GITHUB_STEP_SUMMARY
+        echo "- **ReadDir After Remove**: Meta cache does not serve stale entries" >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        echo "### Kernel-Mount E2E Coverage" >> $GITHUB_STEP_SUMMARY
+        echo "- **V3 over TCP**: baseline NFSv3 mount + readdir" >> $GITHUB_STEP_SUMMARY
+        echo "- **V3 with mountproto=udp**: regression test for UDP MOUNT v3 responder" >> $GITHUB_STEP_SUMMARY
+        echo "- **V4 rejects cleanly**: regression test for the v4 PROG_MISMATCH path (#9262)" >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        echo "### Harness" >> $GITHUB_STEP_SUMMARY
+        echo "Most tests boot their own master + volume + filer + nfs subprocess" >> $GITHUB_STEP_SUMMARY
+        echo "stack on loopback and drive it via the NFSv3 RPC protocol using" >> $GITHUB_STEP_SUMMARY
+        echo "go-nfs-client. The kernel-mount E2E tests reuse the same harness" >> $GITHUB_STEP_SUMMARY
+        echo "but mount the export through the in-tree Linux NFS client to" >> $GITHUB_STEP_SUMMARY
+        echo "catch protocol regressions a Go-only client can't see; they run" >> $GITHUB_STEP_SUMMARY
+        echo "in a separate privileged step (mount(2) requires root)." >> $GITHUB_STEP_SUMMARY

.github/workflows/postgres-tests.yml

@@ -31,11 +31,6 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v6
 
-    - name: Configure Docker Hub mirror
-      run: |
-        echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-        sudo systemctl restart docker
-
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v4
 

.github/workflows/rust_binaries_release.yml

@@ -66,42 +66,34 @@ jobs:
           SEAWEEDFS_COMMIT: ${{ github.sha }}
         run: |
           cd seaweed-volume
-          cargo build --release --target ${{ matrix.target }} --target-dir target/large-disk
+          cargo build --release --target ${{ matrix.target }}
 
       - name: Build Rust volume server (normal)
         env:
           SEAWEEDFS_COMMIT: ${{ github.sha }}
         run: |
           cd seaweed-volume
-          cargo build --release --target ${{ matrix.target }} --no-default-features --target-dir target/normal
+          cargo build --release --target ${{ matrix.target }} --no-default-features
 
       - name: Package binaries
         run: |
           # Large disk (default, 5bytes feature)
-          cp seaweed-volume/target/large-disk/${{ matrix.target }}/release/weed-volume weed-volume-large-disk
+          cp seaweed-volume/target/${{ matrix.target }}/release/weed-volume weed-volume-large-disk
           tar czf weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz weed-volume-large-disk
           rm weed-volume-large-disk
 
           # Normal volume size
-          cp seaweed-volume/target/normal/${{ matrix.target }}/release/weed-volume weed-volume-normal
+          cp seaweed-volume/target/${{ matrix.target }}/release/weed-volume weed-volume-normal
           tar czf weed-volume_${{ matrix.asset_suffix }}.tar.gz weed-volume-normal
           rm weed-volume-normal
 
-      - name: Generate md5 checksums
-        run: |
-          for f in weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz weed-volume_${{ matrix.asset_suffix }}.tar.gz; do
-            md5sum "$f" > "$f.md5"
-          done
-
       - name: Upload release assets
         if: startsWith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v3
         with:
           files: |
             weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz
-            weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz.md5
             weed-volume_${{ matrix.asset_suffix }}.tar.gz
-            weed-volume_${{ matrix.asset_suffix }}.tar.gz.md5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -112,9 +104,7 @@ jobs:
           name: rust-volume-${{ matrix.asset_suffix }}
           path: |
             weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz
-            weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz.md5
             weed-volume_${{ matrix.asset_suffix }}.tar.gz
-            weed-volume_${{ matrix.asset_suffix }}.tar.gz.md5
 
   build-rust-volume-darwin:
     permissions:
@@ -155,40 +145,32 @@ jobs:
           SEAWEEDFS_COMMIT: ${{ github.sha }}
         run: |
           cd seaweed-volume
-          cargo build --release --target ${{ matrix.target }} --target-dir target/large-disk
+          cargo build --release --target ${{ matrix.target }}
 
       - name: Build Rust volume server (normal)
         env:
           SEAWEEDFS_COMMIT: ${{ github.sha }}
         run: |
           cd seaweed-volume
-          cargo build --release --target ${{ matrix.target }} --no-default-features --target-dir target/normal
+          cargo build --release --target ${{ matrix.target }} --no-default-features
 
       - name: Package binaries
         run: |
-          cp seaweed-volume/target/large-disk/${{ matrix.target }}/release/weed-volume weed-volume-large-disk
+          cp seaweed-volume/target/${{ matrix.target }}/release/weed-volume weed-volume-large-disk
           tar czf weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz weed-volume-large-disk
           rm weed-volume-large-disk
 
-          cp seaweed-volume/target/normal/${{ matrix.target }}/release/weed-volume weed-volume-normal
+          cp seaweed-volume/target/${{ matrix.target }}/release/weed-volume weed-volume-normal
           tar czf weed-volume_${{ matrix.asset_suffix }}.tar.gz weed-volume-normal
           rm weed-volume-normal
 
-      - name: Generate md5 checksums
-        run: |
-          for f in weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz weed-volume_${{ matrix.asset_suffix }}.tar.gz; do
-            md5 -r "$f" > "$f.md5"
-          done
-
       - name: Upload release assets
         if: startsWith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v3
         with:
           files: |
             weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz
-            weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz.md5
             weed-volume_${{ matrix.asset_suffix }}.tar.gz
-            weed-volume_${{ matrix.asset_suffix }}.tar.gz.md5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -199,9 +181,7 @@ jobs:
           name: rust-volume-${{ matrix.asset_suffix }}
           path: |
             weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz
-            weed-volume_large_disk_${{ matrix.asset_suffix }}.tar.gz.md5
             weed-volume_${{ matrix.asset_suffix }}.tar.gz
-            weed-volume_${{ matrix.asset_suffix }}.tar.gz.md5
 
   build-rust-volume-windows:
     permissions:
@@ -233,42 +213,33 @@ jobs:
           SEAWEEDFS_COMMIT: ${{ github.sha }}
         run: |
           cd seaweed-volume
-          cargo build --release --target-dir target/large-disk
+          cargo build --release
 
       - name: Build Rust volume server (normal)
         env:
           SEAWEEDFS_COMMIT: ${{ github.sha }}
         run: |
           cd seaweed-volume
-          cargo build --release --no-default-features --target-dir target/normal
+          cargo build --release --no-default-features
 
       - name: Package binaries
         shell: bash
         run: |
-          cp seaweed-volume/target/large-disk/release/weed-volume.exe weed-volume-large-disk.exe
+          cp seaweed-volume/target/release/weed-volume.exe weed-volume-large-disk.exe
           7z a weed-volume_large_disk_windows_amd64.zip weed-volume-large-disk.exe
           rm weed-volume-large-disk.exe
 
-          cp seaweed-volume/target/normal/release/weed-volume.exe weed-volume-normal.exe
+          cp seaweed-volume/target/release/weed-volume.exe weed-volume-normal.exe
           7z a weed-volume_windows_amd64.zip weed-volume-normal.exe
           rm weed-volume-normal.exe
 
-      - name: Generate md5 checksums
-        shell: bash
-        run: |
-          for f in weed-volume_large_disk_windows_amd64.zip weed-volume_windows_amd64.zip; do
-            md5sum "$f" > "$f.md5"
-          done
-
       - name: Upload release assets
         if: startsWith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v3
         with:
           files: |
             weed-volume_large_disk_windows_amd64.zip
-            weed-volume_large_disk_windows_amd64.zip.md5
             weed-volume_windows_amd64.zip
-            weed-volume_windows_amd64.zip.md5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -279,6 +250,4 @@ jobs:
           name: rust-volume-windows_amd64
           path: |
             weed-volume_large_disk_windows_amd64.zip
-            weed-volume_large_disk_windows_amd64.zip.md5
             weed-volume_windows_amd64.zip
-            weed-volume_windows_amd64.zip.md5

.github/workflows/s3-go-tests.yml

@@ -245,77 +245,6 @@ jobs:
           path: test/s3/retention/weed-test*.log
           retention-days: 3
 
-  s3-lifecycle-tests:
-    name: S3 Lifecycle Tests
-    runs-on: ubuntu-22.04
-    timeout-minutes: 10
-    strategy:
-      fail-fast: false
-      matrix:
-        # One job per test so each gets a fresh `weed mini` server, avoiding
-        # the cross-test volume-pool exhaustion that surfaced when several
-        # TTL-pinned bucket collections piled up in a single run.
-        test:
-          - TestLifecycleAbortIncompleteMultipartUpload
-          - TestLifecycleAdminDispatchSucceedsWithCustomFilerGrpcPort
-          - TestLifecycleBootstrapWalkOnExistingObjects
-          - TestLifecycleConfigUpdateBetweenSweeps
-          - TestLifecycleDeleteBucketLifecycleStopsDispatching
-          - TestLifecycleDisabledRuleSkipsObject
-          - TestLifecycleEmptyBucketSweepIsNoOp
-          - TestLifecycleExpirationDateInThePast
-          - TestLifecycleExpirationFiresOnBackdatedObject
-          - TestLifecycleExpiredDeleteMarkerCleanup
-          - TestLifecycleMultipleBucketsInOneSweep
-          - TestLifecycleMultipleRulesInOneBucket
-          - TestLifecycleNewerNoncurrentVersions
-          - TestLifecycleNoncurrentVersionExpiration
-          - TestLifecycleSizeFilterGreaterThan
-          - TestLifecycleSkipsObjectLockedObjects
-          - TestLifecycleSuspendedVersioningExpiration
-          - TestLifecycleTagFilter
-          - TestLifecycleVersionedBucketCreatesDeleteMarker
-
-    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 ${{ matrix.test }}
-        timeout-minutes: 8
-        working-directory: test/s3/lifecycle
-        run: |
-          set -x
-          make test-with-server TEST_PATTERN='^${{ matrix.test }}$$'
-
-      - name: Show server logs on failure
-        if: failure()
-        working-directory: test/s3/lifecycle
-        run: |
-          if [ -f weed-test.log ]; then
-            echo "=== Last 200 lines of server logs ==="
-            tail -200 weed-test.log
-          fi
-          ps aux | grep -E "(weed|test)" || true
-          netstat -tlnp 2>/dev/null | grep -E "(8333|9333|8080|8888)" || true
-
-      - name: Upload test logs on failure
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: s3-lifecycle-test-logs-${{ matrix.test }}
-          path: test/s3/lifecycle/weed-test*.log
-          retention-days: 3
-
   s3-checksum-tests:
     name: S3 Checksum Tests
     runs-on: ubuntu-22.04

.github/workflows/s3-proxy-signature-tests.yml

@@ -28,11 +28,6 @@ jobs:
           go-version-file: 'go.mod'
         id: go
 
-      - name: Configure Docker Hub mirror
-        run: |
-          echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
@@ -76,10 +71,8 @@ jobs:
           echo "Waiting for SeaweedFS S3 gateway to be ready via proxy..."
           S3_READY=0
           for i in $(seq 1 30); do
-            # Check logs first for the readiness line. weed mini's progress
-            # board prints "  S3           ready (Xs)"; older builds and the
-            # standalone S3 binary log "S3 (gateway|service) ... ready".
-            if docker compose logs seaweedfs 2>&1 | grep -qE "S3 (gateway|service).*(started|ready)|S3[[:space:]]+ready"; then
+            # Check logs first for startup message (weed mini says "S3 service is ready")
+            if docker compose logs seaweedfs 2>&1 | grep -qE "S3 (gateway|service).*(started|ready)"; then
               echo "SeaweedFS S3 gateway is ready"
               S3_READY=1
               break

.github/workflows/s3-sdk-v2-routing-tests.yml

@@ -1,110 +0,0 @@
-name: "S3 SDK V2 Route Disambiguation Tests"
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'weed/s3api/**'
-      - 'test/s3/sdk_v2_routing/**'
-      - '.github/workflows/s3-sdk-v2-routing-tests.yml'
-  pull_request:
-    branches: [ master ]
-    paths:
-      - 'weed/s3api/**'
-      - 'test/s3/sdk_v2_routing/**'
-      - '.github/workflows/s3-sdk-v2-routing-tests.yml'
-
-concurrency:
-  group: ${{ github.head_ref || github.ref }}/s3-sdk-v2-routing-tests
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  s3-sdk-v2-routing-tests:
-    name: S3 SDK V2 Routing Tests
-    runs-on: ubuntu-22.04
-    timeout-minutes: 10
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v6
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: 'go.mod'
-
-      - name: Install SeaweedFS
-        run: |
-          cd weed && go install -buildvcs=false
-
-      - name: Start weed mini (S3 on :8333)
-        # Pins the regression for issue #9559: AWS SDK V2 / Hadoop s3a
-        # listing a bucket literally named "buckets" must get an XML
-        # ListObjectsV2 response, not the JSON ListTableBuckets body
-        # served by the S3 Tables REST endpoint on the same path.
-        run: |
-          mkdir -p /tmp/seaweedfs-sdk-v2-routing
-          cat > /tmp/seaweedfs-sdk-v2-routing-s3.json <<'JSON'
-          {
-            "identities": [
-              {
-                "name": "admin",
-                "credentials": [
-                  {"accessKey": "some_access_key1", "secretKey": "some_secret_key1"}
-                ],
-                "actions": ["Admin", "Read", "Write"]
-              }
-            ]
-          }
-          JSON
-          AWS_ACCESS_KEY_ID=some_access_key1 \
-          AWS_SECRET_ACCESS_KEY=some_secret_key1 \
-            weed mini \
-              -dir=/tmp/seaweedfs-sdk-v2-routing \
-              -s3.port=8333 \
-              -s3.config=/tmp/seaweedfs-sdk-v2-routing-s3.json \
-              -ip=127.0.0.1 \
-              > /tmp/weed-mini.log 2>&1 &
-          echo $! > /tmp/weed-mini.pid
-
-          for i in $(seq 1 30); do
-            if curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:8333/ | grep -qE "^(200|403)$"; then
-              echo "weed mini is ready"
-              exit 0
-            fi
-            sleep 1
-          done
-          echo "weed mini failed to start within 30s"
-          tail -50 /tmp/weed-mini.log
-          exit 1
-
-      - name: Run SDK V2 routing tests
-        env:
-          S3_ENDPOINT: http://127.0.0.1:8333
-          AWS_ACCESS_KEY_ID: some_access_key1
-          AWS_SECRET_ACCESS_KEY: some_secret_key1
-          AWS_REGION: us-east-1
-        run: go test -v -timeout=5m ./test/s3/sdk_v2_routing/...
-
-      - name: Stop weed mini
-        if: always()
-        run: |
-          if [ -f /tmp/weed-mini.pid ]; then
-            kill "$(cat /tmp/weed-mini.pid)" 2>/dev/null || true
-          fi
-
-      - name: Show server log on failure
-        if: failure()
-        run: |
-          echo "=== weed mini log (last 200 lines) ==="
-          tail -n 200 /tmp/weed-mini.log 2>/dev/null || echo "no log available"
-
-      - name: Archive log
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: s3-sdk-v2-routing-server-log
-          path: /tmp/weed-mini.log
-          retention-days: 3

.github/workflows/s3-spark-tests.yml

@@ -33,19 +33,15 @@ jobs:
           go-version-file: 'go.mod'
         id: go
 
-      - name: Configure Docker Hub mirror
-        run: |
-          echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v4
 
       - name: Install SeaweedFS
         run: |
           go install -buildvcs=false ./weed
 
       - name: Pre-pull Spark image
-        run: |
-          pull() { for i in 1 2 3; do docker pull "$1" && return 0; sleep 15; done; return 1; }
-          pull apache/spark:3.5.1
+        run: docker pull apache/spark:3.5.8
 
       - name: Run S3 Spark integration tests
         working-directory: test/s3/spark

.github/workflows/s3-tables-tests.yml

@@ -83,11 +83,6 @@ jobs:
           go-version-file: 'go.mod'
         id: go
 
-      - name: Configure Docker Hub mirror
-        run: |
-          echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
-
       - name: Run go mod tidy
         run: go mod tidy
 
@@ -144,15 +139,11 @@ jobs:
           go-version-file: 'go.mod'
         id: go
 
-      - name: Configure Docker Hub mirror
-        run: |
-          echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v4
 
       - name: Pre-pull Trino image
-        run: |
-          pull() { for i in 1 2 3; do docker pull "$1" && return 0; sleep 15; done; return 1; }
-          pull trinodb/trino:479
+        run: docker pull trinodb/trino:479
 
       - name: Run go mod tidy
         run: go mod tidy
@@ -214,16 +205,14 @@ jobs:
           go-version-file: 'go.mod'
         id: go
 
-      - name: Configure Docker Hub mirror
-        run: |
-          echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v4
 
-      - name: Pre-pull images
-        run: |
-          pull() { for i in 1 2 3; do docker pull "$1" && return 0; sleep 15; done; return 1; }
-          pull dremio/dremio-oss:25.2.0
-          pull python:3.11-slim
+      - name: Pre-pull Dremio image
+        run: docker pull dremio/dremio-oss:25.2.0
+
+      - name: Pre-pull Python image for PyIceberg writer
+        run: docker pull python:3.11-slim
 
       - name: Run go mod tidy
         run: go mod tidy
@@ -287,16 +276,14 @@ jobs:
           go-version-file: 'go.mod'
         id: go
 
-      - name: Configure Docker Hub mirror
-        run: |
-          echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v4
 
-      - name: Pre-pull images
-        run: |
-          pull() { for i in 1 2 3; do docker pull "$1" && return 0; sleep 15; done; return 1; }
-          pull apache/doris:doris-all-in-one-2.1.0
-          pull python:3.11-slim
+      - name: Pre-pull Doris image
+        run: docker pull apache/doris:doris-all-in-one-2.1.0
+
+      - name: Pre-pull Python image for PyIceberg writer
+        run: docker pull python:3.11-slim
 
       - name: Run go mod tidy
         run: go mod tidy
@@ -367,15 +354,8 @@ jobs:
         run: |
           go install -buildvcs=false ./weed
 
-      - name: Configure Docker Hub mirror
-        run: |
-          echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
-
       - name: Pre-pull Polaris image
-        run: |
-          pull() { for i in 1 2 3; do docker pull "$1" && return 0; sleep 15; done; return 1; }
-          pull apache/polaris:latest
+        run: docker pull apache/polaris:latest
 
       - name: Run Polaris Integration Tests
         timeout-minutes: 25
@@ -428,15 +408,11 @@ jobs:
           go-version-file: 'go.mod'
         id: go
 
-      - name: Configure Docker Hub mirror
-        run: |
-          echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v4
 
       - name: Pre-pull Spark image
-        run: |
-          pull() { for i in 1 2 3; do docker pull "$1" && return 0; sleep 15; done; return 1; }
-          pull apache/spark:3.5.1
+        run: docker pull apache/spark:3.5.1
 
       - name: Run go mod tidy
         run: go mod tidy
@@ -498,16 +474,13 @@ jobs:
           go-version-file: 'go.mod'
         id: go
 
-      - name: Configure Docker Hub mirror
-        run: |
-          echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v4
 
       - name: Pre-pull RisingWave image
         run: |
-          pull() { for i in 1 2 3; do docker pull "$1" && return 0; sleep 15; done; return 1; }
-          pull risingwavelabs/risingwave:v2.5.0
-          pull postgres:16-alpine
+          docker pull risingwavelabs/risingwave:v2.5.0
+          docker pull postgres:16-alpine
 
       - name: Run go mod tidy
         run: go mod tidy
@@ -569,39 +542,11 @@ jobs:
           go-version-file: 'go.mod'
         id: go
 
-      - name: Configure Docker Hub mirror
-        run: |
-          echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v4
 
-      - name: Week stamp for image cache key
-        id: week
-        run: echo "week=$(date -u +%G-%V)" >> "$GITHUB_OUTPUT"
-
-      - name: Restore python:3 image cache
-        id: python-image
-        uses: actions/cache@v5
-        with:
-          path: /tmp/python3-image.tar
-          key: python3-image-${{ steps.week.outputs.week }}
-          restore-keys: |
-            python3-image-
-
-      - name: Load or pull python:3
-        run: |
-          if [ "${{ steps.python-image.outputs.cache-hit }}" = "true" ]; then
-            docker load -i /tmp/python3-image.tar
-            exit 0
-          fi
-          pull() { for i in 1 2 3; do docker pull "$1" && return 0; sleep 15; done; return 1; }
-          if pull python:3; then
-            docker save -o /tmp/python3-image.tar python:3
-          elif [ -f /tmp/python3-image.tar ]; then
-            # Docker Hub unreachable; fall back to last week's cached image
-            docker load -i /tmp/python3-image.tar
-          else
-            exit 1
-          fi
+      - name: Pre-pull Python image
+        run: docker pull python:3
 
       - name: Run go mod tidy
         run: go mod tidy
@@ -663,6 +608,15 @@ jobs:
           go-version-file: 'go.mod'
         id: go
 
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v4
+
+      - name: Pre-pull Python image
+        run: docker pull python:3
+        
+      - name: Pre-pull LocalStack image (if needed)
+        run: docker pull localstack/localstack:latest || true
+
       - name: Run go mod tidy
         run: go mod tidy
 
@@ -708,79 +662,6 @@ jobs:
           path: test/s3tables/lakekeeper/test-output.log
           retention-days: 3
 
-  unity-catalog-integration-tests:
-    name: Unity Catalog Integration Tests
-    runs-on: ubuntu-22.04
-    timeout-minutes: 30
-
-    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: Configure Docker Hub mirror
-        run: |
-          echo '{"registry-mirrors": ["https://mirror.gcr.io"]}' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
-
-      - name: Pre-pull images
-        run: |
-          pull() { for i in 1 2 3; do docker pull "$1" && return 0; sleep 15; done; return 1; }
-          pull unitycatalog/unitycatalog:v0.4.0
-          pull python:3.11-slim
-
-      - name: Run go mod tidy
-        run: go mod tidy
-
-      - name: Install SeaweedFS
-        run: |
-          go install -buildvcs=false ./weed
-
-      - name: Run Unity Catalog Integration Tests
-        timeout-minutes: 25
-        working-directory: test/s3tables/unity_catalog
-        run: |
-          set -x
-          set -o pipefail
-          echo "=== System Information ==="
-          uname -a
-          free -h
-          df -h
-          docker info
-          echo "=== Starting Unity Catalog Tests ==="
-
-          go test -v -timeout 20m . 2>&1 | tee test-output.log || {
-            echo "Unity Catalog integration tests failed"
-            exit 1
-          }
-
-      - name: Show test output on failure
-        if: failure()
-        working-directory: test/s3tables/unity_catalog
-        run: |
-          echo "=== Test Output ==="
-          if [ -f test-output.log ]; then
-            tail -200 test-output.log
-          fi
-
-          echo "=== Process information ==="
-          ps aux | grep -E "(weed|test|docker|unitycatalog)" || true
-          echo "=== Unity Catalog containers ==="
-          docker ps -a --filter "name=seaweed-unity-catalog" || true
-
-      - name: Upload test logs on failure
-        if: failure()
-        uses: actions/upload-artifact@v7
-        with:
-          name: unity-catalog-integration-test-logs
-          path: test/s3tables/unity_catalog/test-output.log
-          retention-days: 3
-
   s3-tables-build-verification:
     name: S3 Tables Build Verification
     runs-on: ubuntu-22.04

.github/workflows/s3tests.yml

@@ -45,7 +45,7 @@ jobs:
 
       - name: Fix S3 tests bucket creation conflicts
         run: |
-          python3 test/s3/compatibility/fix_s3_tests_bucket_conflicts.py
+          python3 test/s3/fix_s3_tests_bucket_conflicts.py
         env:
           S3_TESTS_PATH: s3-tests
 
@@ -132,49 +132,7 @@ jobs:
           done
           
           echo "✅ S3 server is responding, starting tests..."
-
-          # Spawn the lifecycle worker so test_lifecycle_expiration etc. have
-          # something driving deletions. The s3tests build tag rescales one
-          # day to LifeCycleInterval=10s, so a 1d rule fires within ~10s of
-          # the upload's mtime; -dispatch / -checkpoint defaults are already
-          # tightened under the same build tag.
-          LC_LOG=/tmp/lifecycle-worker.log
-          # -debug routes glog to stderr so the bootstrap walker's progress
-          # shows up in $LC_LOG; without it weed shell silences glog.
-          (echo "s3.lifecycle.run-shard -shards 0-15 -s3 localhost:18000 -events 0 -runtime 1800s -refresh 2s" && echo exit) \
-            | weed shell -debug -master=localhost:9333 \
-            > "$LC_LOG" 2>&1 &
-          lc_pid=$!
-          # Aliveness check: a bad shell command exits in <1s and the suite
-          # would otherwise just timeout the expiration tests with no signal.
-          sleep 2
-          if ! kill -0 "$lc_pid" 2>/dev/null; then
-            echo "lifecycle worker died on startup"
-            tail -50 "$LC_LOG" 2>/dev/null || true
-            exit 1
-          fi
-          echo "lifecycle worker pid=$lc_pid"
-
-          # bash -e exits the step on the first tox failure, so move teardown
-          # into a trap to guarantee the worker log + data dir reach the runner.
-          cleanup() {
-            status=$?
-            # SIGTERM first so the worker's stdout flushes; SIGKILL is the
-            # bash fallback if it ignores TERM. Reading the log AFTER the
-            # graceful-stop window catches the bootstrap walker's progress.
-            kill -TERM "$lc_pid" 2>/dev/null || true
-            kill -TERM "$pid" 2>/dev/null || true
-            sleep 1
-            if [ "$status" -ne 0 ]; then
-              echo "=== lifecycle worker log (tail) ==="
-              tail -200 "$LC_LOG" 2>/dev/null || true
-            fi
-            kill -9 "$lc_pid" 2>/dev/null || true
-            kill -9 "$pid" 2>/dev/null || true
-            rm -rf "$WEED_DATA_DIR" 2>/dev/null || true
-          }
-          trap cleanup EXIT
-
+          
           tox -- \
           s3tests/functional/test_s3.py::test_bucket_list_empty \
           s3tests/functional/test_s3.py::test_bucket_list_distinct \
@@ -354,8 +312,11 @@ jobs:
           s3tests/functional/test_s3.py::test_lifecycle_get \
           s3tests/functional/test_s3.py::test_lifecycle_set_filter \
           s3tests/functional/test_s3.py::test_lifecycle_expiration \
-          s3tests/functional/test_s3.py::test_lifecyclev2_expiration
-          # cleanup() trap handles worker/server kill + data dir wipe.
+          s3tests/functional/test_s3.py::test_lifecyclev2_expiration \
+          s3tests/functional/test_s3.py::test_lifecycle_expiration_versioning_enabled
+          kill -9 $pid || true
+          # Clean up data directory
+          rm -rf "$WEED_DATA_DIR" || true
 
   versioning-tests:
     name: S3 Versioning & Object Lock tests
@@ -388,7 +349,7 @@ jobs:
 
       - name: Fix S3 tests bucket creation conflicts
         run: |
-          python3 test/s3/compatibility/fix_s3_tests_bucket_conflicts.py
+          python3 test/s3/fix_s3_tests_bucket_conflicts.py
         env:
           S3_TESTS_PATH: s3-tests
 
@@ -997,39 +958,6 @@ jobs:
             
             sleep 2
           done
-
-          # Spawn the lifecycle worker (see basic-tests block for context).
-          LC_LOG=/tmp/lifecycle-worker-sql.log
-          (echo "s3.lifecycle.run-shard -shards 0-15 -s3 localhost:18004 -events 0 -runtime 1800s -refresh 2s" && echo exit) \
-            | weed shell -debug -master=localhost:9337 \
-            > "$LC_LOG" 2>&1 &
-          lc_pid=$!
-          sleep 2
-          if ! kill -0 "$lc_pid" 2>/dev/null; then
-            echo "lifecycle worker died on startup"
-            tail -50 "$LC_LOG" 2>/dev/null || true
-            exit 1
-          fi
-          echo "lifecycle worker pid=$lc_pid"
-
-          cleanup() {
-            status=$?
-            # SIGTERM first so the worker's stdout flushes; SIGKILL is the
-            # bash fallback if it ignores TERM. Reading the log AFTER the
-            # graceful-stop window catches the bootstrap walker's progress.
-            kill -TERM "$lc_pid" 2>/dev/null || true
-            kill -TERM "$pid" 2>/dev/null || true
-            sleep 1
-            if [ "$status" -ne 0 ]; then
-              echo "=== lifecycle worker log (tail) ==="
-              tail -200 "$LC_LOG" 2>/dev/null || true
-            fi
-            kill -9 "$lc_pid" 2>/dev/null || true
-            kill -9 "$pid" 2>/dev/null || true
-            rm -rf "$WEED_DATA_DIR" 2>/dev/null || true
-          }
-          trap cleanup EXIT
-
           tox -- \
           s3tests/functional/test_s3.py::test_bucket_list_empty \
           s3tests/functional/test_s3.py::test_bucket_list_distinct \
@@ -1209,7 +1137,10 @@ jobs:
           s3tests/functional/test_s3.py::test_lifecycle_get \
           s3tests/functional/test_s3.py::test_lifecycle_set_filter \
           s3tests/functional/test_s3.py::test_lifecycle_expiration \
-          s3tests/functional/test_s3.py::test_lifecyclev2_expiration
-          # cleanup() trap handles worker/server kill + data dir wipe.
+          s3tests/functional/test_s3.py::test_lifecyclev2_expiration \
+          s3tests/functional/test_s3.py::test_lifecycle_expiration_versioning_enabled
+          kill -9 $pid || true
+          # Clean up data directory
+          rm -rf "$WEED_DATA_DIR" || true
 
 

.github/workflows/samba-integration.yml

@@ -1,120 +0,0 @@
-name: "Samba on FUSE Integration"
-
-on:
-  push:
-    branches: [ master, main ]
-    paths:
-      - 'weed/mount/**'
-      - 'weed/filer/**'
-      - 'weed/cluster/**'
-      - 'test/samba/**'
-      - '.github/workflows/samba-integration.yml'
-  pull_request:
-    branches: [ master, main ]
-    paths:
-      - 'weed/mount/**'
-      - 'weed/filer/**'
-      - 'weed/cluster/**'
-      - 'test/samba/**'
-      - '.github/workflows/samba-integration.yml'
-  workflow_dispatch:
-
-concurrency:
-  group: samba-integration/${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  samba-integration:
-    name: samba-integration
-    runs-on: ubuntu-22.04
-    timeout-minutes: 45
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v6
-
-    - name: Set up Go
-      uses: actions/setup-go@v6
-      with:
-        go-version-file: 'go.mod'
-
-    - name: Start local Docker registry
-      run: docker run -d --restart=always -p 5000:5000 --name registry registry:2
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v4
-      with:
-        driver-opts: network=host
-
-    - name: Build weed race binary
-      run: |
-        cd docker
-        make binary_race
-
-    - name: Build SeaweedFS e2e image
-      uses: docker/build-push-action@v7
-      with:
-        context: docker
-        file: docker/Dockerfile.e2e
-        tags: localhost:5000/chrislusf/seaweedfs:e2e
-        push: true
-        cache-from: type=gha,scope=samba-e2e
-        cache-to: type=gha,mode=max,scope=samba-e2e
-
-    - name: Tag e2e image for docker compose
-      run: |
-        docker pull localhost:5000/chrislusf/seaweedfs:e2e
-        docker tag localhost:5000/chrislusf/seaweedfs:e2e chrislusf/seaweedfs:e2e
-
-    - name: Build samba image
-      uses: docker/build-push-action@v7
-      with:
-        context: test/samba
-        build-contexts: |
-          chrislusf/seaweedfs:e2e=docker-image://localhost:5000/chrislusf/seaweedfs:e2e
-        tags: localhost:5000/chrislusf/seaweedfs:samba
-        push: true
-        cache-from: type=gha,scope=samba-harness
-        cache-to: type=gha,mode=max,scope=samba-harness
-
-    - name: Tag samba image for docker compose
-      run: |
-        docker pull localhost:5000/chrislusf/seaweedfs:samba
-        docker tag localhost:5000/chrislusf/seaweedfs:samba chrislusf/seaweedfs:samba
-
-    - name: Start SeaweedFS cluster and Samba
-      run: |
-        docker compose -f test/samba/docker-compose.yml up --wait
-
-    - name: Run Samba test battery
-      run: |
-        set -o pipefail
-        docker compose -f test/samba/docker-compose.yml exec -T samba \
-          /run_inside_container.sh 2>&1 | tee /tmp/samba-output.log
-
-    - name: Collect logs
-      if: always()
-      run: |
-        mkdir -p /tmp/samba-docker-logs
-        for svc in master volume filer samba; do
-          docker compose -f test/samba/docker-compose.yml logs "$svc" \
-            > "/tmp/samba-docker-logs/${svc}.log" 2>&1 || true
-        done
-
-    - name: Tear down
-      if: always()
-      run: |
-        docker compose -f test/samba/docker-compose.yml down -v
-
-    - name: Upload logs
-      if: always()
-      uses: actions/upload-artifact@v7
-      with:
-        name: samba-integration-results
-        path: |
-          /tmp/samba-output.log
-          /tmp/samba-docker-logs/
-        retention-days: 7

.github/workflows/terraform_ci.yml

@@ -1,80 +0,0 @@
-name: "terraform: validate and test modules"
-
-on:
-  push:
-    branches: [ master ]
-    paths: ['terraform/**', '.github/workflows/terraform_ci.yml']
-  pull_request:
-    branches: [ master ]
-    paths: ['terraform/**', '.github/workflows/terraform_ci.yml']
-
-permissions:
-  contents: read
-
-jobs:
-  validate:
-    name: fmt, validate, plan-level tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Set up OpenTofu
-        uses: opentofu/setup-opentofu@v2
-        with:
-          tofu_version: 1.12.1
-
-      - name: fmt check
-        working-directory: terraform
-        run: tofu fmt -recursive -check -diff
-
-      - name: validate core
-        working-directory: terraform/modules/core
-        run: |
-          tofu init -backend=false -input=false
-          tofu validate
-
-      - name: validate security
-        working-directory: terraform/modules/security
-        run: |
-          tofu init -backend=false -input=false
-          tofu validate
-
-      - name: plan-level tests (core)
-        working-directory: terraform/modules/core
-        run: tofu test
-
-      - name: validate examples
-        run: |
-          set -e
-          for ex in terraform/examples/*/; do
-            echo "== validate $ex =="
-            tofu -chdir="$ex" init -backend=false -input=false
-            tofu -chdir="$ex" validate
-          done
-
-  smoke:
-    name: local cluster smoke test (real weed)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: go.mod
-
-      - name: Build weed
-        run: go build -o "$RUNNER_TEMP/weed" ./weed
-
-      - name: Set up OpenTofu
-        uses: opentofu/setup-opentofu@v2
-        with:
-          tofu_version: 1.12.1
-
-      - name: Run local cluster harness
-        working-directory: terraform/test/local
-        run: WEED="$RUNNER_TEMP/weed" ./run_local_cluster.sh
-
-      - name: Run local mTLS cluster harness
-        working-directory: terraform/test/local-secure
-        run: WEED="$RUNNER_TEMP/weed" ./run_local_secure.sh

README.md

@@ -35,7 +35,6 @@ Your support will be really appreciated by me and other supporters!
 [![nodion](https://raw.githubusercontent.com/seaweedfs/seaweedfs/master/note/sponsor_nodion.png)](https://www.nodion.com)
 [![piknik](https://raw.githubusercontent.com/seaweedfs/seaweedfs/master/note/piknik.png)](https://www.piknik.com)
 [![keepsec](https://raw.githubusercontent.com/seaweedfs/seaweedfs/master/note/keepsec.png)](https://www.keepsec.ca)
-[![zyner](https://raw.githubusercontent.com/seaweedfs/seaweedfs/master/note/sponsor_zyner.png)](https://zyner.org)
 
 ---
 
@@ -510,22 +509,20 @@ SeaweedFS Filer uses off-the-shelf stores, such as MySql, Postgres, Sqlite, Mong
 
 ### Compared to MinIO ###
 
-Please note, as Apr 25, 2026 MinIO ceased developement. It's strongly discouraged to use that unmaintained software with multiple security bugs.
+MinIO follows AWS S3 closely and is ideal for testing for S3 API. It has good UI, policies, versionings, etc. SeaweedFS is trying to catch up here. It is also possible to put MinIO as a gateway in front of SeaweedFS later.
 
-MinIO followed AWS S3 closely and was ideal for testing for S3 API. It had good UI, policies, versionings, etc. SeaweedFS is trying to catch up here. 
+MinIO metadata are in simple files. Each file write will incur extra writes to corresponding meta file.
 
-MinIO metadata were in simple files. Each file write will incur extra writes to corresponding meta file.
-
-MinIO did not have optimization for lots of small files. The files were simply stored as is to local disks.
+MinIO does not have optimization for lots of small files. The files are simply stored as is to local disks.
 Plus the extra meta file and shards for erasure coding, it only amplifies the LOSF problem.
 
-MinIO had multiple disk IO to read one file. SeaweedFS has O(1) disk reads, even for erasure coded files.
+MinIO has multiple disk IO to read one file. SeaweedFS has O(1) disk reads, even for erasure coded files.
 
-MinIO had full-time erasure coding. SeaweedFS uses replication on hot data for faster speed and optionally applies erasure coding on warm data.
+MinIO has full-time erasure coding. SeaweedFS uses replication on hot data for faster speed and optionally applies erasure coding on warm data.
 
-MinIO did not have POSIX-like API support.
+MinIO does not have POSIX-like API support.
 
-MinIO had specific requirements on storage layout. It is not flexible to adjust capacity. In SeaweedFS, just start one volume server pointing to the master. That's all.
+MinIO has specific requirements on storage layout. It is not flexible to adjust capacity. In SeaweedFS, just start one volume server pointing to the master. That's all.
 
 ## Dev Plan ##
 
@@ -655,8 +652,7 @@ Cluster Total: 3302.88 MiB/s, 550.51 obj/s over 43s.
 ## Enterprise ##
 
 For enterprise users, please visit [seaweedfs.com](https://seaweedfs.com) for the SeaweedFS Enterprise Edition, 
-which has advanced features, including data recovery, self-healing storage, 
-customizable erasure coding, EC vacuum and repair, etc.
+which has a self-healing storage format with better data protection.
 
 [Back to TOC](#table-of-contents)
 

design-bucket-config-serialization.md

@@ -1,167 +0,0 @@
-# Design: Serializing Bucket Configuration Mutations
-
-Issue #9651 — concurrent `PutBucketVersioning` + `PutBucketEncryption` (as Terraform
-issues them in parallel) intermittently lose the encryption write.
-
-## Root cause
-
-The bucket's entire config lives in one filer entry, `/buckets/<name>`. Every
-config API does a read-modify-write of that single entry, and the writes are not
-serialized:
-
-- `updateBucketConfig(bucket, fn)` (`s3api_bucket_config.go:468`) — sources from a
-  possibly-stale cached `BucketConfig`, mutates `Entry.Extended`, writes the
-  **whole** entry. Used by: versioning, object-lock config, lifecycle, ACL/owner.
-- `UpdateBucketMetadata` → `setBucketMetadata` (`:1042`) — reads a fresh entry,
-  mutates `Entry.Content`, writes the **whole** entry. Used by: encryption, CORS,
-  tagging, ownership, policy, notification.
-
-Two ingredients produce the lost update:
-
-1. **No serialization** of the read→modify→write (the cache mutexes only guard the
-   in-memory map, not the RMW).
-2. **Whole-entry rewrite from an independent snapshot** — `updateBucketConfig`
-   rebuilds from a stale cached `BucketConfig` whose `Content` predates the
-   concurrent encryption write, so writing the whole entry reverts `Content`.
-
-Sequential calls always pass (each sees the previous write), so it only surfaces
-under concurrency — and CI's slower IO widens the window (the "2 of ~12 runs").
-
-## Goals
-
-- No lost updates across concurrent bucket-config changes — for **all** config
-  fields, not just versioning/encryption.
-- Correct for a single S3 gateway (the reported case) and for multiple gateways.
-- Reuse the filer primitives just merged (per-path lock, `WriteCondition`,
-  `ObjectTransaction`); do not reintroduce a distributed lock.
-- Minimal blast radius: the fix lands at the two chokepoint helpers.
-
-## Non-goals
-
-- Changing the one-entry-per-bucket storage model.
-- Multi-filer-concurrent bucket writes (addressed only as an optional phase 3).
-
-## The two ingredients map to two complementary fixes
-
-### Fix A — serialize + read fresh (closes the window for whole-entry writers)
-
-Both `updateBucketConfig` and `UpdateBucketMetadata` must run their RMW under one
-per-bucket critical section, and **re-read the entry fresh from the filer inside
-it** — not rebuild from the cached `BucketConfig`. The lock alone is insufficient:
-without the fresh read, two serialized writers still each apply a stale snapshot.
-
-### Fix B — field-level updates (removes the collision entirely)
-
-The two writers touch disjoint fields (`Extended[versioning]` vs `Content`). If
-each path updated only its own field instead of rewriting the whole entry, neither
-could clobber the other regardless of ordering. This is the structural fix and
-makes serialization a defense-in-depth concern rather than a correctness
-requirement for cross-field cases.
-
-## Where to serialize (layering)
-
-The bucket entry is a single filer entry, so unlike object writes there is no
-sharding — the question is purely the scope of the lock:
-
-| Layer | Serializes across | Cost | Notes |
-|---|---|---|---|
-| 1. Gateway-local per-bucket lock | one gateway process | tiny | fixes the reported (single-gateway/CI) case |
-| 2. Filer per-path lock via conditional write | all gateways on one filer | small | reuses #9640 `CreateEntry`+`WriteCondition` |
-| 3. Route-by-key to bucket-key owner filer | all gateways and filers | medium | same mechanism as the object DLM-removal |
-
-## Recommended plan (phased)
-
-### Phase 1 — minimal fix for #9651 (gateway-local lock + fresh read)
-
-Add a bounded per-bucket lock table to `S3ApiServer`, reusing the same
-`util.LockTable` the filer uses for its per-path lock:
-
-```go
-// in S3ApiServer
-bucketConfigLocks *util.LockTable[string] // serialize bucket-entry RMW
-
-func (s3a *S3ApiServer) withBucketConfigLock(bucket string, fn func() s3err.ErrorCode) s3err.ErrorCode {
-    lk := s3a.bucketConfigLocks.AcquireLock("bucketConfig", bucket, util.ExclusiveLock)
-    defer s3a.bucketConfigLocks.ReleaseLock(bucket, lk)
-    return fn()
-}
-```
-
-Wrap the RMW in **both** chokepoints, and inside the lock read the entry fresh:
-
-- `updateBucketConfig`: acquire the lock; re-read `/buckets/<name>` from the filer
-  (not the cache); rebuild `BucketConfig` from that fresh entry; apply `fn`; write;
-  invalidate cache; release.
-- `UpdateBucketMetadata`/`setBucketMetadata`: same lock key; it already reads fresh,
-  so it just needs to share the critical section.
-
-Both must use the **same** lock keyed on `bucket`, so versioning and encryption
-contend on one mutex. This closes the reported window. Limitation: only one
-gateway; two gateways behind a load balancer still race.
-
-Test: parallel `PutBucketVersioning` + `PutBucketEncryption`, assert both persist
-(the exact Terraform scenario), plus an N-way parallel variant over distinct
-fields.
-
-### Phase 2 — robust across gateways (field-level + CAS via merged primitives)
-
-Move the writers off whole-entry rewrites:
-
-- **Extended-based config** (versioning, object-lock, ownership, tagging-in-Extended)
-  → `ObjectTransaction` `PATCH_EXTENDED` on `/buckets/<name>`. The owner filer reads
-  the entry fresh under its per-path lock and merges only the named keys, so the
-  gateway never sends a whole-entry snapshot — this dissolves *both* ingredients for
-  these fields.
-- **`Content`-based config** (encryption, CORS, tags blob) — **chosen and
-  implemented (b3): extend `PATCH_EXTENDED` with `set_content`.** Under the same
-  per-path lock the filer reads the entry fresh, merges extended attributes, and
-  replaces `Content`, preserving the rest. So a content write becomes a field-level
-  patch too — `setBucketMetadata` patches `Content`, `updateBucketConfig` patches
-  extended keys, and the two serialize on the lock instead of racing whole-entry
-  rewrites. This is cleaner than the alternatives below: no client-side retry, no
-  storage migration, and it reuses `ObjectTransaction`'s existing atomic lock.
-  - (b1, rejected) Conditional `CreateEntry` overwrite with `IF_ETAG_MATCH` + retry
-    (#9640): correct but needs client-side retry, and the bucket directory entry has
-    no reliable ETag to compare on.
-  - (b2, future) Migrate each per-feature config out of the single `Content` blob
-    into its own `Extended` key. Then even *intra-blob* writes (tags vs encryption)
-    stop racing. Larger migration; tracked separately.
-
-Once all paths are field-level patches, the phase-1 gateway lock is unnecessary —
-the filer enforces atomicity. (This is the path taken: phase 1 was skipped.)
-
-### Phase 3 — multi-filer (only if needed)
-
-If multiple filers can write `/buckets/<name>` concurrently, a filer-local per-path
-lock no longer suffices. Route bucket-config writes to
-`PrimaryForKey("/buckets/<name>")` (the lock-ring view) and serialize on that one
-owner filer — the same route-by-key design used to take object writes off the DLM.
-Overkill for rare config writes; include only if multi-filer bucket writes are real.
-
-## Correctness summary
-
-- Phase 1: all RMW for a bucket serialize within a gateway; the fresh read means the
-  second writer observes the first's change. Closes #9651 for single-gateway.
-- Phase 2: `PATCH_EXTENDED` is atomic field-level merge at the filer (no snapshot);
-  CAS turns a concurrent `Content` write into a retry, enforced under the filer's
-  per-path lock — correct for any number of gateways sharing a filer.
-- Phase 3: one owner filer serializes all writers — correct across filers too.
-
-## Scope checklist (every path that RMWs the bucket entry)
-
-All of these funnel through the two chokepoints, so fixing the chokepoints covers
-them — but the fix must not leave any of them on an unserialized path:
-
-- via `updateBucketConfig`: versioning, object-lock config, lifecycle, ACL/owner.
-- via `UpdateBucketMetadata`/`setBucketMetadata`: encryption, CORS, tagging,
-  ownership controls, bucket policy, notification.
-- bucket create/delete (`CreateEntry`/`DeleteEntry` of `/buckets/<name>`) already
-  go through the filer's per-path lock on `CreateEntry`; ensure they take the same
-  bucket lock if they also patch config.
-
-## Cache rule (must document in code)
-
-Under the lock, **read the entry from the filer, never rebuild from the cached
-`BucketConfig`**. The cache is for reads; it must be invalidated on every write and
-never be the source for an RMW. This is the single most important detail — the lock
-without the fresh read does not fix the bug.

docker/Dockerfile.e2e

@@ -2,15 +2,13 @@ FROM ubuntu:22.04
 
 LABEL author="Chris Lu"
 
-# Use Azure's Ubuntu mirror — much faster than archive.ubuntu.com from GitHub-hosted runners,
-# which have been hanging long enough on Ign:/retry to trip the 10-min step timeout.
+# Use faster mirrors and optimize package installation
 # Note: This e2e test image intentionally runs as root for simplicity and compatibility.
 # Production images (Dockerfile.go_build) use proper user isolation with su-exec.
 # For testing purposes, running as root avoids permission complexities and dependency
 # on Alpine-specific tools like su-exec (not available in Ubuntu repos).
-RUN sed -i 's|http://archive.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g; s|http://security.ubuntu.com/ubuntu|http://azure.archive.ubuntu.com/ubuntu|g' /etc/apt/sources.list && \
-    apt-get -o Acquire::http::Timeout=15 update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::http::Timeout=15 install -y \
+RUN apt-get -o Acquire::Retries=5 -o Acquire::http::Timeout=30 update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Retries=5 -o Acquire::http::Timeout=30 install -y \
     --no-install-recommends \
     --no-install-suggests \
     curl \

docker/Dockerfile.go_build

@@ -1,6 +1,4 @@
-# Pin the builder to the host arch and cross-compile the (CGO-free) Go binary,
-# so arm64/arm/386 targets skip QEMU emulation of the whole compile.
-FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS builder
+FROM golang:1.25-alpine AS builder
 RUN apk add git g++ fuse
 RUN mkdir -p /go/src/github.com/seaweedfs/
 ARG BRANCH=${BRANCH:-master}
@@ -14,12 +12,9 @@ RUN cd /go/src/github.com/seaweedfs/seaweedfs && \
       git checkout $BRANCH) || \
      (echo "ERROR: Branch/commit $BRANCH not found in repository" && \
       echo "Available branches:" && git branch -a && exit 1))
-ARG TARGETOS TARGETARCH TARGETVARIANT
 RUN cd /go/src/github.com/seaweedfs/seaweedfs/weed \
   && export LDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=$(git rev-parse --short HEAD)" \
-  && export GOOS=$TARGETOS GOARCH=$TARGETARCH \
-  && case "$TARGETARCH" in arm) export GOARM="${TARGETVARIANT#v}";; esac \
-  && CGO_ENABLED=0 go build -tags "$TAGS" -ldflags "-extldflags -static ${LDFLAGS}" -o /go/bin/weed .
+  && CGO_ENABLED=0 go install -tags "$TAGS" -ldflags "-extldflags -static ${LDFLAGS}"
 
 # Rust volume server: use pre-built binary from CI when available (placed in
 # weed-volume-prebuilt/ by the build-rust-binaries job), otherwise compile
@@ -47,10 +42,6 @@ RUN if [ -f "/prebuilt/weed-volume-${TARGETARCH}" ]; then \
       echo "Skipping Rust build for $TARGETARCH (unsupported)" && \
       touch /weed-volume; \
     fi
-# Pre-built binaries arrive via GitHub Actions artifacts, which drop the
-# executable bit, so the copied file is 0644 and exec fails with "Permission
-# denied". Restore it (no-op for the empty placeholder, which stays size 0).
-RUN chmod 0755 /weed-volume
 
 FROM alpine AS final
 LABEL author="Chris Lu"

docker/Makefile

@@ -127,9 +127,6 @@ test_tarantool: tags = tarantool
 test_tarantool: build_tarantool_dev_env build
 	docker compose -f compose/test-tarantool-filer.yml -p seaweedfs up
 
-test_keycloak_s3: build
-	docker compose -f compose/test-keycloak-s3.yml -p seaweedfs up
-
 clean:
 	rm ./weed
 

docker/compose/test-keycloak-s3.yml

@@ -1,46 +0,0 @@
-services:
-  keycloak:
-    image: quay.io/keycloak/keycloak:26.0.7
-    command: ["start-dev", "--import-realm"]
-    environment:
-      KC_BOOTSTRAP_ADMIN_USERNAME: admin
-      KC_BOOTSTRAP_ADMIN_PASSWORD: admin
-      KC_HTTP_ENABLED: "true"
-      KC_HOSTNAME: "http://keycloak:8080"
-      KC_HOSTNAME_STRICT: "false"
-    ports:
-      - "8080:8080"
-    volumes:
-      - ../../test/s3/iam/seaweedfs-test-realm.json:/opt/keycloak/data/import/seaweedfs-test-realm.json:ro
-    healthcheck:
-      test: ["CMD-SHELL", "exec 3<>/dev/tcp/localhost/8080"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 60s
-
-  s3:
-    image: chrislusf/seaweedfs:local
-    command:
-      - -v=9
-      - server
-      - -ip=s3
-      - -filer
-      - -master.volumeSizeLimitMB=16
-      - -volume
-      - -volume.max=0
-      - -volume.preStopSeconds=1
-      - -s3
-      - -s3.port=8333
-      - -s3.config=/etc/seaweedfs/s3_config.json
-      - -s3.iam.config=/etc/seaweedfs/iam_config.json
-    environment:
-      WEED_MASTER_VOLUME_GROWTH_COPY_OTHER: 1
-    volumes:
-      - ../../test/s3/iam/test_config.json:/etc/seaweedfs/s3_config.json:ro
-      - ../../test/s3/iam/iam_config_docker.json:/etc/seaweedfs/iam_config.json:ro
-    ports:
-      - "8333:8333"
-    depends_on:
-      keycloak:
-        condition: service_healthy

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.6.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1
 	github.com/eapache/go-resiliency v1.6.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
@@ -26,14 +27,14 @@ require (
 	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.16.0
-	github.com/go-sql-driver/mysql v1.10.0
+	github.com/go-sql-driver/mysql v1.9.3
 	github.com/go-zookeeper/zk v1.0.4 // indirect
 	github.com/golang/protobuf v1.5.4
 	github.com/golang/snappy v1.0.0
 	github.com/google/btree v1.1.3
 	github.com/google/uuid v1.6.0
 	github.com/google/wire v0.7.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.22.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.21.0 // indirect
 	github.com/gorilla/mux v1.8.1
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -45,10 +46,10 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12
 	github.com/karlseguin/ccache/v2 v2.0.8
-	github.com/klauspost/compress v1.18.6
+	github.com/klauspost/compress v1.18.5
 	github.com/klauspost/reedsolomon v1.14.0
 	github.com/kurin/blazer v0.5.3
-	github.com/linxGnu/grocksdb v1.10.8
+	github.com/linxGnu/grocksdb v1.10.7
 	github.com/mailru/easyjson v0.9.1 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -60,14 +61,14 @@ require (
 	github.com/posener/complete v1.2.3
 	github.com/pquerna/cachecontrol v0.2.0
 	github.com/prometheus/client_golang v1.23.2
-	github.com/prometheus/client_model v0.6.2
-	github.com/prometheus/common v0.67.5 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.67.2 // indirect
 	github.com/prometheus/procfs v0.20.1
 	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.8
-	github.com/sirupsen/logrus v1.9.4 // indirect
+	github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
 	github.com/spf13/viper v1.21.0
@@ -88,21 +89,21 @@ require (
 	go.etcd.io/etcd/client/v3 v3.6.10
 	go.mongodb.org/mongo-driver v1.17.9
 	go.opencensus.io v0.24.0 // indirect
-	gocloud.dev v0.46.0
+	gocloud.dev v0.45.0
 	gocloud.dev/pubsub/natspubsub v0.45.0
-	gocloud.dev/pubsub/rabbitpubsub v0.46.0
-	golang.org/x/crypto v0.52.0
-	golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f
-	golang.org/x/image v0.39.0
-	golang.org/x/net v0.54.0
+	gocloud.dev/pubsub/rabbitpubsub v0.45.0
+	golang.org/x/crypto v0.50.0
+	golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa
+	golang.org/x/image v0.38.0
+	golang.org/x/net v0.53.0
 	golang.org/x/oauth2 v0.36.0
-	golang.org/x/sys v0.45.0
-	golang.org/x/text v0.37.0 // indirect
-	golang.org/x/tools v0.44.0 // indirect
+	golang.org/x/sys v0.43.0
+	golang.org/x/text v0.36.0 // indirect
+	golang.org/x/tools v0.43.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
-	google.golang.org/api v0.278.0
+	google.golang.org/api v0.274.0
 	google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 // indirect
-	google.golang.org/grpc v1.81.1
+	google.golang.org/grpc v1.80.0
 	google.golang.org/protobuf v1.36.11
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	modernc.org/b v1.0.0 // indirect
@@ -112,23 +113,24 @@ require (
 )
 
 require (
-	cloud.google.com/go/kms v1.31.0
+	cloud.google.com/go/kms v1.26.0
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0
 	github.com/Jille/raft-grpc-transport v1.6.1
 	github.com/ThreeDotsLabs/watermill v1.5.1
 	github.com/a-h/templ v0.3.1001
-	github.com/apache/cassandra-gocql-driver/v2 v2.1.1
+	github.com/apache/cassandra-gocql-driver/v2 v2.1.0
 	github.com/apache/iceberg-go v0.5.0
 	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.12
-	github.com/aws/aws-sdk-go-v2/config v1.32.21
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.20
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.102.2
-	github.com/cognusion/imaging v1.0.3
+	github.com/aws/aws-sdk-go-v2 v1.41.6
+	github.com/aws/aws-sdk-go-v2/config v1.32.14
+	github.com/aws/aws-sdk-go-v2/credentials v1.19.14
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.99.0
+	github.com/cognusion/imaging v1.0.2
 	github.com/fluent/fluent-logger-golang v1.10.1
 	github.com/getsentry/sentry-go v0.44.1
+	github.com/go-git/go-billy/v5 v5.8.0
 	github.com/go-ldap/ldap/v3 v3.4.13
 	github.com/golang-jwt/jwt/v5 v5.3.1
 	github.com/google/flatbuffers/go v0.0.0-20230108230133-3b8644d32c50
@@ -139,24 +141,26 @@ require (
 	github.com/linkedin/goavro/v2 v2.15.0
 	github.com/minio/crc64nvme v1.1.1
 	github.com/orcaman/concurrent-map/v2 v2.0.1
-	github.com/parquet-go/parquet-go v0.30.1
+	github.com/parquet-go/parquet-go v0.28.0
 	github.com/pkg/sftp v1.13.10
-	github.com/rabbitmq/amqp091-go v1.11.0
-	github.com/rclone/rclone v1.74.1
+	github.com/rabbitmq/amqp091-go v1.10.0
+	github.com/rclone/rclone v1.73.5
 	github.com/rdleal/intervalst v1.5.0
-	github.com/redis/go-redis/v9 v9.20.0
+	github.com/redis/go-redis/v9 v9.18.0
 	github.com/schollz/progressbar/v3 v3.19.0
 	github.com/seaweedfs/go-fuse/v2 v2.9.3
-	github.com/shirou/gopsutil/v4 v4.26.3
+	github.com/shirou/gopsutil/v4 v4.26.2
 	github.com/tarantool/go-tarantool/v2 v2.4.2
 	github.com/testcontainers/testcontainers-go v0.40.0
 	github.com/tikv/client-go/v2 v2.0.7
+	github.com/willscott/go-nfs v0.0.3
+	github.com/willscott/go-nfs-client v0.0.0-20251022144359-801f10d98886
 	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.139.5
-	go.etcd.io/etcd/client/pkg/v3 v3.6.12
+	github.com/ydb-platform/ydb-go-sdk/v3 v3.134.2
+	go.etcd.io/etcd/client/pkg/v3 v3.6.10
 	go.uber.org/atomic v1.11.0
-	golang.org/x/sync v0.21.0
+	golang.org/x/sync v0.20.0
 	golang.org/x/tools/godoc v0.1.0-deprecated
 	google.golang.org/grpc/security/advancedtls v1.0.0
 )
@@ -172,14 +176,13 @@ require (
 	dario.cat/mergo v1.0.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
-	github.com/FilenCloudDienste/filen-sdk-go v0.0.39 // indirect
+	github.com/FilenCloudDienste/filen-sdk-go v0.0.38 // indirect
 	github.com/a1ex3/zstd-seekable-format-go/pkg v0.10.0 // indirect
-	github.com/adrg/xdg v0.5.3 // indirect
 	github.com/anchore/go-lzo v0.1.0 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
 	github.com/apache/arrow-go/v18 v18.5.2-0.20260220015023-a886a5722b87 // indirect
-	github.com/apache/thrift v0.23.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/signin v1.1.2 // indirect
+	github.com/apache/thrift v0.22.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/signin v1.0.9 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/bazelbuild/rules_go v0.46.0 // indirect
 	github.com/biogo/store v0.0.0-20201120204734-aad293a2328f // indirect
@@ -187,7 +190,8 @@ require (
 	github.com/boombuler/barcode v1.1.0 // indirect
 	github.com/buger/jsonparser v1.1.2 // indirect
 	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
-	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
+	github.com/clipperhouse/stringish v0.1.1 // indirect
+	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
 	github.com/cockroachdb/apd/v3 v3.2.1 // indirect
 	github.com/cockroachdb/errors v1.11.3 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
@@ -208,7 +212,6 @@ require (
 	github.com/dromara/dongle v1.0.1 // indirect
 	github.com/gin-gonic/gin v1.11.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
-	github.com/go-git/go-billy/v5 v5.9.0 // indirect
 	github.com/goccy/go-yaml v1.18.0 // indirect
 	github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
@@ -221,7 +224,7 @@ require (
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
 	github.com/hashicorp/go-sockaddr v1.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
-	github.com/internxt/rclone-adapter v0.0.0-20260331173834-036f908d0160 // indirect
+	github.com/internxt/rclone-adapter v0.0.0-20260220172730-613f4cc8b8fd // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
@@ -231,7 +234,7 @@ require (
 	github.com/klauspost/asmfmt v1.3.2 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/lib/pq v1.12.0 // indirect
+	github.com/lib/pq v1.11.1 // indirect
 	github.com/lithammer/fuzzysearch v1.1.8 // indirect
 	github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
 	github.com/magiconair/properties v1.8.10 // indirect
@@ -254,9 +257,10 @@ require (
 	github.com/pierrre/geohash v1.0.0 // indirect
 	github.com/pquerna/otp v1.5.0 // indirect
 	github.com/pterm/pterm v0.12.82 // indirect
-	github.com/quic-go/qpack v0.6.0 // indirect
-	github.com/rclone/Proton-API-Bridge v1.0.3 // indirect
-	github.com/rclone/go-proton-api v1.0.2 // indirect
+	github.com/quic-go/quic-go v0.57.0 // indirect
+	github.com/rasky/go-xdr v0.0.0-20170124162913-1a41d1a06c93 // indirect
+	github.com/rclone/Proton-API-Bridge v1.0.1-0.20260127174007-77f974840d11 // indirect
+	github.com/rclone/go-proton-api v1.0.1-0.20260127173028-eb465cac3b18 // 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
@@ -274,68 +278,69 @@ require (
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/zeebo/xxh3 v1.1.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
 	go.opentelemetry.io/otel/exporters/zipkin v1.36.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.10.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.9.0 // indirect
 	go.uber.org/mock v0.5.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/mod v0.35.0 // indirect
-	golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa // indirect
+	golang.org/x/mod v0.34.0 // indirect
+	golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c // indirect
 	gonum.org/v1/gonum v0.17.0 // indirect
 )
 
 require (
 	cel.dev/expr v0.25.1 // indirect
-	cloud.google.com/go/auth v0.20.0 // indirect
+	cloud.google.com/go/auth v0.19.0 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
 	cloud.google.com/go/compute/metadata v0.9.0 // indirect
 	cloud.google.com/go/iam v1.7.0 // indirect
 	cloud.google.com/go/monitoring v1.24.3 // indirect
-	filippo.io/edwards25519 v1.2.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.1
+	filippo.io/edwards25519 v1.1.1 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.7.0
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.4 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.3 // indirect
 	github.com/Azure/go-ntlmssp v0.1.1 // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.7.2 // indirect
-	github.com/Files-com/files-sdk-go/v3 v3.3.82 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
+	github.com/Files-com/files-sdk-go/v3 v3.2.264 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.55.0 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0 // indirect
-	github.com/IBM/go-sdk-core/v5 v5.21.2 // indirect
+	github.com/IBM/go-sdk-core/v5 v5.21.0 // indirect
 	github.com/Max-Sum/base32768 v0.0.0-20230304063302-18e6ce5945fd // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf // indirect
 	github.com/ProtonMail/gluon v0.17.1-0.20230724134000-308be39be96e // indirect
-	github.com/ProtonMail/go-crypto v1.4.1 // indirect
+	github.com/ProtonMail/go-crypto v1.3.0 // indirect
 	github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
 	github.com/ProtonMail/go-srp v0.0.7 // indirect
 	github.com/ProtonMail/gopenpgp/v2 v2.9.0 // indirect
-	github.com/PuerkitoBio/goquery v1.11.0 // indirect
+	github.com/PuerkitoBio/goquery v1.10.3 // indirect
 	github.com/abbot/go-http-auth v0.4.0 // indirect
 	github.com/andybalholm/brotli v1.2.0 // indirect
 	github.com/andybalholm/cascadia v1.3.3 // indirect
 	github.com/appscode/go-querystring v0.0.0-20170504095604-0126cfb3f1dc // indirect
 	github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.26 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.13 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.27 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.18 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.26 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.25 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sns v1.39.14 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sqs v1.42.24 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.31.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.43.0
-	github.com/aws/smithy-go v1.27.1
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.21 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.1 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sns v1.39.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sqs v1.42.17 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.30.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.19 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.41.10
+	github.com/aws/smithy-go v1.25.1
 	github.com/boltdb/bolt v1.3.1 // indirect
 	github.com/bradenaw/juniper v0.15.3 // indirect
 	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
@@ -343,13 +348,13 @@ require (
 	github.com/calebcase/tmpfile v1.0.3 // indirect
 	github.com/chilts/sid v0.0.0-20190607042430-660e94789ec9 // indirect
 	github.com/cloudflare/circl v1.6.3 // indirect
-	github.com/cloudinary/cloudinary-go/v2 v2.15.0 // indirect
+	github.com/cloudinary/cloudinary-go/v2 v2.13.0 // indirect
 	github.com/cloudsoda/go-smb2 v0.0.0-20250228001242-d4c70e6251cc // indirect
 	github.com/cloudsoda/sddl v0.0.0-20250224235906-926454e91efc // indirect
-	github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 // indirect
+	github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
 	github.com/colinmarc/hdfs/v2 v2.4.0 // indirect
 	github.com/creasty/defaults v1.8.0 // indirect
-	github.com/cronokirby/saferith v0.33.1-0.20250226174546-1f11f94ce488 // indirect
+	github.com/cronokirby/saferith v0.33.0 // indirect
 	github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
 	github.com/d4l3k/messagediff v1.2.1 // indirect
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
@@ -358,12 +363,12 @@ require (
 	github.com/elastic/gosigar v0.14.3 // indirect
 	github.com/emersion/go-message v0.18.2 // indirect
 	github.com/emersion/go-vcard v0.0.0-20241024213814-c9703dde27ff // indirect
-	github.com/envoyproxy/go-control-plane/envoy v1.37.0 // indirect
-	github.com/envoyproxy/protoc-gen-validate v1.3.3 // indirect
+	github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/flynn/noise v1.1.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.11 // indirect
 	github.com/geoffgarside/ber v1.2.0 // indirect
 	github.com/go-chi/chi/v5 v5.2.5 // indirect
 	github.com/go-darwin/apfs v0.0.0-20211011131704-f84b94dbf348 // indirect
@@ -371,24 +376,24 @@ require (
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
-	github.com/go-openapi/errors v0.22.6 // indirect
+	github.com/go-openapi/errors v0.22.4 // indirect
 	github.com/go-openapi/strfmt v0.25.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.30.1 // indirect
-	github.com/go-resty/resty/v2 v2.17.2 // indirect
-	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
+	github.com/go-playground/validator/v10 v10.28.0 // indirect
+	github.com/go-resty/resty/v2 v2.16.5 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/gofrs/flock v0.13.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.15 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
 	github.com/gorilla/schema v1.4.1 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/gorilla/sessions v1.4.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
@@ -400,7 +405,7 @@ require (
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
 	github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
-	github.com/jlaffaye/ftp v0.2.1-0.20251026020404-6602e981a1bb // indirect
+	github.com/jlaffaye/ftp v0.2.1-0.20240918233326-1b970516f5d3 // indirect
 	github.com/jonboulle/clockwork v0.5.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/jtolio/noiseconn v0.0.0-20231127013910-f6d9ecbf1de7 // indirect
@@ -414,9 +419,9 @@ require (
 	github.com/lanrat/extsort v1.4.2 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lpar/date v1.0.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20260216142805-b3301c5f2a88 // indirect
+	github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-runewidth v0.0.22 // indirect
+	github.com/mattn/go-runewidth v0.0.19 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4
@@ -431,13 +436,13 @@ require (
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/onsi/ginkgo/v2 v2.23.3 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/oracle/oci-go-sdk/v65 v65.111.0 // indirect
-	github.com/panjf2000/ants/v2 v2.11.5 // indirect
+	github.com/oracle/oci-go-sdk/v65 v65.104.0 // indirect
+	github.com/panjf2000/ants/v2 v2.11.3 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14 // indirect
 	github.com/philhofer/fwd v1.2.0 // indirect
-	github.com/pierrec/lz4/v4 v4.1.27
+	github.com/pierrec/lz4/v4 v4.1.26
 	github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
 	github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c // indirect
 	github.com/pingcap/kvproto v0.0.0-20230403051650-e166ae588106 // indirect
@@ -448,7 +453,7 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8 // indirect
 	github.com/relvacode/iso8601 v1.7.0 // indirect
-	github.com/rfjakob/eme v1.2.0 // indirect
+	github.com/rfjakob/eme v1.1.2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
 	github.com/sagikazarmark/locafero v0.11.0 // indirect
@@ -461,11 +466,11 @@ require (
 	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/t3rm1n4l/go-mega v0.0.0-20251120131202-6845944c051c // indirect
+	github.com/t3rm1n4l/go-mega v0.0.0-20251031123324-a804aaa87491 // indirect
 	github.com/tarantool/go-iproto v1.1.0 // indirect
 	github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
 	github.com/tikv/pd/client v0.0.0-20230329114254-1948c247c2b1 // indirect
-	github.com/tinylib/msgp v1.6.3 // indirect
+	github.com/tinylib/msgp v1.5.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.16 // indirect
 	github.com/tklauser/numcpus v0.11.0 // indirect
 	github.com/twmb/murmur3 v1.1.8 // indirect
@@ -474,7 +479,7 @@ require (
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/yandex-cloud/go-genproto v0.0.0-20211115083454-9ca41db5ed9e // indirect
-	github.com/ydb-platform/ydb-go-genproto v0.0.0-20260428144813-1c07baab7f7b // indirect
+	github.com/ydb-platform/ydb-go-genproto v0.0.0-20260311095541-ebbf792c1180 // indirect
 	github.com/ydb-platform/ydb-go-yc v0.12.1 // indirect
 	github.com/ydb-platform/ydb-go-yc-metadata v0.6.1 // indirect
 	github.com/yunify/qingstor-sdk-go/v3 v3.2.0 // indirect
@@ -484,9 +489,9 @@ require (
 	go.etcd.io/bbolt v1.4.3 // indirect
 	go.etcd.io/etcd/api/v3 v3.6.10 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/detectors/gcp v1.42.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
+	go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
 	go.opentelemetry.io/otel v1.43.0 // indirect
 	go.opentelemetry.io/otel/metric v1.43.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.43.0 // indirect
@@ -494,10 +499,10 @@ require (
 	go.opentelemetry.io/otel/trace v1.43.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.1 // indirect
-	golang.org/x/term v0.43.0
-	golang.org/x/time v0.15.0
+	golang.org/x/term v0.42.0
+	golang.org/x/time v0.15.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/validator.v2 v2.0.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -505,17 +510,12 @@ require (
 	modernc.org/libc v1.72.0 // indirect
 	moul.io/http2curl/v2 v2.3.0 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
-	storj.io/common v0.0.0-20260225132117-99155641c30a // indirect
+	storj.io/common v0.0.0-20251107171817-6221ae45072c // indirect
 	storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55 // indirect
 	storj.io/eventkit v0.0.0-20250410172343-61f26d3de156 // indirect
 	storj.io/infectious v0.0.2 // indirect
 	storj.io/picobuf v0.0.4 // indirect
-	storj.io/uplink v1.14.0 // indirect
+	storj.io/uplink v1.13.1 // indirect
 )
 
 // replace github.com/seaweedfs/raft => /Users/chrislu/go/src/github.com/seaweedfs/raft
-
-// apache/thrift v0.23.0 uses math.MaxUint32 as an untyped int constant in
-// lib/go/thrift/framed_transport.go, which overflows int on 32-bit GOARCHes
-// (e.g. openbsd/arm, linux/arm). Pin to v0.22.0 until upstream fixes it.
-replace github.com/apache/thrift => github.com/apache/thrift v0.22.0

go.sum

@@ -94,8 +94,8 @@ cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVo
 cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo=
 cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0=
 cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E=
-cloud.google.com/go/auth v0.20.0 h1:kXTssoVb4azsVDoUiF8KvxAqrsQcQtB53DcSgta74CA=
-cloud.google.com/go/auth v0.20.0/go.mod h1:942/yi/itH1SsmpyrbnTMDgGfdy2BUqIKyd0cyYLc5Q=
+cloud.google.com/go/auth v0.19.0 h1:DGYwtbcsGsT1ywuxsIoWi1u/vlks0moIblQHgSDgQkQ=
+cloud.google.com/go/auth v0.19.0/go.mod h1:2Aph7BT2KnaSFOM0JDPyiYgNh6PL9vGMiP8CUIXZ+IY=
 cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
 cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
@@ -298,8 +298,8 @@ cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxs
 cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg=
 cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0=
 cloud.google.com/go/kms v1.9.0/go.mod h1:qb1tPTgfF9RQP8e1wq4cLFErVuTJv7UsSC915J8dh3w=
-cloud.google.com/go/kms v1.31.0 h1:LS8N92OxFDgOLg5NCo3OmbvjtQAIVT5gUHVLKIDHaFE=
-cloud.google.com/go/kms v1.31.0/go.mod h1:YIyXZym11R5uovJJt4oN5eUL3oPmirF3yKeIh6QAf4U=
+cloud.google.com/go/kms v1.26.0 h1:cK9mN2cf+9V63D3H1f6koxTatWy39aTI/hCjz1I+adU=
+cloud.google.com/go/kms v1.26.0/go.mod h1:pHKOdFJm63hxBsiPkYtowZPltu9dW0MWvBa6IA4HM58=
 cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic=
 cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI=
 cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE=
@@ -547,38 +547,42 @@ cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcP
 dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
 dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
-filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
+filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw=
+filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.1 h1:jHb/wfvRikGdxMXYV3QG/SzUOPYN9KEUUuC0Yd0/vC0=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.1/go.mod h1:pzBXCYn05zvYIrwLgtK8Ap8QcjRg+0i76tMQdWN6wOk=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 h1:fou+2+WFTib47nS+nz/ozhEBnvU96bKHy6LjRsY4E28=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0/go.mod h1:t76Ruy8AHvUAC8GfMWJMa0ElSbuIcO03NLpynfbgsPA=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1/go.mod h1:IYus9qsFobWIc2YVwe/WPjcnyCkPKtnHAqUYeebc8z0=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0 h1:fhqpLE3UEXi9lPaBRpQ6XuRW0nU7hgg4zlmZZa+a9q4=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0/go.mod h1:7dCRMLwisfRH3dBupKeNCioWYUZ4SS09Z14H+7i8ZoY=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 h1:m/sWOGCREuSBqg2htVQTBY8nOZpyajYztF0vUvSZTuM=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0/go.mod h1:Pu5Zksi2KrU7LPbZbNINx6fuVrUp/ffvpxdDj+i8LeE=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 h1:FbH3BbSb4bvGluTesZZ+ttN/MDsnMmQP36OSnDuSXqw=
 github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1/go.mod h1:9V2j0jn9jDEkCkv8w/bKTNppX/d0FVA1ud77xCIP4KA=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1 h1:/Zt+cDPnpC3OVDm/JKLOs7M2DKmLRIIp3XIx9pHHiig=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1/go.mod h1:Ng3urmn6dYe8gnbCMoHHVl5APYz2txho3koEkV2o2HA=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.7.0 h1:BM85pSYlVYQHdq00nxyPoOkyLF5NArJG3bOsrmbwr4k=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.7.0/go.mod h1:QYjP2cB7ZYtS/8jAbE0VSBZde/tjExqGjp+8JY6/+ts=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.4 h1:tZh20RjgfMxKBxJiIS75iTVAKIUxrST5X2dVHMTptL4=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.4/go.mod h1:vGYAk36rhMVCfTP7v+RVruCR0zmPe6S+36KRpDCLySw=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4 h1:jWQK1GI+LeGGUKBADtcH2rRqPxYB1Ljwms5gFA2LqrM=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4/go.mod h1:8mwH4klAm9DUgR2EEHyEEAQlRDvLPyg5fQry3y+cDew=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.3 h1:sxgSqOB9CDToiaVFpxuvb5wGgGqWa3lCShcm5o0n3bE=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.3/go.mod h1:XdED8i399lEVblYHTZM8eXaP07gv4Z58IL6ueMlVlrg=
 github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
 github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
+github.com/Azure/go-autorest/autorest/to v0.4.1 h1:CxNHBqdzTr7rLtdrtb5CMjJcDut+WNGCVv7OmS5+lTc=
+github.com/Azure/go-autorest/autorest/to v0.4.1/go.mod h1:EtaofgU4zmtvn1zT2ARsjRFdq9vXx0YWtmElwL+GZ9M=
 github.com/Azure/go-ntlmssp v0.1.1 h1:l+FM/EEMb0U9QZE7mKNEDw5Mu3mFiaa2GKOoTSsNDPw=
 github.com/Azure/go-ntlmssp v0.1.1/go.mod h1:NYqdhxd/8aAct/s4qSYZEerdPuH1liG2/X9DiVTbhpk=
 github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
 github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.7.2 h1:RHK7bS+HQMslb1sZpAokUt+zTVmue0hKSs2C791hhzU=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.7.2/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 h1:XRzhVemXdgvJqCH0sFfrBUTnUJSBrBf7++ypk+twtRs=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Codefor/geohash v0.0.0-20140723084247-1b41c28e3a9d h1:iG9B49Q218F/XxXNRM7k/vWf7MKmLIS8AcJV9cGN4nA=
@@ -589,10 +593,10 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3
 github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
 github.com/DefangLabs/secret-detector v0.0.0-20250403165618-22662109213e h1:rd4bOvKmDIx0WeTv9Qz+hghsgyjikFiPrseXHlKepO0=
 github.com/DefangLabs/secret-detector v0.0.0-20250403165618-22662109213e/go.mod h1:blbwPQh4DTlCZEfk1BLU4oMIhLda2U+A840Uag9DsZw=
-github.com/FilenCloudDienste/filen-sdk-go v0.0.39 h1:tgV5jYL6dsXop9TpDTIQU6UwJjws122HrwskaEE/igY=
-github.com/FilenCloudDienste/filen-sdk-go v0.0.39/go.mod h1:0cBhKXQg49XbKZZfk5TCDa3sVLP+xMxZTWL+7KY0XR0=
-github.com/Files-com/files-sdk-go/v3 v3.3.82 h1:2RfP0d2QgkFH64BjZSWd59aMsc28IyWsUuHqU0txBtY=
-github.com/Files-com/files-sdk-go/v3 v3.3.82/go.mod h1:IPk80dOmc7VFC0DJ85xMTPmre+8xoXX6kGHAkf5jRRw=
+github.com/FilenCloudDienste/filen-sdk-go v0.0.38 h1:YCyHs3wUXEe2BEWn40vcoyaQ2ruHNmNwkasfo3Th16A=
+github.com/FilenCloudDienste/filen-sdk-go v0.0.38/go.mod h1:0cBhKXQg49XbKZZfk5TCDa3sVLP+xMxZTWL+7KY0XR0=
+github.com/Files-com/files-sdk-go/v3 v3.2.264 h1:lMHTplAYI9FtmCo/QOcpRxmPA5REVAct1r2riQmDQKw=
+github.com/Files-com/files-sdk-go/v3 v3.2.264/go.mod h1:wGqkOzRu/ClJibvDgcfuJNAqI2nLhe8g91tPlDKRCdE=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0 h1:DHa2U07rk8syqvCge0QIGMCE1WxGj9njT44GH7zNJLQ=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.55.0 h1:UnDZ/zFfG1JhH/DqxIZYU/1CUAlTUScoXD/LcM2Ykk8=
@@ -601,8 +605,8 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.55.0/go.mod h1:vB2GH9GAYYJTO3mEn8oYwzEdhlayZIdQz6zdzgUIRvA=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0 h1:0s6TxfCu2KHkkZPnBfsQ2y5qia0jl3MMrmBhu3nCOYk=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0/go.mod h1:Mf6O40IAyB9zR/1J8nGDDPirZQQPbYJni8Yisy7NTMc=
-github.com/IBM/go-sdk-core/v5 v5.21.2 h1:mJ5QbLPOm4g5qhZiVB6wbSllfpeUExftGoyPek2hk4M=
-github.com/IBM/go-sdk-core/v5 v5.21.2/go.mod h1:ngpMgwkjur1VNUjqn11LPk3o5eCyOCRbcfg/0YAY7Hc=
+github.com/IBM/go-sdk-core/v5 v5.21.0 h1:DUnYhvC4SoC8T84rx5omnhY3+xcQg/Whyoa3mDPIMkk=
+github.com/IBM/go-sdk-core/v5 v5.21.0/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
 github.com/Jille/raft-grpc-transport v1.6.1 h1:gN3sjapb+fVbiebS7AfQQgbV2ecTOI7ur7NPPC7Mhoc=
 github.com/Jille/raft-grpc-transport v1.6.1/go.mod h1:HbOjEdu/yzCJ/mjTF6wEOJNbAUpHfU2UOA2hVD4CNFg=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
@@ -629,16 +633,16 @@ github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf/go.mod h1:o0ESU9
 github.com/ProtonMail/gluon v0.17.1-0.20230724134000-308be39be96e h1:lCsqUUACrcMC83lg5rTo9Y0PnPItE61JSfvMyIcANwk=
 github.com/ProtonMail/gluon v0.17.1-0.20230724134000-308be39be96e/go.mod h1:Og5/Dz1MiGpCJn51XujZwxiLG7WzvvjE5PRpZBQmAHo=
 github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
-github.com/ProtonMail/go-crypto v1.4.1 h1:9RfcZHqEQUvP8RzecWEUafnZVtEvrBVL9BiF67IQOfM=
-github.com/ProtonMail/go-crypto v1.4.1/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo=
+github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
+github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
 github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f h1:tCbYj7/299ekTTXpdwKYF8eBlsYsDVoggDAuAjoK66k=
 github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f/go.mod h1:gcr0kNtGBqin9zDW9GOHcVntrwnjrK+qdJ06mWYBybw=
 github.com/ProtonMail/go-srp v0.0.7 h1:Sos3Qk+th4tQR64vsxGIxYpN3rdnG9Wf9K4ZloC1JrI=
 github.com/ProtonMail/go-srp v0.0.7/go.mod h1:giCp+7qRnMIcCvI6V6U3S1lDDXDQYx2ewJ6F/9wdlJk=
 github.com/ProtonMail/gopenpgp/v2 v2.9.0 h1:ruLzBmwe4dR1hdnrsEJ/S7psSBmV15gFttFUPP/+/kE=
 github.com/ProtonMail/gopenpgp/v2 v2.9.0/go.mod h1:IldDyh9Hv1ZCCYatTuuEt1XZJ0OPjxLpTarDfglih7s=
-github.com/PuerkitoBio/goquery v1.11.0 h1:jZ7pwMQXIITcUXNH83LLk+txlaEy6NVOfTuP43xxfqw=
-github.com/PuerkitoBio/goquery v1.11.0/go.mod h1:wQHgxUOU3JGuj3oD/QFfxUdlzW6xPHfqyHre6VMY4DQ=
+github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo=
+github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y=
 github.com/Sereal/Sereal/Go/sereal v0.0.0-20231009093132-b9187f1a92c6/go.mod h1:JwrycNnC8+sZPDyzM3MQ86LvaGzSpfxg885KOOwFRW4=
 github.com/Shopify/sarama v1.38.1 h1:lqqPUPQZ7zPqYlWpTh+LQ9bhYNu2xJL6k1SJN4WVe2A=
 github.com/Shopify/sarama v1.38.1/go.mod h1:iwv9a67Ha8VNa+TifujYoWGxWnu2kNVAQdSdZ4X2o5g=
@@ -652,14 +656,12 @@ github.com/a-h/templ v0.3.1001 h1:yHDTgexACdJttyiyamcTHXr2QkIeVF1MukLy44EAhMY=
 github.com/a-h/templ v0.3.1001/go.mod h1:oCZcnKRf5jjsGpf2yELzQfodLphd2mwecwG4Crk5HBo=
 github.com/a1ex3/zstd-seekable-format-go/pkg v0.10.0 h1:iLDOF0rdGTrol/q8OfPIIs5kLD8XvA2q75o6Uq/tgak=
 github.com/a1ex3/zstd-seekable-format-go/pkg v0.10.0/go.mod h1:DrEWcQJjz7t5iF2duaiyhg4jyoF0kxOD6LtECNGkZ/Q=
-github.com/aalpar/deheap v1.1.2 h1:MABHLcnjqsffb8GLkUFDigqpBBxOMz0DoKM9QfELeTw=
-github.com/aalpar/deheap v1.1.2/go.mod h1:A+nfkD4JbS05sewV0he/MYgR/90vfqyMoNNROgs+rmA=
+github.com/aalpar/deheap v0.0.0-20210914013432-0cc84d79dec3 h1:hhdWprfSpFbN7lz3W1gM40vOgvSh1WCSMxYD6gGB4Hs=
+github.com/aalpar/deheap v0.0.0-20210914013432-0cc84d79dec3/go.mod h1:XaUnRxSCYgL3kkgX0QHIV0D+znljPIDImxlv2kbGv0Y=
 github.com/abbot/go-http-auth v0.4.0 h1:QjmvZ5gSC7jm3Zg54DqWE/T5m1t2AfDu6QlXJT0EVT0=
 github.com/abbot/go-http-auth v0.4.0/go.mod h1:Cz6ARTIzApMJDzh5bRMSUou6UMSp0IEXg9km/ci7TJM=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
-github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78=
-github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ=
 github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
 github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
@@ -690,10 +692,11 @@ github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmO
 github.com/apache/arrow-go/v18 v18.5.2-0.20260220015023-a886a5722b87 h1:r/gg2gzUXiXoy72VU3jnODh8l/5rL0aslnTAbtmai/U=
 github.com/apache/arrow-go/v18 v18.5.2-0.20260220015023-a886a5722b87/go.mod h1:IJTMBTlHe7cDOhRh0ioGuEKBl5iTR6xPfl5BN4AgirU=
 github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
-github.com/apache/cassandra-gocql-driver/v2 v2.1.1 h1:DjmtmSRoUuIFswczA8LPBppRb8T9vxqNP5Txc/lQxhE=
-github.com/apache/cassandra-gocql-driver/v2 v2.1.1/go.mod h1:QH/asJjB3mHvY6Dot6ZKMMpTcOrWJ8i9GhsvG1g0PK4=
+github.com/apache/cassandra-gocql-driver/v2 v2.1.0 h1:VEbbeJ2ift4deKMZ6Fs55Vs3fq/RrkjCcxCnqUxhwf8=
+github.com/apache/cassandra-gocql-driver/v2 v2.1.0/go.mod h1:QH/asJjB3mHvY6Dot6ZKMMpTcOrWJ8i9GhsvG1g0PK4=
 github.com/apache/iceberg-go v0.5.0 h1:wQj4CK5YiXZcB+tj19gWG+Jf1I6MiORQ/StSL/E5gGQ=
 github.com/apache/iceberg-go v0.5.0/go.mod h1:F/rdP1yZmnO4mQ0Qew2HTGdc+ZV57cRfxbbq/uJm1eM=
+github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
 github.com/apache/thrift v0.22.0 h1:r7mTJdj51TMDe6RtcmNdQxgn9XcyfGDOzegMDRg47uc=
 github.com/apache/thrift v0.22.0/go.mod h1:1e7J/O1Ae6ZQMTYdy9xa3w9k+XHWPfRvdPyJeynQ+/g=
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
@@ -711,50 +714,50 @@ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+
 github.com/atomicgo/cursor v0.0.1/go.mod h1:cBON2QmmrysudxNBFthvMtN32r3jxVRIvzkUiF/RuIk=
 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.12 h1:DIKX2c31ekm9RA2D9FBj1EWXx++9AdAqRw+e78Tq2Ck=
-github.com/aws/aws-sdk-go-v2 v1.41.12/go.mod h1:27+ACypSLljLAEKsCYOmrjKh83vuTRkuAe9Uv/3A4bg=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11 h1:h5+3VT69KUBK24grGuuA5saDJTj2IIjLb9au668Fo5I=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11/go.mod h1:dnakxebH6UwFvcvujL0LVggYQ8nEvBGjU4G/V79Nv94=
-github.com/aws/aws-sdk-go-v2/config v1.32.21 h1:1i1v5jWn6iNPl7zkH4VwIXQOb+OMqMRFNjdHQeZbFVo=
-github.com/aws/aws-sdk-go-v2/config v1.32.21/go.mod h1:7NXDJjk0e4QOMv3Y3ppwALx3ifdSQHzCACFtRX5J1hI=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.20 h1:nIGz0+cQKwijxSsWNpggvPxjxFMtrAHNj16RYzGbu2Q=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.20/go.mod h1:/UQHYia3DSeilGdchXJDEVzJws15XuZSdnTlwbTBg0Q=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.26 h1:a1VPHz7eG7mVNHWHXUcCyC8rQDBEr4k+o4HJYbSoYZ0=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.26/go.mod h1:9G8LPblMwaodeQdS+IfDBgPqABDctJLpyZ/M6jflE6s=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.13 h1:uMC4oL6G3MNhodo358QEqSDjrgvzV3TUQ58nyQSGq2E=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.13/go.mod h1:Cer86AE2686DvVUe57LPve3jUBmbujuaonSX8pNzGgw=
-github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager v0.2.3 h1:w5OoDiMN6x53ROmiIImGzmVcxXv2q1GXY+aKV4WAJYM=
-github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager v0.2.3/go.mod h1:dAhgYp776bX3LuWvnSCFwQEjNs6fuFg7YXIy5PXcP3Q=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.26 h1:dx1qc6V0exl5SK5/kwSc2IdOKCxLHoNbl/zXuYRwopw=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.26/go.mod h1:iDMGb+drKqPTqRjv1kWc5meMYzT6HsvPXxJV/Axq1t0=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.26 h1:ZjsIjuahUd/OxnxgfeK6OZqrReRNru1BcPfFD95IoN0=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.26/go.mod h1:57VbRA0K0Xxx5XUUTUrVxZ/gm4u8Bk3LBflfufwHtKQ=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.27 h1:i49S7g2smFWmlconi97Nn8dxb7jSQ0TeOFD20NX3M+o=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.27/go.mod h1:qiLes3uVQAK+cpb837HUEhypYKGBz2ZCDcDl5BYQtpM=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10 h1:d5/908OJ4bXg8lyjeMPvXetEKqoDoLi5Owy1zNue3yg=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10/go.mod h1:a57l7Hwh+FWI+we50g5NPJHYUKeJKfXbc4w8SyXu8Ig=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.18 h1:W/EyPFl9A5rXrtoilfwHYEvzHER+K4SpBPtMXi24Mos=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.18/go.mod h1:UG50K+pvd/uy6xExbobg0rjqFBFZe6I3l75EPDZw4tg=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.26 h1:oIRaBVJ2CxT7T61l3JkBCW/rnyh2TFZIRL71MvJTKRI=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.26/go.mod h1:1gCTZPMlqAUSFoFbkl35hKtTpE96WFl7ORvDXmSLpRc=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.25 h1:2pQEbwf+/6EDbiit/GcBE2K4IUpMZymaA0kOz3xK978=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.25/go.mod h1:KvT6NCcQ0EZ+ZkVRrlBMt04Po3ok23YELEp7WimhLhM=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.102.2 h1:ie4ElCmUKS26pzrZcIk/lmt4yWjAqLLcawstyQCh298=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.102.2/go.mod h1:zjsomFeX5duj+4PlMB+o4JoWTIx+G0XMyzjYrUbQkN0=
-github.com/aws/aws-sdk-go-v2/service/signin v1.1.2 h1:qwU4CNor4G2gRW3Na24FWOCZSEvr967IAV3D+MXxdE0=
-github.com/aws/aws-sdk-go-v2/service/signin v1.1.2/go.mod h1:vwIj2P3URYf7ZtOQkO2iVbAaR8qFhqMv05w3aPPA5XA=
-github.com/aws/aws-sdk-go-v2/service/sns v1.39.14 h1:p8WdWDh5AwSZdp19Haa3XMyPCICi9Z375a/Nu3IIEZY=
-github.com/aws/aws-sdk-go-v2/service/sns v1.39.14/go.mod h1:NKVY7DER6VXHkt2I/ycmHakALNboi3Rqwt4eEf/1Cnk=
-github.com/aws/aws-sdk-go-v2/service/sqs v1.42.24 h1:JP2wjWGmUp8lTCZb13Dv0Eciyc1jbO8pd0HZVMHFlrc=
-github.com/aws/aws-sdk-go-v2/service/sqs v1.42.24/go.mod h1:Ql9ziDutk8ERAN9HMaYANCW3lop451ppebkxEJMLCTM=
-github.com/aws/aws-sdk-go-v2/service/sso v1.31.0 h1:cMDUWhi7vlmGFj6rldHofjnAQhLLBWwRvNRbtEoyZo4=
-github.com/aws/aws-sdk-go-v2/service/sso v1.31.0/go.mod h1:VfGCm6HLUGwcouY6zjQJd81PoFsb8sfSmKd5QCg9XXc=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.3 h1:/pKy3mNES+ppFHf3g/XmI95+f3vdeXnkWYObByoYGAg=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.3/go.mod h1:0z2rhlVAjsYeBzV8fdT4jR23Nq+fYhoJNSJN+4SBlqM=
-github.com/aws/aws-sdk-go-v2/service/sts v1.43.0 h1:HN43uYvF8D2NtaPTeE4L3HMvXgd+RtqEqrea4uUztkM=
-github.com/aws/aws-sdk-go-v2/service/sts v1.43.0/go.mod h1:qzhDlfw1BRYyoNofevemNzrlRpUXa0BJamWx7klrR8w=
-github.com/aws/smithy-go v1.27.1 h1:4T340VFndXtADGF52gYa1POyL7s9E4Z1OeZ1hCscIw8=
-github.com/aws/smithy-go v1.27.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
+github.com/aws/aws-sdk-go-v2 v1.41.6 h1:1AX0AthnBQzMx1vbmir3Y4WsnJgiydmnJjiLu+LvXOg=
+github.com/aws/aws-sdk-go-v2 v1.41.6/go.mod h1:dy0UzBIfwSeot4grGvY1AqFWN5zgziMmWGzysDnHFcQ=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 h1:eBMB84YGghSocM7PsjmmPffTa+1FBUeNvGvFou6V/4o=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI=
+github.com/aws/aws-sdk-go-v2/config v1.32.14 h1:opVIRo/ZbbI8OIqSOKmpFaY7IwfFUOCCXBsUpJOwDdI=
+github.com/aws/aws-sdk-go-v2/config v1.32.14/go.mod h1:U4/V0uKxh0Tl5sxmCBZ3AecYny4UNlVmObYjKuuaiOo=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.14 h1:n+UcGWAIZHkXzYt87uMFBv/l8THYELoX6gVcUvgl6fI=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.14/go.mod h1:cJKuyWB59Mqi0jM3nFYQRmnHVQIcgoxjEMAbLkpr62w=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.21 h1:NUS3K4BTDArQqNu2ih7yeDLaS3bmHD0YndtA6UP884g=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.21/go.mod h1:YWNWJQNjKigKY1RHVJCuupeWDrrHjRqHm0N9rdrWzYI=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.1 h1:IbWiN670htmBioc+Zj32vSpJgQ2+OYSlvTvfQ1nCORQ=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.1/go.mod h1:tw/B596EUhBWDFGdDGuLC21fVU4A3s4/5Efy8S39W18=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 h1:Rgg6wvjjtX8bNHcvi9OnXWwcE0a2vGpbwmtICOsvcf4=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21/go.mod h1:A/kJFst/nm//cyqonihbdpQZwiUhhzpqTsdbhDdRF9c=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 h1:PEgGVtPoB6NTpPrBgqSE5hE/o47Ij9qk/SEZFbUOe9A=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21/go.mod h1:p+hz+PRAYlY3zcpJhPwXlLC4C+kqn70WIHwnzAfs6ps=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 h1:qYQ4pzQ2Oz6WpQ8T3HvGHnZydA72MnLuFK9tJwmrbHw=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6/go.mod h1:O3h0IK87yXci+kg6flUKzJnWeziQUKciKrLjcatSNcY=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 h1:rWyie/PxDRIdhNf4DzRk0lvjVOqFJuNnO8WwaIRVxzQ=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22/go.mod h1:zd/JsJ4P7oGfUhXn1VyLqaRZwPmZwg44Jf2dS84Dm3Y=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 h1:5EniKhLZe4xzL7a+fU3C2tfUN4nWIqlLesfrjkuPFTY=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7/go.mod h1:x0nZssQ3qZSnIcePWLvcoFisRXJzcTVvYpAAdYX8+GI=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 h1:JRaIgADQS/U6uXDqlPiefP32yXTda7Kqfx+LgspooZM=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13/go.mod h1:CEuVn5WqOMilYl+tbccq8+N2ieCy0gVn3OtRb0vBNNM=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 h1:c31//R3xgIJMSC8S6hEVq+38DcvUlgFY0FM6mSI5oto=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21/go.mod h1:r6+pf23ouCB718FUxaqzZdbpYFyDtehyZcmP5KL9FkA=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 h1:ZlvrNcHSFFWURB8avufQq9gFsheUgjVD9536obIknfM=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21/go.mod h1:cv3TNhVrssKR0O/xxLJVRfd2oazSnZnkUeTf6ctUwfQ=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.99.0 h1:hlSuz394kV0vhv9drL5lhuEFbEOEP1VyQpy15qWh1Pk=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.99.0/go.mod h1:uoA43SdFwacedBfSgfFSjjCvYe8aYBS7EnU5GZ/YKMM=
+github.com/aws/aws-sdk-go-v2/service/signin v1.0.9 h1:QKZH0S178gCmFEgst8hN0mCX1KxLgHBKKY/CLqwP8lg=
+github.com/aws/aws-sdk-go-v2/service/signin v1.0.9/go.mod h1:7yuQJoT+OoH8aqIxw9vwF+8KpvLZ8AWmvmUWHsGQZvI=
+github.com/aws/aws-sdk-go-v2/service/sns v1.39.7 h1:fovS7qGMT+BBSuifkySdVaMWxXTyaYT6qaBx/1y6Ij4=
+github.com/aws/aws-sdk-go-v2/service/sns v1.39.7/go.mod h1:gFahrattA8ulEtiS4XL/fQiQ77l+Urc52Y96/r1e6ks=
+github.com/aws/aws-sdk-go-v2/service/sqs v1.42.17 h1:ZNMxVFPayuHe14u/vn+BwLi3wxQvxcNTw8WdPv2gqBc=
+github.com/aws/aws-sdk-go-v2/service/sqs v1.42.17/go.mod h1:ZxqweFQ2w6NNznWMUvWV9AvkAfM6J8F/MC250Mb4n1I=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.15 h1:lFd1+ZSEYJZYvv9d6kXzhkZu07si3f+GQ1AaYwa2LUM=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.15/go.mod h1:WSvS1NLr7JaPunCXqpJnWk1Bjo7IxzZXrZi1QQCkuqM=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.19 h1:dzztQ1YmfPrxdrOiuZRMF6fuOwWlWpD2StNLTceKpys=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.19/go.mod h1:YO8TrYtFdl5w/4vmjL8zaBSsiNp3w0L1FfKVKenZT7w=
+github.com/aws/aws-sdk-go-v2/service/sts v1.41.10 h1:p8ogvvLugcR/zLBXTXrTkj0RYBUdErbMnAFFp12Lm/U=
+github.com/aws/aws-sdk-go-v2/service/sts v1.41.10/go.mod h1:60dv0eZJfeVXfbT1tFJinbHrDfSJ2GZl4Q//OSSNAVw=
+github.com/aws/smithy-go v1.25.1 h1:J8ERsGSU7d+aCmdQur5Txg6bVoYelvQJgtZehD12GkI=
+github.com/aws/smithy-go v1.25.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
 github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
 github.com/bazelbuild/rules_go v0.46.0 h1:CTefzjN/D3Cdn3rkrM6qMWuQj59OBcuOjyIp3m4hZ7s=
@@ -824,13 +827,15 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
-github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
+github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
+github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
+github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
+github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
 github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
 github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
 github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
-github.com/cloudinary/cloudinary-go/v2 v2.15.0 h1:iLoIwb7BJECHTbNcmIhYDsQhoZiACWGNvEpyqQy97Dk=
-github.com/cloudinary/cloudinary-go/v2 v2.15.0/go.mod h1:ireC4gqVetsjVhYlwjUJwKTbZuWjEIynbR9zQTlqsvo=
+github.com/cloudinary/cloudinary-go/v2 v2.13.0 h1:ugiQwb7DwpWQnete2AZkTh94MonZKmxD7hDGy1qTzDs=
+github.com/cloudinary/cloudinary-go/v2 v2.13.0/go.mod h1:ireC4gqVetsjVhYlwjUJwKTbZuWjEIynbR9zQTlqsvo=
 github.com/cloudsoda/go-smb2 v0.0.0-20250228001242-d4c70e6251cc h1:t8YjNUCt1DimB4HCIXBztwWMhgxr5yG5/YaRl9Afdfg=
 github.com/cloudsoda/go-smb2 v0.0.0-20250228001242-d4c70e6251cc/go.mod h1:CgWpFCFWzzEA5hVkhAc6DZZzGd3czx+BblvOzjmg6KA=
 github.com/cloudsoda/sddl v0.0.0-20250224235906-926454e91efc h1:0xCWmFKBmarCqqqLeM7jFBSw/Or81UEElFqO8MY+GDs=
@@ -850,8 +855,8 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 h1:aBangftG7EVZoUb69Os8IaYg++6uMOdKK83QtkkvJik=
-github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2/go.mod h1:qwXFYgsP6T7XnJtbKlf1HP8AjxZZyzxMmc+Lq5GjlU4=
+github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 h1:6xNmx7iTtyBRev0+D/Tv1FZd4SCg8axKApyNyRsAt/w=
+github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5/go.mod h1:KdCmV+x/BuvyMxRnYBlmVaq4OLiKW6iRQfvC62cvdkI=
 github.com/cockroachdb/apd/v3 v3.2.1 h1:U+8j7t0axsIgvQUqthuNm82HIrYXodOV2iWLWtEaIwg=
 github.com/cockroachdb/apd/v3 v3.2.1/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc=
 github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I=
@@ -862,8 +867,8 @@ github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwP
 github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/version v0.0.0-20250314144055-3860cd14adf2 h1:8Vfw2iNEpYIV6aLtMwT5UOGuPmp9MKlEKWKFTuB+MPU=
 github.com/cockroachdb/version v0.0.0-20250314144055-3860cd14adf2/go.mod h1:P9WiZOdQ1R/ZZDL0WzF5wlyRvrjtfhNOwMZymFpBwjE=
-github.com/cognusion/imaging v1.0.3 h1:nHyIeEVDV8JkBbuhgx8iSBW72W8rHbDEyruA0Jh7Lnk=
-github.com/cognusion/imaging v1.0.3/go.mod h1:38tFLFhGK81ORThZG8dVXPtp1uhd+3xM1WXuMn+unOA=
+github.com/cognusion/imaging v1.0.2 h1:BQwBV8V8eF3+dwffp8Udl9xF1JKh5Z0z5JkJwAi98Mc=
+github.com/cognusion/imaging v1.0.2/go.mod h1:mj7FvH7cT2dlFogQOSUQRtotBxJ4gFQ2ySMSmBm5dSk=
 github.com/colinmarc/hdfs/v2 v2.4.0 h1:v6R8oBx/Wu9fHpdPoJJjpGSUxo8NhHIwrwsfhFvU9W0=
 github.com/colinmarc/hdfs/v2 v2.4.0/go.mod h1:0NAO+/3knbMx6+5pCv+Hcbaz4xn/Zzbn9+WIib2rKVI=
 github.com/compose-spec/compose-go/v2 v2.9.0 h1:UHSv/QHlo6QJtrT4igF1rdORgIUhDo1gWuyJUoiNNIM=
@@ -900,9 +905,8 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/creasty/defaults v1.8.0 h1:z27FJxCAa0JKt3utc0sCImAEb+spPucmKoOdLHvHYKk=
 github.com/creasty/defaults v1.8.0/go.mod h1:iGzKe6pbEHnpMPtfDXZEr0NVxWnPTjb1bbDy08fPzYM=
+github.com/cronokirby/saferith v0.33.0 h1:TgoQlfsD4LIwx71+ChfRcIpjkw+RPOapDEVxa+LhwLo=
 github.com/cronokirby/saferith v0.33.0/go.mod h1:QKJhjoqUtBsXCAVEjw38mFqoi7DebT7kthcD7UzbnoA=
-github.com/cronokirby/saferith v0.33.1-0.20250226174546-1f11f94ce488 h1:tLWBZgPg6TV67oe76W4p+aUQEWIa52wbcuiz8GFd3vo=
-github.com/cronokirby/saferith v0.33.1-0.20250226174546-1f11f94ce488/go.mod h1:QKJhjoqUtBsXCAVEjw38mFqoi7DebT7kthcD7UzbnoA=
 github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso=
 github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
 github.com/d4l3k/messagediff v1.2.1 h1:ZcAIMYsUg0EAp9X+tt8/enBE/Q8Yd5kzPynLyKptt9U=
@@ -996,16 +1000,16 @@ github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJ
 github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
 github.com/envoyproxy/go-control-plane v0.14.0 h1:hbG2kr4RuFj222B6+7T83thSPqLjwBIfQawTkC++2HA=
 github.com/envoyproxy/go-control-plane v0.14.0/go.mod h1:NcS5X47pLl/hfqxU70yPwL9ZMkUlwlKxtAohpi2wBEU=
-github.com/envoyproxy/go-control-plane/envoy v1.37.0 h1:u3riX6BoYRfF4Dr7dwSOroNfdSbEPe9Yyl09/B6wBrQ=
-github.com/envoyproxy/go-control-plane/envoy v1.37.0/go.mod h1:DReE9MMrmecPy+YvQOAOHNYMALuowAnbjjEMkkWOi6A=
+github.com/envoyproxy/go-control-plane/envoy v1.36.0 h1:yg/JjO5E7ubRyKX3m07GF3reDNEnfOboJ0QySbH736g=
+github.com/envoyproxy/go-control-plane/envoy v1.36.0/go.mod h1:ty89S1YCCVruQAm9OtKeEkQLTb+Lkz0k8v9W0Oxsv98=
 github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
 github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
 github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
 github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
-github.com/envoyproxy/protoc-gen-validate v1.3.3 h1:MVQghNeW+LZcmXe7SY1V36Z+WFMDjpqGAGacLe2T0ds=
-github.com/envoyproxy/protoc-gen-validate v1.3.3/go.mod h1:TsndJ/ngyIdQRhMcVVGDDHINPLWB7C82oDArY51KfB0=
+github.com/envoyproxy/protoc-gen-validate v1.3.0 h1:TvGH1wof4H33rezVKWSpqKz5NXWg5VPuZ0uONDT6eb4=
+github.com/envoyproxy/protoc-gen-validate v1.3.0/go.mod h1:HvYl7zwPa5mffgyeTUHA9zHIH36nmrm7oCbo4YKoSWA=
 github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw=
 github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA=
 github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0=
@@ -1043,8 +1047,8 @@ github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQ
 github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
 github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
 github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
-github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM=
-github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
+github.com/gabriel-vasile/mimetype v1.4.11 h1:AQvxbp830wPhHTqc1u7nzoLT+ZFxGY7emj5DR5DYFik=
+github.com/gabriel-vasile/mimetype v1.4.11/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
 github.com/geoffgarside/ber v1.2.0 h1:/loowoRcs/MWLYmGX9QtIAbA+V/FrnVLsMMPhwiRm64=
 github.com/geoffgarside/ber v1.2.0/go.mod h1:jVPKeCbj6MvQZhwLYsGwaGI52oUorHoHKNecGT85ZCc=
 github.com/getsentry/sentry-go v0.44.1 h1:/cPtrA5qB7uMRrhgSn9TYtcEF36auGP3Y6+ThvD/yaI=
@@ -1067,8 +1071,8 @@ github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3
 github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
 github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
 github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=
-github.com/go-git/go-billy/v5 v5.9.0 h1:jItGXszUDRtR/AlferWPTMN4j38BQ88XnXKbilmmBPA=
-github.com/go-git/go-billy/v5 v5.9.0/go.mod h1:jCnQMLj9eUgGU7+ludSTYoZL/GGmii14RxKFj7ROgHw=
+github.com/go-git/go-billy/v5 v5.8.0 h1:I8hjc3LbBlXTtVuFNJuwYuMiHvQJDq1AT6u4DwDzZG0=
+github.com/go-git/go-billy/v5 v5.8.0/go.mod h1:RpvI/rw4Vr5QA+Z60c6d6LXH0rYJo0uD5SqfmrrheCY=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -1092,8 +1096,8 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
-github.com/go-openapi/errors v0.22.6 h1:eDxcf89O8odEnohIXwEjY1IB4ph5vmbUsBMsFNwXWPo=
-github.com/go-openapi/errors v0.22.6/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk=
+github.com/go-openapi/errors v0.22.4 h1:oi2K9mHTOb5DPW2Zjdzs/NIvwi2N3fARKaTJLdNabaM=
+github.com/go-openapi/errors v0.22.4/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk=
 github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
 github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
@@ -1112,8 +1116,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.30.1 h1:f3zDSN/zOma+w6+1Wswgd9fLkdwy06ntQJp0BBvFG0w=
-github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM=
+github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688=
+github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU=
 github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
 github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-redis/redis/v7 v7.4.1 h1:PASvf36gyUpr2zdOUS/9Zqc80GbM+9BDyiJSJDDOrTI=
@@ -1122,18 +1126,18 @@ github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-redsync/redsync/v4 v4.16.0 h1:bNcOzeHH9d3s6pghU9NJFMPrQa41f5Nx3L4YKr3BdEU=
 github.com/go-redsync/redsync/v4 v4.16.0/go.mod h1:V4gagqgyASWBZuwx4xGzu72aZNb/6Mo05byUa3mVmKQ=
-github.com/go-resty/resty/v2 v2.17.2 h1:FQW5oHYcIlkCNrMD2lloGScxcHJ0gkjshV3qcQAyHQk=
-github.com/go-resty/resty/v2 v2.17.2/go.mod h1:kCKZ3wWmwJaNc7S29BRtUhJwy7iqmn+2mLtQrOyQlVA=
-github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw=
-github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk=
+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=
+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
 github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
-github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
+github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/go-zookeeper/zk v1.0.4 h1:DPzxraQx7OrPyXq2phlGlNSIyWEsAox0RJmjTseMV6I=
 github.com/go-zookeeper/zk v1.0.4/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
@@ -1280,8 +1284,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
 github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
-github.com/googleapis/enterprise-certificate-proxy v0.3.15 h1:xolVQTEXusUcAA5UgtyRLjelpFFHWlPQ4XfWGc7MBas=
-github.com/googleapis/enterprise-certificate-proxy v0.3.15/go.mod h1:vqVt9yG9480NtzREnTlmGSBmFrA+bzb0yl0TxoBQXOg=
+github.com/googleapis/enterprise-certificate-proxy v0.3.14 h1:yh8ncqsbUY4shRD5dA6RlzjJaT4hi3kII+zYw8wmLb8=
+github.com/googleapis/enterprise-certificate-proxy v0.3.14/go.mod h1:vqVt9yG9480NtzREnTlmGSBmFrA+bzb0yl0TxoBQXOg=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
@@ -1292,8 +1296,8 @@ github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK
 github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
 github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
 github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
-github.com/googleapis/gax-go/v2 v2.22.0 h1:PjIWBpgGIVKGoCXuiCoP64altEJCj3/Ei+kSU5vlZD4=
-github.com/googleapis/gax-go/v2 v2.22.0/go.mod h1:irWBbALSr0Sk3qlqb9SyJ1h68WjgeFuiOzI4Rqw5+aY=
+github.com/googleapis/gax-go/v2 v2.21.0 h1:h45NjjzEO3faG9Lg/cFrBh2PgegVVgzqKzuZl/wMbiI=
+github.com/googleapis/gax-go/v2 v2.21.0/go.mod h1:But/NJU6TnZsrLai/xBAQLLz+Hc7fHZJt/hsCz3Fih4=
 github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ=
@@ -1320,8 +1324,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 h1:NmZ1PKzSTQbuGHw9DGPFomqkkLWMC+vZCkfs+FHv1Vg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3/go.mod h1:zQrxl1YP88HQlA6i9c63DSVPFklWpGX4OWAc9bFuaH4=
 github.com/hamba/avro/v2 v2.31.0 h1:wv3nmua7lCEIwWsb6vqsTS3pXktTxcKg5eoyNu0VhrU=
 github.com/hamba/avro/v2 v2.31.0/go.mod h1:t6lJYAGE5Mswfn17zjtyQsssRQgnqO6TXLBCHHWRqrw=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -1393,8 +1397,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf h1:FtEj8sfIcaaBfAKrE1Cwb61YDtYq9JxChK1c7AKce7s=
 github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf/go.mod h1:yrqSXGoD/4EKfF26AOGzscPOgTTJcyAwM2rpixWT+t4=
-github.com/internxt/rclone-adapter v0.0.0-20260331173834-036f908d0160 h1:PV6ipOJN0JIek4dqPqsTtenQmjI1SZntCUgPzhfk9gM=
-github.com/internxt/rclone-adapter v0.0.0-20260331173834-036f908d0160/go.mod h1:yRuPDnHgGmsbvopF0amMqXxr4n32GynzX5GTwFYDHaw=
+github.com/internxt/rclone-adapter v0.0.0-20260220172730-613f4cc8b8fd h1:dSIuz2mpJAPQfhHYtG57D0qwSkgC/vQ69gHfeyQ4kxA=
+github.com/internxt/rclone-adapter v0.0.0-20260220172730-613f4cc8b8fd/go.mod h1:vdPya4AIcDjvng4ViaAzqjegJf0VHYpYHQguFx5xBp0=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
@@ -1425,8 +1429,8 @@ github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
 github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jlaffaye/ftp v0.2.1-0.20251026020404-6602e981a1bb h1:6vkM8gO+zFV2m21QzGYyUSq5TP0VQgP2Xz3UQyCN2kI=
-github.com/jlaffaye/ftp v0.2.1-0.20251026020404-6602e981a1bb/go.mod h1:H1+whwD0Qe3YOunlXIWhh3rlvzW5cZfkMDYGQPg+KAM=
+github.com/jlaffaye/ftp v0.2.1-0.20240918233326-1b970516f5d3 h1:ZxO6Qr2GOXPdcW80Mcn3nemvilMPvpWqxrNfK2ZnNNs=
+github.com/jlaffaye/ftp v0.2.1-0.20240918233326-1b970516f5d3/go.mod h1:dvLUr/8Fs9a2OBrEnCC5duphbkz/k/mSy5OkXg3PAgI=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
@@ -1471,8 +1475,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
 github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
 github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
-github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
+github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE=
+github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.10/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
 github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
@@ -1507,20 +1511,20 @@ github.com/lanrat/extsort v1.4.2 h1:akbLIdo4PhNZtvjpaWnbXtGMmLtnGzXplkzfgl+XTTY=
 github.com/lanrat/extsort v1.4.2/go.mod h1:hceP6kxKPKebjN1RVrDBXMXXECbaI41Y94tt6MDazc4=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
-github.com/lib/pq v1.12.0 h1:mC1zeiNamwKBecjHarAr26c/+d8V5w/u4J0I/yASbJo=
-github.com/lib/pq v1.12.0/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA=
+github.com/lib/pq v1.11.1 h1:wuChtj2hfsGmmx3nf1m7xC2XpK6OtelS2shMY+bGMtI=
+github.com/lib/pq v1.11.1/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA=
 github.com/linkedin/goavro/v2 v2.15.0 h1:pDj1UrjUOO62iXhgBiE7jQkpNIc5/tA5eZsgolMjgVI=
 github.com/linkedin/goavro/v2 v2.15.0/go.mod h1:KXx+erlq+RPlGSPmLF7xGo6SAbh8sCQ53x064+ioxhk=
-github.com/linxGnu/grocksdb v1.10.8 h1:Nau01Hhm/0kaVTR6d4viwD6npYbnDvZAfzwJCLzKRYo=
-github.com/linxGnu/grocksdb v1.10.8/go.mod h1:OLQKZwiKwaJiAVCsOzWKvwiLwfZ5Vz8Md5TYR7t7pM8=
+github.com/linxGnu/grocksdb v1.10.7 h1:fCi4qvZWo04VgFwGWmO8HQJgUVounJBy+C2TMVPU/ho=
+github.com/linxGnu/grocksdb v1.10.7/go.mod h1:OLQKZwiKwaJiAVCsOzWKvwiLwfZ5Vz8Md5TYR7t7pM8=
 github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4=
 github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4=
 github.com/lithammer/shortuuid/v3 v3.0.7 h1:trX0KTHy4Pbwo/6ia8fscyHoGA+mf1jWbPJVuvyJQQ8=
 github.com/lithammer/shortuuid/v3 v3.0.7/go.mod h1:vMk8ke37EmiewwolSO1NLW8vP4ZaKlRuDIi8tWWmAts=
 github.com/lpar/date v1.0.0 h1:bq/zVqFTUmsxvd/CylidY4Udqpr9BOFrParoP6p0x/I=
 github.com/lpar/date v1.0.0/go.mod h1:KjYe0dDyMQTgpqcUz4LEIeM5VZwhggjVx/V2dtc8NSo=
-github.com/lufia/plan9stats v0.0.0-20260216142805-b3301c5f2a88 h1:PTw+yKnXcOFCR6+8hHTyWBeQ/P4Nb7dd4/0ohEcWQuM=
-github.com/lufia/plan9stats v0.0.0-20260216142805-b3301c5f2a88/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
+github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 h1:PwQumkgq4/acIiZhtifTV5OUqqiP82UAl0h87xj/l9k=
+github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
 github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
@@ -1540,8 +1544,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-runewidth v0.0.22 h1:76lXsPn6FyHtTY+jt2fTTvsMUCZq1k0qwRsAMuxzKAk=
-github.com/mattn/go-runewidth v0.0.22/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
+github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
 github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
 github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
 github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
@@ -1653,18 +1657,18 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg=
 github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LDHcMZmk3RmK7c=
-github.com/oracle/oci-go-sdk/v65 v65.111.0 h1:eDkWg6ZN0uKwWzSekoFcQJhR+C+F/aVdTwr+lGHU9Qk=
-github.com/oracle/oci-go-sdk/v65 v65.111.0/go.mod h1:8ZzvzuEG/cFLFZhxg/Mg1w19KqyXBKO3c17QIc5PkGs=
+github.com/oracle/oci-go-sdk/v65 v65.104.0 h1:l9awEvzWvxmYhy/97A0hZ87pa7BncYXmcO/S8+rvgK0=
+github.com/oracle/oci-go-sdk/v65 v65.104.0/go.mod h1:oB8jFGVc/7/zJ+DbleE8MzGHjhs2ioCz5stRTdZdIcY=
 github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c=
 github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM=
-github.com/panjf2000/ants/v2 v2.11.5 h1:a7LMnMEeux/ebqTux140tRiaqcFTV0q2bEHF03nl6Rg=
-github.com/panjf2000/ants/v2 v2.11.5/go.mod h1:8u92CYMUc6gyvTIw8Ru7Mt7+/ESnJahz5EVtqfrilek=
+github.com/panjf2000/ants/v2 v2.11.3 h1:AfI0ngBoXJmYOpDh9m516vjqoUu2sLrIVgppI9TZVpg=
+github.com/panjf2000/ants/v2 v2.11.3/go.mod h1:8u92CYMUc6gyvTIw8Ru7Mt7+/ESnJahz5EVtqfrilek=
 github.com/parquet-go/bitpack v1.0.0 h1:AUqzlKzPPXf2bCdjfj4sTeacrUwsT7NlcYDMUQxPcQA=
 github.com/parquet-go/bitpack v1.0.0/go.mod h1:XnVk9TH+O40eOOmvpAVZ7K2ocQFrQwysLMnc6M/8lgs=
 github.com/parquet-go/jsonlite v1.0.0 h1:87QNdi56wOfsE5bdgas0vRzHPxfJgzrXGml1zZdd7VU=
 github.com/parquet-go/jsonlite v1.0.0/go.mod h1:nDjpkpL4EOtqs6NQugUsi0Rleq9sW/OtC1NnZEnxzF0=
-github.com/parquet-go/parquet-go v0.30.1 h1:Oy6ganNrAdFiVwy7wNmWagfPTWA2X9Z3tVHBc7JtuX8=
-github.com/parquet-go/parquet-go v0.30.1/go.mod h1:navtkAYr2LGoJVp141oXPlO/sxLvaOe3la2JEoD8+rg=
+github.com/parquet-go/parquet-go v0.28.0 h1:ECyksyv8T2pOrlLsN7aWJIoQakyk/HtxQ2lchgS4els=
+github.com/parquet-go/parquet-go v0.28.0/go.mod h1:navtkAYr2LGoJVp141oXPlO/sxLvaOe3la2JEoD8+rg=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
@@ -1687,8 +1691,8 @@ github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2
 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.27 h1:+PhzhWDrjRj89TH2sw43nE3+4+W8lSxIuQadEHZyjUk=
-github.com/pierrec/lz4/v4 v4.1.27/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
+github.com/pierrec/lz4/v4 v4.1.26 h1:GrpZw1gZttORinvzBdXPUXATeqlJjqUG/D87TKMnhjY=
+github.com/pierrec/lz4/v4 v4.1.26/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
 github.com/pierrre/compare v1.0.2 h1:k4IUsHgh+dbcAOIWCfxVa/7G6STjADH2qmhomv+1quc=
 github.com/pierrre/compare v1.0.2/go.mod h1:8UvyRHH+9HS8Pczdd2z5x/wvv67krDwVxoOndaIIDVU=
 github.com/pierrre/geohash v1.0.0 h1:f/zfjdV4rVofTCz1FhP07T+EMQAvcMM2ioGZVt+zqjI=
@@ -1751,8 +1755,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4=
-github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw=
+github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8=
+github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
@@ -1775,22 +1779,24 @@ github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++
 github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 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.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw=
-github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
-github.com/rabbitmq/amqp091-go v1.11.0 h1:HxIctVm9Gid/Vtn706necmZ7Wj6pgGI2eqplRbEY8O8=
-github.com/rabbitmq/amqp091-go v1.11.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
-github.com/rclone/Proton-API-Bridge v1.0.3 h1:Bs7RC4xCFSN0BPIYVda/BNxp0qo3NV0gB2VZqx2KIew=
-github.com/rclone/Proton-API-Bridge v1.0.3/go.mod h1:26RAest751Ofk+F/d8xtl4UyWXrZvMQwn39U8rm/WKM=
-github.com/rclone/go-proton-api v1.0.2 h1:cJtJUab0MGJ3C6q5kiEJs3pbyhSLnOKMyYOQehA0PBc=
-github.com/rclone/go-proton-api v1.0.2/go.mod h1:LB2kCEaZMzNn3ocdz+qYfxXmuLxxN0ka62KJd2x53Bc=
-github.com/rclone/rclone v1.74.1 h1:QQI//tl4O5uooTowdKwNKcv5qCQvJ3LIBG00+TKeXw0=
-github.com/rclone/rclone v1.74.1/go.mod h1:44epaKf5w/1ZQounefr76wx4+y9NZmgfMKle9T3pzj0=
+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/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw=
+github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
+github.com/rasky/go-xdr v0.0.0-20170124162913-1a41d1a06c93 h1:UVArwN/wkKjMVhh2EQGC0tEc1+FqiLlvYXY5mQ2f8Wg=
+github.com/rasky/go-xdr v0.0.0-20170124162913-1a41d1a06c93/go.mod h1:Nfe4efndBz4TibWycNE+lqyJZiMX4ycx+QKV8Ta0f/o=
+github.com/rclone/Proton-API-Bridge v1.0.1-0.20260127174007-77f974840d11 h1:4MI2alxM/Ye2gIRBlYf28JGWTipZ4Zz7yAziPKrttjs=
+github.com/rclone/Proton-API-Bridge v1.0.1-0.20260127174007-77f974840d11/go.mod h1:3HLX7dwZgvB7nt+Yl/xdzVPcargQ1yBmJEUg3n+jMKM=
+github.com/rclone/go-proton-api v1.0.1-0.20260127173028-eb465cac3b18 h1:Lc+d3ISfQaMJKWZOE7z4ZSY4RVmdzbn1B0IM8xN18qM=
+github.com/rclone/go-proton-api v1.0.1-0.20260127173028-eb465cac3b18/go.mod h1:LB2kCEaZMzNn3ocdz+qYfxXmuLxxN0ka62KJd2x53Bc=
+github.com/rclone/rclone v1.73.5 h1:r8a9JHYIWUqk7hNRJuMJ3cROkKfB2zmfkADg8ZLYh6I=
+github.com/rclone/rclone v1.73.5/go.mod h1:WVv8gvA/lEl/Y37e8I8yosm7ZY+Szq7ujXbJS8Ol63o=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 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.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0=
-github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA=
+github.com/redis/go-redis/v9 v9.18.0 h1:pMkxYPkEbMPwRdenAzUNyFNrDgHx9U+DrBabWNfSRQs=
+github.com/redis/go-redis/v9 v9.18.0/go.mod h1:k3ufPphLU5YXwNTUcCRXGxUoF1fqxnhFQmscfkCoDA0=
 github.com/redis/rueidis v1.0.71 h1:pODtnAR5GAB7j4ekhldZ29HKOxe4Hph0GTDGk1ayEQY=
 github.com/redis/rueidis v1.0.71/go.mod h1:lfdcZzJ1oKGKL37vh9fO3ymwt+0TdjkkUCJxbgpmcgQ=
 github.com/redis/rueidis/rueidiscompat v1.0.71 h1:wNZ//kEjMZgBM0KCk7ncOX8KmAgROU2kDdDNpwheG4w=
@@ -1803,8 +1809,8 @@ github.com/relvacode/iso8601 v1.7.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rfjakob/eme v1.2.0 h1:8dAHL+WVAw06+7DkRKnRiFp1JL3QjcJEZFqDnndUaSI=
-github.com/rfjakob/eme v1.2.0/go.mod h1:cVvpasglm/G3ngEfcfT/Wt0GwhkuO32pf/poW6Nyk1k=
+github.com/rfjakob/eme v1.1.2 h1:SxziR8msSOElPayZNFfQw4Tjx/Sbaeeh3eRvrHVMUs4=
+github.com/rfjakob/eme v1.1.2/go.mod h1:cVvpasglm/G3ngEfcfT/Wt0GwhkuO32pf/poW6Nyk1k=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -1850,15 +1856,15 @@ github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b h1:h+3JX2VoWTFuyQ
 github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc=
 github.com/shibumi/go-pathspec v1.3.0 h1:QUyMZhFo0Md5B8zV8x2tesohbb5kfbpTi9rBnKh5dkI=
 github.com/shibumi/go-pathspec v1.3.0/go.mod h1:Xutfslp817l2I1cZvgcfeMQJG5QnU2lh5tVaaMCl3jE=
-github.com/shirou/gopsutil/v4 v4.26.3 h1:2ESdQt90yU3oXF/CdOlRCJxrP+Am1aBYubTMTfxJ1qc=
-github.com/shirou/gopsutil/v4 v4.26.3/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ=
+github.com/shirou/gopsutil/v4 v4.26.2 h1:X8i6sicvUFih4BmYIGT1m2wwgw2VG9YgrDTi7cIRGUI=
+github.com/shirou/gopsutil/v4 v4.26.2/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
-github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
+github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af h1:Sp5TG9f7K39yfB+If0vjp97vuT74F72r8hfRpP8jLU0=
+github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY=
@@ -1881,8 +1887,8 @@ github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
 github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
 github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
 github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
-github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
-github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
+github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
+github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
 github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
 github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
@@ -1924,8 +1930,8 @@ github.com/substrait-io/substrait-protobuf/go v0.81.0 h1:/qC1XYKuO4oPdTwLYySuVZ6
 github.com/substrait-io/substrait-protobuf/go v0.81.0/go.mod h1:hn+Szm1NmZZc91FwWK9EXD/lmuGBSRTJ5IvHhlG1YnQ=
 github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965 h1:1oFLiOyVl+W7bnBzGhf7BbIv9loSFQcieWWYIjLqcAw=
 github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA=
-github.com/t3rm1n4l/go-mega v0.0.0-20251120131202-6845944c051c h1:dtcOwRimeiBFrlutmF6K94l0rxYFARNFMA+lSQ41C+M=
-github.com/t3rm1n4l/go-mega v0.0.0-20251120131202-6845944c051c/go.mod h1:BF/l2jNyK+2h/BJZ7VLMAz6m/IWjA2F67gTjV1C/+Bo=
+github.com/t3rm1n4l/go-mega v0.0.0-20251031123324-a804aaa87491 h1:rrGZv6xYk37hx0tW2sYfgbO0PqStbHqz6Bq6oc9Hurg=
+github.com/t3rm1n4l/go-mega v0.0.0-20251031123324-a804aaa87491/go.mod h1:ykucQyiE9Q2qx1wLlEtZkkNn1IURib/2O+Mvd25i1Fo=
 github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502/go.mod h1:p9lPsd+cx33L3H9nNoecRRxPssFKUwwI50I3pZ0yT+8=
 github.com/tarantool/go-iproto v1.1.0 h1:HULVOIHsiehI+FnHfM7wMDntuzUddO09DKqu2WnFQ5A=
 github.com/tarantool/go-iproto v1.1.0/go.mod h1:LNCtdyZxojUed8SbOiYHoc3v9NvaZTB7p96hUySMlIo=
@@ -1955,8 +1961,8 @@ github.com/tikv/pd/client v0.0.0-20230329114254-1948c247c2b1/go.mod h1:3cTcfo8GR
 github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375 h1:QB54BJwA6x8QU9nHY3xJSZR2kX9bgpZekRKGkLTmEXA=
 github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375/go.mod h1:xRroudyp5iVtxKqZCrA6n2TLFRBf8bmnjr1UD4x+z7g=
 github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
-github.com/tinylib/msgp v1.6.3 h1:bCSxiTz386UTgyT1i0MSCvdbWjVW+8sG3PjkGsZQt4s=
-github.com/tinylib/msgp v1.6.3/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77roAqEA=
+github.com/tinylib/msgp v1.5.0 h1:GWnqAE54wmnlFazjq2+vgr736Akg58iiHImh+kPY2pc=
+github.com/tinylib/msgp v1.5.0/go.mod h1:cvjFkb4RiC8qSBOPMGPSzSAx47nAsfhLVTCZZNuHv5o=
 github.com/tklauser/go-sysconf v0.3.16 h1:frioLaCQSsF5Cy1jgRBrzr6t502KIIwQ0MArYICU0nA=
 github.com/tklauser/go-sysconf v0.3.16/go.mod h1:/qNL9xxDhc7tx3HSRsLWNnuzbVfh3e7gh/BmM179nYI=
 github.com/tklauser/numcpus v0.11.0 h1:nSTwhKH5e1dMNsCdVBukSZrURJRoHbSEQjdEbY+9RXw=
@@ -2022,6 +2028,10 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU
 github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
+github.com/willscott/go-nfs v0.0.3 h1:Z5fHVxMsppgEucdkKBN26Vou19MtEM875NmRwj156RE=
+github.com/willscott/go-nfs v0.0.3/go.mod h1:VhNccO67Oug787VNXcyx9JDI3ZoSpqoKMT/lWMhUIDg=
+github.com/willscott/go-nfs-client v0.0.0-20251022144359-801f10d98886 h1:DtrBtkgTJk2XGt4T7eKdKVkd9A5NCevN2e4inLXtsqA=
+github.com/willscott/go-nfs-client v0.0.0-20251022144359-801f10d98886/go.mod h1:Tq++Lr/FgiS3X48q5FETemXiSLGuYMQT2sPjYNPJSwA=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0 h1:3UeQBvD0TFrlVjOeLOBz+CPAI8dnbqNSVwUwRrkp7vQ=
@@ -2054,14 +2064,14 @@ github.com/yandex-cloud/go-genproto v0.0.0-20211115083454-9ca41db5ed9e h1:9LPdmD
 github.com/yandex-cloud/go-genproto v0.0.0-20211115083454-9ca41db5ed9e/go.mod h1:HEUYX/p8966tMUHHT+TsS0hF/Ca/NYwqprC5WXSDMfE=
 github.com/ydb-platform/ydb-go-genproto v0.0.0-20221215182650-986f9d10542f/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
 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-20260428144813-1c07baab7f7b h1:xeiobG1riqe6dTMZuTcOvwOY0BbFidSk3gRLyVeLfJA=
-github.com/ydb-platform/ydb-go-genproto v0.0.0-20260428144813-1c07baab7f7b/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20260311095541-ebbf792c1180 h1:avIdi8eGXjKbn1WLokNR1Ofnz1k8t7tJ88YQLD/iCi8=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20260311095541-ebbf792c1180/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/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.139.5 h1:mTih9wy1RbI4PplGlFn/CMnkgxm1HzD/nKSdnNMy4pE=
-github.com/ydb-platform/ydb-go-sdk/v3 v3.139.5/go.mod h1:b9NEO6mgaiqsnOMkS003uS82XsKh6GL+ZTFfPqXWz+c=
+github.com/ydb-platform/ydb-go-sdk/v3 v3.134.2 h1:Bzra5hUQIWrxknQ0oV6HE5q/eZU1VhHMKSZ/XWpqMgM=
+github.com/ydb-platform/ydb-go-sdk/v3 v3.134.2/go.mod h1:VYUUkRJkKuQPkIpgtZJj6+58Fa2g8ccAqdmaaK6HP5k=
 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=
@@ -2088,8 +2098,6 @@ github.com/zeebo/blake3 v0.2.4 h1:KYQPkhpRtcqh0ssGYcKLG1JYvddkEA8QwCM/yBqhaZI=
 github.com/zeebo/blake3 v0.2.4/go.mod h1:7eeQ6d2iXWRGF6npfaxl2CU+xy2Fjo2gxeyZGCRUjcE=
 github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
 github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
-github.com/zeebo/mwc v0.0.7 h1:0NerGhCww6ZQx+/xCx5iwznftveokvto1KILpYfENZk=
-github.com/zeebo/mwc v0.0.7/go.mod h1:0B32or6moOig1YGuqMoimBpU9QK9uYaGG2bBOuddqtE=
 github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
 github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
@@ -2101,8 +2109,8 @@ go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
 go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
 go.etcd.io/etcd/api/v3 v3.6.10 h1:jlwjtELjA8yi2VWpOFH+0w0lGr3K6mVDyn0RDB9aaAY=
 go.etcd.io/etcd/api/v3 v3.6.10/go.mod h1:pdV4VeFmvhdNjB4LWRkC8ReLyRBAxUOze3GarMhE2sk=
-go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo=
-go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY=
+go.etcd.io/etcd/client/pkg/v3 v3.6.10 h1:tBT7podcPhuVbCVkAEzx8bC5I+aqxfLwBN8/As1arrA=
+go.etcd.io/etcd/client/pkg/v3 v3.6.10/go.mod h1:WEy3PpwbbEBVRdh1NVJYsuUe/8eyI21PNJRazeD8z/Y=
 go.etcd.io/etcd/client/v3 v3.6.10 h1:J598zJ+C/ZPvImypmq5waj84+bovePrlZERHklf34y0=
 go.etcd.io/etcd/client/v3 v3.6.10/go.mod h1:iHhUDUcEwaKs1YFq3MgmI9U4zhTVasp/vgdVbFf1RS8=
 go.mongodb.org/mongo-driver v1.17.9 h1:IexDdCuuNJ3BHrELgBlyaH9p60JXAvdzWR128q+U5tU=
@@ -2118,24 +2126,24 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/detectors/gcp v1.42.0 h1:kpt2PEJuOuqYkPcktfJqWWDjTEd/FNgrxcniL7kQrXQ=
-go.opentelemetry.io/contrib/detectors/gcp v1.42.0/go.mod h1:W9zQ439utxymRrXsUOzZbFX4JhLxXU4+ZnCt8GG7yA8=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 h1:yI1/OhfEPy7J9eoa6Sj051C7n5dvpj0QX8g4sRchg04=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0/go.mod h1:NoUCKYWK+3ecatC4HjkRktREheMeEtrXoQxrqYFeHSc=
+go.opentelemetry.io/contrib/detectors/gcp v1.39.0 h1:kWRNZMsfBHZ+uHjiH4y7Etn2FK26LAGkNFw7RHv1DhE=
+go.opentelemetry.io/contrib/detectors/gcp v1.39.0/go.mod h1:t/OGqzHBa5v6RHZwrDBJ2OirWc+4q/w2fTbLZwAKjTk=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
 go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.60.0 h1:0tY123n7CdWMem7MOVdKOt0YfshufLCwfE5Bob+hQuM=
 go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.60.0/go.mod h1:CosX/aS4eHnG9D7nESYpV753l4j9q5j3SL/PUYd2lR8=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 h1:OyrsyzuttWTSur2qN/Lm0m2a8yqyIjUVBZcxFPuXq2o=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0/go.mod h1:C2NGBr+kAB4bk3xtMXfZ94gqFDtg/GkI7e9zqGh5Beg=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
 go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
 go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.42.0 h1:MdKucPl/HbzckWWEisiNqMPhRrAOQX8r4jTuGr636gk=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.42.0/go.mod h1:RolT8tWtfHcjajEH5wFIZ4Dgh5jpPdFXYV9pTAk/qjc=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 h1:vl9obrcoWVKp/lwl8tRE33853I8Xru9HFbw/skNeLs8=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0/go.mod h1:GAXRxmLJcVM3u22IjTg74zWBrRCKq8BnOqUVLodpcpw=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.35.0 h1:0NIXxOCFx+SKbhCVxwl3ETG8ClLPAa0KuKV6p3yhxP8=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.35.0/go.mod h1:ChZSJbbfbl/DcRZNc9Gqh6DYGlfjw4PvO1pEOZH1ZsE=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 h1:THuZiwpQZuHPul65w4WcwEnkX2QIuMT+UFoOrygtoJw=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0/go.mod h1:J2pvYM5NGHofZ2/Ru6zw/TNWnEQp5crgyDeSrYpXkAw=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 h1:zWWrB1U6nqhS/k6zYB74CjRpuiitRtLLi68VcgmOEto=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0/go.mod h1:2qXPNBX1OVRC0IwOnfo1ljoid+RD0QK3443EaqVlsOU=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 h1:GqRJVj7UmLjCVyVJ3ZFLdPRmhDUp2zFmQe3RHIOsw24=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 h1:lwI4Dc5leUqENgGuQImwLo4WnuXFPetmPpkLi2IrX54=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0/go.mod h1:Kz/oCE7z5wuyhPxsXDuaPteSWqjSBD5YaSdbxZYGbGk=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 h1:aTL7F04bJHUlztTsNGJ2l+6he8c+y/b//eR0jjjemT4=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0/go.mod h1:kldtb7jDTeol0l3ewcmd8SDvx3EmIE7lyvqbasU3QC4=
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.43.0 h1:TC+BewnDpeiAmcscXbGMfxkO+mwYUwE/VySwvw88PfA=
@@ -2153,8 +2161,8 @@ go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLh
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
-go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
-go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
+go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A=
+go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -2178,12 +2186,12 @@ go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
 go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-gocloud.dev v0.46.0 h1:niIuZwSjMtBx8K+ITB2s5kZullB13PGOS2ZoQPZxQ4Q=
-gocloud.dev v0.46.0/go.mod h1:ACQe+2qO+hEO+pdcvvsM+RB63r8TyGD1W3ESCLFyzvM=
+gocloud.dev v0.45.0 h1:WknIK8IbRdmynDvara3Q7G6wQhmEiOGwpgJufbM39sY=
+gocloud.dev v0.45.0/go.mod h1:0kXKmkCLG6d31N7NyLZWzt7jDSQura9zD/mWgiB6THI=
 gocloud.dev/pubsub/natspubsub v0.45.0 h1:kfCupVejeynIQcS1GaIvkY3Nj/acLlM5yPWyxZN8wJ8=
 gocloud.dev/pubsub/natspubsub v0.45.0/go.mod h1:WU5SMDWuF7CCr2U8UpbrEONYYFOmvigCAvTpOOpUvYE=
-gocloud.dev/pubsub/rabbitpubsub v0.46.0 h1:uWJ8z/F8xYxoTlBafTweoKvX2V85cwtN+/+nyRRtjZ0=
-gocloud.dev/pubsub/rabbitpubsub v0.46.0/go.mod h1:Ef5XHxv17zV9B3U9xoYAqJ8Rutslxt5Emb5e1cScuXc=
+gocloud.dev/pubsub/rabbitpubsub v0.45.0 h1:hlejKjBFYQBUAj7ZsHKgW0JOER/3XUqrMFFxBOFUIOU=
+gocloud.dev/pubsub/rabbitpubsub v0.45.0/go.mod h1:Kqq6gppGY/RTrRQkKSHZq+/qbCufPEoQ0E1V3X389zM=
 golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c=
 golang.org/x/arch v0.20.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -2206,8 +2214,8 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 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.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
-golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
+golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
+golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
 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=
@@ -2223,8 +2231,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
-golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
-golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
+golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa h1:Zt3DZoOFFYkKhDT3v7Lm9FDMEV06GpzjG2jrqW+QTE0=
+golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 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=
@@ -2238,8 +2246,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.39.0 h1:skVYidAEVKgn8lZ602XO75asgXBgLj9G/FE3RbuPFww=
-golang.org/x/image v0.39.0/go.mod h1:sIbmppfU+xFLPIG0FoVUTvyBMmgng1/XAMhQ2ft0hpA=
+golang.org/x/image v0.38.0 h1:5l+q+Y9JDC7mBOMjo4/aPhMDcxEptsX+Tt3GgRQRPuE=
+golang.org/x/image v0.38.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY=
 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=
@@ -2273,8 +2281,8 @@ golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.13.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.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
-golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
+golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
+golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
 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=
@@ -2342,8 +2350,8 @@ golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 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.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w=
-golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ=
+golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
+golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
 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=
@@ -2395,8 +2403,8 @@ golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
-golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
+golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -2501,11 +2509,11 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.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.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
-golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
+golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
-golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa h1:efT73AJZfAAUV7SOip6pWGkwJDzIGiKBZGVzHYa+ve4=
-golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa/go.mod h1:kHjTxDEnAu6/Nl9lDkzjWpR+bmKfxeiRuSDlsMb70gE=
+golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c h1:6a8FdnNk6bTXBjR4AGKFgUKuo+7GnR3FX5L7CbveeZc=
+golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c/go.mod h1:TpUTTEp9frx7rTdLpC9gFG9kdI7zVLFTFFlqaH2Cncw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -2521,8 +2529,8 @@ golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 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.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
-golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
+golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
+golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
 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=
@@ -2543,8 +2551,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 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.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
-golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
+golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
+golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
 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=
@@ -2622,8 +2630,8 @@ golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 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.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
-golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
+golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
+golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
 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=
@@ -2701,8 +2709,8 @@ google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/
 google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
 google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
 google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
-google.golang.org/api v0.278.0 h1:W7jiRvRi53VYFfZ/HoZjQBtJk7gOFbHD8ot1RzVZU6E=
-google.golang.org/api v0.278.0/go.mod h1:B9TqLBwJqVjp1mtt7WeoQwWRwvu/400y5lETOql+giQ=
+google.golang.org/api v0.274.0 h1:aYhycS5QQCwxHLwfEHRRLf9yNsfvp1JadKKWBE54RFA=
+google.golang.org/api v0.274.0/go.mod h1:JbAt7mF+XVmWu6xNP8/+CTiGH30ofmCmk9nM8d8fHew=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -2840,8 +2848,8 @@ google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 h1:XzmzkmB14QhVhgn
 google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:L43LFes82YgSonw6iTXTxXUX1OlULt4AQtkik4ULL/I=
 google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
 google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4 h1:tEkOQcXgF6dH1G+MVKZrfpYvozGrzb91k6ha7jireSM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -2882,8 +2890,8 @@ google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsA
 google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
 google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
 google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
-google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ=
-google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
+google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
+google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/grpc/examples v0.0.0-20250407062114-b368379ef8f6 h1:ExN12ndbJ608cboPYflpTny6mXSzPrDLh0iTaVrRrds=
 google.golang.org/grpc/examples v0.0.0-20250407062114-b368379ef8f6/go.mod h1:6ytKWczdvnpnO+m+JiG9NjEDzR1FJfsnmJdG7B8QVZ8=
@@ -3044,8 +3052,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aN
 sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
 sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
 sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
-storj.io/common v0.0.0-20260225132117-99155641c30a h1:7gSBQY3vhQMIqi3vfaEXR7mreRjcBLfVsYY0rHIN7P0=
-storj.io/common v0.0.0-20260225132117-99155641c30a/go.mod h1:kyxwKwlfH4paBZCZt/szvRB770ieAIJF73iDy2DpEHw=
+storj.io/common v0.0.0-20251107171817-6221ae45072c h1:UDXSrdeLJe3QFouavSW10fYdpclK0YNu3KvQHzqq2+k=
+storj.io/common v0.0.0-20251107171817-6221ae45072c/go.mod h1:XNX7uykja6aco92y2y8RuqaXIDRPpt1YA2OQDKlKEUk=
 storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55 h1:8OE12DvUnB9lfZcHe7IDGsuhjrY9GBAr964PVHmhsro=
 storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55/go.mod h1:Y9LZaa8esL1PW2IDMqJE7CFSNq7d5bQ3RI7mGPtmKMg=
 storj.io/eventkit v0.0.0-20250410172343-61f26d3de156 h1:5MZ0CyMbG6Pi0rRzUWVG6dvpXjbBYEX2oyXuj+tT+sk=
@@ -3054,7 +3062,7 @@ storj.io/infectious v0.0.2 h1:rGIdDC/6gNYAStsxsZU79D/MqFjNyJc1tsyyj9sTl7Q=
 storj.io/infectious v0.0.2/go.mod h1:QEjKKww28Sjl1x8iDsjBpOM4r1Yp8RsowNcItsZJ1Vs=
 storj.io/picobuf v0.0.4 h1:qswHDla+YZ2TovGtMnU4astjvrADSIz84FXRn0qgP6o=
 storj.io/picobuf v0.0.4/go.mod h1:hSMxmZc58MS/2qSLy1I0idovlO7+6K47wIGUyRZa6mg=
-storj.io/uplink v1.14.0 h1:J1yXlt0aRr6kgLTHWXOWosNCFVfbamlcyd+CSxyIczo=
-storj.io/uplink v1.14.0/go.mod h1:2ysmjzd/1Xtz4VKoErNcSqBQz3UC9WKTVuLMV1cNu6E=
+storj.io/uplink v1.13.1 h1:C8RdW/upALoCyuF16Lod9XGCXEdbJAS+ABQy9JO/0pA=
+storj.io/uplink v1.13.1/go.mod h1:x0MQr4UfFsQBwgVWZAtEsLpuwAn6dg7G0Mpne1r516E=
 tags.cncf.io/container-device-interface v1.0.1 h1:KqQDr4vIlxwfYh0Ed/uJGVgX+CHAkahrgabg6Q8GYxc=
 tags.cncf.io/container-device-interface v1.0.1/go.mod h1:JojJIOeW3hNbcnOH2q0NrWNha/JuHoDZcmYxAZwb2i0=

k8s/charts/seaweedfs/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 description: SeaweedFS
 name: seaweedfs
-appVersion: "4.34"
+appVersion: "4.23"
 # Dev note: Trigger a helm chart release by `git tag -a helm-<version>`
-version: 4.34.0
+version: 4.23.0

k8s/charts/seaweedfs/README.md

@@ -384,4 +384,4 @@ helm install seaweedfs seaweedfs/seaweedfs \
 ## Enterprise
 
 For enterprise users, please visit [seaweedfs.com](https://seaweedfs.com) for the SeaweedFS Enterprise Edition, 
-which has advanced features, including data recovery, self-healing storage, customizable erasure coding, EC vacuum and repair, etc.
+which has a self-healing storage format with better data protection.

k8s/charts/seaweedfs/dashboards/seaweedfs-grafana-dashboard.json

@@ -3666,291 +3666,6 @@
       ],
       "title": "S3 Bucket Object Count",
       "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 130
-      },
-      "id": 92,
-      "panels": [],
-      "title": "Filer Object Size Distribution",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "description": "Rate of new objects created, split by size range.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "objects/s",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 25,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 4,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          },
-          "unit": "short",
-          "unitScale": true
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 131
-      },
-      "id": 93,
-      "links": [],
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.1.2",
-      "targets": [
-        {
-          "exemplar": true,
-          "expr": "sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1024\",namespace=\"$NAMESPACE\"}[$__rate_interval]))",
-          "format": "time_series",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "< 1KB",
-          "refId": "A",
-          "step": 60
-        },
-        {
-          "exemplar": true,
-          "expr": "clamp_min(sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"102400\",namespace=\"$NAMESPACE\"}[$__rate_interval])) - sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1024\",namespace=\"$NAMESPACE\"}[$__rate_interval])), 0)",
-          "format": "time_series",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "1KB - 100KB",
-          "refId": "B",
-          "step": 60
-        },
-        {
-          "exemplar": true,
-          "expr": "clamp_min(sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+06\",namespace=\"$NAMESPACE\"}[$__rate_interval])) - sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"102400\",namespace=\"$NAMESPACE\"}[$__rate_interval])), 0)",
-          "format": "time_series",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "100KB - 1MB",
-          "refId": "C",
-          "step": 60
-        },
-        {
-          "exemplar": true,
-          "expr": "clamp_min(sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+08\",namespace=\"$NAMESPACE\"}[$__rate_interval])) - sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+06\",namespace=\"$NAMESPACE\"}[$__rate_interval])), 0)",
-          "format": "time_series",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "1MB - 100MB",
-          "refId": "D",
-          "step": 60
-        },
-        {
-          "exemplar": true,
-          "expr": "clamp_min(sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.073741824e+09\",namespace=\"$NAMESPACE\"}[$__rate_interval])) - sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+08\",namespace=\"$NAMESPACE\"}[$__rate_interval])), 0)",
-          "format": "time_series",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "100MB - 1GB",
-          "refId": "E",
-          "step": 60
-        },
-        {
-          "exemplar": true,
-          "expr": "clamp_min(sum(rate(SeaweedFS_filer_object_size_bytes_count{namespace=\"$NAMESPACE\"}[$__rate_interval])) - sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.073741824e+09\",namespace=\"$NAMESPACE\"}[$__rate_interval])), 0)",
-          "format": "time_series",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "> 1GB",
-          "refId": "F",
-          "step": 60
-        }
-      ],
-      "title": "Filer Object Write Rate by Size Range",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "description": "Objects created per size range over the selected time window.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 131
-      },
-      "id": 94,
-      "options": {
-        "displayMode": "gradient",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showUnfilled": true,
-        "valueMode": "color"
-      },
-      "pluginVersion": "8.1.2",
-      "targets": [
-        {
-          "exemplar": true,
-          "expr": "sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1024\",namespace=\"$NAMESPACE\"}[$__range]))",
-          "format": "time_series",
-          "instant": true,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "< 1KB",
-          "refId": "A"
-        },
-        {
-          "exemplar": true,
-          "expr": "clamp_min(sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"102400\",namespace=\"$NAMESPACE\"}[$__range])) - sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1024\",namespace=\"$NAMESPACE\"}[$__range])), 0)",
-          "format": "time_series",
-          "instant": true,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "1KB - 100KB",
-          "refId": "B"
-        },
-        {
-          "exemplar": true,
-          "expr": "clamp_min(sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+06\",namespace=\"$NAMESPACE\"}[$__range])) - sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"102400\",namespace=\"$NAMESPACE\"}[$__range])), 0)",
-          "format": "time_series",
-          "instant": true,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "100KB - 1MB",
-          "refId": "C"
-        },
-        {
-          "exemplar": true,
-          "expr": "clamp_min(sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+08\",namespace=\"$NAMESPACE\"}[$__range])) - sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+06\",namespace=\"$NAMESPACE\"}[$__range])), 0)",
-          "format": "time_series",
-          "instant": true,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "1MB - 100MB",
-          "refId": "D"
-        },
-        {
-          "exemplar": true,
-          "expr": "clamp_min(sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.073741824e+09\",namespace=\"$NAMESPACE\"}[$__range])) - sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+08\",namespace=\"$NAMESPACE\"}[$__range])), 0)",
-          "format": "time_series",
-          "instant": true,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "100MB - 1GB",
-          "refId": "E"
-        },
-        {
-          "exemplar": true,
-          "expr": "clamp_min(sum(increase(SeaweedFS_filer_object_size_bytes_count{namespace=\"$NAMESPACE\"}[$__range])) - sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.073741824e+09\",namespace=\"$NAMESPACE\"}[$__range])), 0)",
-          "format": "time_series",
-          "instant": true,
-          "interval": "",
-          "intervalFactor": 2,
-          "legendFormat": "> 1GB",
-          "refId": "F"
-        }
-      ],
-      "title": "Filer Object Size Distribution",
-      "type": "bargauge"
     }
   ],
   "refresh": "",

k8s/charts/seaweedfs/templates/admin/admin-statefulset.yaml

@@ -135,14 +135,6 @@ spec:
                 {{ toYaml $value | nindent 16 | trim }}
             {{- end -}}
             {{- end }}
-            {{- $secretExtraEnvironmentVars := .Values.admin.secretExtraEnvironmentVars }}
-            {{- if $secretExtraEnvironmentVars }}
-            {{- range $key := keys $secretExtraEnvironmentVars | sortAlpha }}
-            {{- $value := index $secretExtraEnvironmentVars $key }}
-            - name: {{ $key }}
-              valueFrom: {{ toYaml $value | nindent 16 }}
-            {{- end }}
-            {{- end }}
           command:
             - "/bin/sh"
             - "-ec"
@@ -188,13 +180,11 @@ spec:
             - name: admin-logs
               mountPath: /logs
             {{- end }}
-            {{- if include "seaweedfs.securityConfigEnabled" . }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
-            {{- end }}
-            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -285,12 +275,10 @@ spec:
           persistentVolumeClaim:
             claimName: {{ .Values.admin.logs.claimName }}
         {{- end }}
-        {{- if include "seaweedfs.securityConfigEnabled" . }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: security-config
           configMap:
             name: {{ include "seaweedfs.fullname" . }}-security-config
-        {{- end }}
-        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
             secretName: {{ include "seaweedfs.fullname" . }}-ca-cert

k8s/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml

@@ -81,9 +81,8 @@ spec:
           imagePullPolicy: {{ default "IfNotPresent" .Values.global.seaweedfs.imagePullPolicy }}
           env:
             {{- /* Determine default cluster alias and the corresponding env var keys to avoid conflicts */}}
-            {{- $mergedExtraEnvironmentVars := dict }}
-            {{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global.seaweedfs "component" .Values.allInOne "target" $mergedExtraEnvironmentVars) }}
-            {{- $clusterDefault := default "sw" (index $mergedExtraEnvironmentVars "WEED_CLUSTER_DEFAULT") }}
+            {{- $envMerged := merge (.Values.global.seaweedfs.extraEnvironmentVars | default dict) (.Values.allInOne.extraEnvironmentVars | default dict) }}
+            {{- $clusterDefault := default "sw" (index $envMerged "WEED_CLUSTER_DEFAULT") }}
             {{- $clusterUpper := upper $clusterDefault }}
             {{- $clusterMasterKey := printf "WEED_CLUSTER_%s_MASTER" $clusterUpper }}
             {{- $clusterFilerKey := printf "WEED_CLUSTER_%s_FILER" $clusterUpper }}
@@ -101,8 +100,8 @@ spec:
                   fieldPath: metadata.namespace
             - name: SEAWEEDFS_FULLNAME
               value: "{{ include "seaweedfs.fullname" . }}"
-            {{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
-            {{- $value := index $mergedExtraEnvironmentVars $key }}
+            {{- if .Values.allInOne.extraEnvironmentVars }}
+            {{- range $key, $value := .Values.allInOne.extraEnvironmentVars }}
             {{- if and (ne $key $clusterMasterKey) (ne $key $clusterFilerKey) }}
             - name: {{ $key }}
               {{- if kindIs "string" $value }}
@@ -113,6 +112,20 @@ spec:
               {{- end }}
             {{- end }}
             {{- end }}
+            {{- end }}
+            {{- if .Values.global.seaweedfs.extraEnvironmentVars }}
+            {{- range $key, $value := .Values.global.seaweedfs.extraEnvironmentVars }}
+            {{- if and (ne $key $clusterMasterKey) (ne $key $clusterFilerKey) }}
+            - name: {{ $key }}
+              {{- if kindIs "string" $value }}
+              value: {{ tpl $value $ | quote }}
+              {{- else }}
+              valueFrom:
+                {{ toYaml $value | nindent 16 }}
+              {{- end }}
+            {{- end }}
+            {{- end }}
+            {{- end }}
             # Inject computed cluster endpoints for the default cluster
             - name: {{ $clusterMasterKey }}
               value: {{ include "seaweedfs.cluster.masterAddress" . | quote }}
@@ -259,9 +272,6 @@ spec:
               {{- $authMethods := .Values.allInOne.sftp.authMethods | default .Values.sftp.authMethods }}
               {{- if $authMethods }}
               -sftp.authMethods={{ $authMethods }} \
-              {{- if contains "certificate" $authMethods }}
-              -sftp.trustedUserCAKeysFile=/etc/sw/sftp_ca/ca_user.pub \
-              {{- end }}
               {{- end }}
               {{- $maxAuthTries := .Values.allInOne.sftp.maxAuthTries | default .Values.sftp.maxAuthTries }}
               {{- if $maxAuthTries }}
@@ -309,12 +319,6 @@ spec:
               name: config-users
               readOnly: true
             {{- end }}
-            {{- $aioAuthMethods := .Values.allInOne.sftp.authMethods | default .Values.sftp.authMethods }}
-            {{- if and $aioAuthMethods (contains "certificate" $aioAuthMethods) }}
-            - mountPath: /etc/sw/sftp_ca
-              name: config-sftp-ca
-              readOnly: true
-            {{- end }}
             {{- end }}
             {{- if .Values.filer.notificationConfig }}
             - name: notification-config
@@ -326,13 +330,11 @@ spec:
               mountPath: /etc/seaweedfs/master.toml
               subPath: master.toml
               readOnly: true
-            {{- if include "seaweedfs.securityConfigEnabled" . }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: security-config
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
               readOnly: true
-            {{- end }}
-            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               mountPath: /usr/local/share/ca-certificates/ca/
               readOnly: true
@@ -450,18 +452,6 @@ spec:
             defaultMode: 420
             secretName: {{ default (printf "%s-sftp-secret" (include "seaweedfs.fullname" .)) (or .Values.allInOne.sftp.existingConfigSecret .Values.sftp.existingConfigSecret) }}
         {{- end }}
-        {{- $aioAuthMethodsVol := .Values.allInOne.sftp.authMethods | default .Values.sftp.authMethods }}
-        {{- if and $aioAuthMethodsVol (contains "certificate" $aioAuthMethodsVol) }}
-        {{- $aioCASecret := or .Values.allInOne.sftp.existingCAKeysSecret .Values.sftp.existingCAKeysSecret }}
-        {{- $aioCAKeys := or .Values.allInOne.sftp.trustedUserCAKeys .Values.sftp.trustedUserCAKeys }}
-        {{- if and (not $aioCASecret) (not $aioCAKeys) }}
-        {{- fail "allInOne.sftp.authMethods includes \"certificate\" but neither trustedUserCAKeys nor existingCAKeysSecret is set" }}
-        {{- end }}
-        - name: config-sftp-ca
-          secret:
-            defaultMode: 420
-            secretName: {{ default (printf "%s-sftp-ca-secret" (include "seaweedfs.fullname" .)) $aioCASecret }}
-        {{- end }}
         {{- end }}
         {{- if .Values.filer.notificationConfig }}
         - name: notification-config
@@ -471,12 +461,10 @@ spec:
         - name: master-config
           configMap:
             name: {{ include "seaweedfs.fullname" . }}-master-config
-        {{- if include "seaweedfs.securityConfigEnabled" . }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: security-config
           configMap:
             name: {{ include "seaweedfs.fullname" . }}-security-config
-        {{- end }}
-        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
             secretName: {{ include "seaweedfs.fullname" . }}-ca-cert

k8s/charts/seaweedfs/templates/cosi/cosi-deployment.yaml

@@ -117,13 +117,11 @@ spec:
               name: config-users
               readOnly: true
             {{- end }}
-            {{- if include "seaweedfs.securityConfigEnabled" . }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
-            {{- end }}
-            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -181,12 +179,10 @@ spec:
             secretName: {{ include "seaweedfs.fullname" . }}-s3-secret
             {{- end }}
         {{- end }}
-        {{- if include "seaweedfs.securityConfigEnabled" . }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: security-config
           configMap:
             name: {{ include "seaweedfs.fullname" . }}-security-config
-        {{- end }}
-        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
             secretName: {{ include "seaweedfs.fullname" . }}-ca-cert

k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml

@@ -234,13 +234,11 @@ spec:
               mountPath: /etc/seaweedfs/notification.toml
               subPath: notification.toml
             {{- end }}
-            {{- if include "seaweedfs.securityConfigEnabled" . }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
-            {{- end }}
-            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -276,8 +274,7 @@ spec:
               name: swfs-s3-tls
             {{- end }}
             {{- end }}
-          {{- $jwt := (.Values.global.seaweedfs.securityConfig).jwtSigning | default dict }}
-          {{- $isJwtEnabled := or $jwt.filerWrite $jwt.filerRead }}
+          {{- $isJwtEnabled := or .Values.global.seaweedfs.securityConfig.jwtSigning.filerWrite .Values.global.seaweedfs.securityConfig.jwtSigning.filerRead }}
           {{- if .Values.filer.readinessProbe.enabled }}
           readinessProbe:
           {{- if or $isJwtEnabled .Values.filer.readinessProbe.tcpSocket }}
@@ -371,12 +368,10 @@ spec:
           configMap:
             name: {{ include "seaweedfs.fullname" . }}-notification-config
         {{- end }}
-        {{- if include "seaweedfs.securityConfigEnabled" . }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: security-config
           configMap:
             name: {{ include "seaweedfs.fullname" . }}-security-config
-        {{- end }}
-        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
             secretName: {{ include "seaweedfs.fullname" . }}-ca-cert

k8s/charts/seaweedfs/templates/master/master-statefulset.yaml

@@ -188,13 +188,11 @@ spec:
               readOnly: true
               mountPath: /etc/seaweedfs/master.toml
               subPath: master.toml
-            {{- if include "seaweedfs.securityConfigEnabled" . }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
-            {{- end }}
-            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -289,12 +287,10 @@ spec:
         - name: master-config
           configMap:
             name: {{ include "seaweedfs.fullname" . }}-master-config
-        {{- if include "seaweedfs.securityConfigEnabled" . }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: security-config
           configMap:
             name: {{ include "seaweedfs.fullname" . }}-security-config
-        {{- end }}
-        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
             secretName: {{ include "seaweedfs.fullname" . }}-ca-cert

k8s/charts/seaweedfs/templates/s3/s3-deployment.yaml

@@ -156,13 +156,11 @@ spec:
               name: config-users
               readOnly: true
             {{- end }}
-            {{- if include "seaweedfs.securityConfigEnabled" . }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
-            {{- end }}
-            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -251,12 +249,10 @@ spec:
         - name: logs
           emptyDir: {}
         {{- end }}
-        {{- if include "seaweedfs.securityConfigEnabled" . }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: security-config
           configMap:
             name: {{ include "seaweedfs.fullname" . }}-security-config
-        {{- end }}
-        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
             secretName: {{ include "seaweedfs.fullname" . }}-ca-cert

k8s/charts/seaweedfs/templates/sftp/sftp-ca-secret.yaml

@@ -1,40 +0,0 @@
-{{- include "seaweedfs.compat" . -}}
-{{- /*
-Render a chart-managed Secret carrying the SSH user CA public key(s) for
-certificate-based SFTP authentication, but only when:
-  - SFTP (standalone or all-in-one) is enabled,
-  - "certificate" is in the relevant authMethods list,
-  - the user provided inline CA keys via sftp.trustedUserCAKeys, and
-  - no existingCAKeysSecret is set (which would supersede this Secret).
-*/}}
-{{- $sftpEnabled := or .Values.sftp.enabled (and .Values.allInOne.enabled .Values.allInOne.sftp.enabled) -}}
-{{- $authMethods := .Values.sftp.authMethods -}}
-{{- if and .Values.allInOne.enabled .Values.allInOne.sftp.authMethods -}}
-{{- $authMethods = .Values.allInOne.sftp.authMethods -}}
-{{- end -}}
-{{- $certInMethods := and $authMethods (contains "certificate" $authMethods) -}}
-{{- $inlineCAKeys := .Values.sftp.trustedUserCAKeys -}}
-{{- if and .Values.allInOne.enabled .Values.allInOne.sftp.trustedUserCAKeys -}}
-{{- $inlineCAKeys = .Values.allInOne.sftp.trustedUserCAKeys -}}
-{{- end -}}
-{{- $existingSecret := .Values.sftp.existingCAKeysSecret -}}
-{{- if and .Values.allInOne.enabled .Values.allInOne.sftp.existingCAKeysSecret -}}
-{{- $existingSecret = .Values.allInOne.sftp.existingCAKeysSecret -}}
-{{- end -}}
-{{- if and $sftpEnabled $certInMethods $inlineCAKeys (not $existingSecret) }}
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: {{ include "seaweedfs.fullname" . }}-sftp-ca-secret
-  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: sftp
-stringData:
-  ca_user.pub: |
-{{ $inlineCAKeys | indent 4 }}
-{{- end }}

k8s/charts/seaweedfs/templates/sftp/sftp-deployment.yaml

@@ -135,9 +135,6 @@ spec:
               {{- end }}
               {{- if .Values.sftp.authMethods }}
               -authMethods={{ .Values.sftp.authMethods }} \
-              {{- if contains "certificate" .Values.sftp.authMethods }}
-              -trustedUserCAKeysFile=/etc/sw/sftp_ca/ca_user.pub \
-              {{- end }}
               {{- end }}
               {{- if .Values.sftp.maxAuthTries }}
               -maxAuthTries={{ .Values.sftp.maxAuthTries }} \
@@ -179,18 +176,11 @@ spec:
             - mountPath: /etc/sw/ssh
               name: config-ssh
               readOnly: true
-            {{- if and .Values.sftp.authMethods (contains "certificate" .Values.sftp.authMethods) }}
-            - mountPath: /etc/sw/sftp_ca
-              name: config-sftp-ca
-              readOnly: true
-            {{- end }}
-            {{- if include "seaweedfs.securityConfigEnabled" . }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
-            {{- end }}
-            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -264,19 +254,6 @@ spec:
             {{- else }}
             secretName: {{ include "seaweedfs.fullname" . }}-sftp-ssh-secret
             {{- end }}
-        {{- if and .Values.sftp.authMethods (contains "certificate" .Values.sftp.authMethods) }}
-        {{- if and (not .Values.sftp.existingCAKeysSecret) (not .Values.sftp.trustedUserCAKeys) }}
-        {{- fail "sftp.authMethods includes \"certificate\" but neither sftp.trustedUserCAKeys nor sftp.existingCAKeysSecret is set" }}
-        {{- end }}
-        - name: config-sftp-ca
-          secret:
-            defaultMode: 420
-            {{- if .Values.sftp.existingCAKeysSecret }}
-            secretName: {{ .Values.sftp.existingCAKeysSecret }}
-            {{- else }}
-            secretName: {{ include "seaweedfs.fullname" . }}-sftp-ca-secret
-            {{- end }}
-        {{- end }}
         {{- if eq .Values.sftp.logs.type "hostPath" }}
         - name: logs
           hostPath:
@@ -287,12 +264,10 @@ spec:
         - name: logs
           emptyDir: {}
         {{- end }}
-        {{- if include "seaweedfs.securityConfigEnabled" . }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: security-config
           configMap:
             name: {{ include "seaweedfs.fullname" . }}-security-config
-        {{- end }}
-        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
             secretName: {{ include "seaweedfs.fullname" . }}-ca-cert

k8s/charts/seaweedfs/templates/shared/_helpers.tpl

@@ -332,18 +332,6 @@ Create the name of the service account to use
 {{- .Values.global.seaweedfs.serviceAccountName | default "seaweedfs" -}}
 {{- end -}}
 
-{{/* True when security.toml should be rendered and mounted. volumeWrite is
-     excluded unless its non-default expiration is configured. */}}
-{{- define "seaweedfs.securityConfigEnabled" -}}
-{{- $sec := (.Values.global.seaweedfs).securityConfig | default dict -}}
-{{- $jwt := $sec.jwtSigning | default dict -}}
-{{- $expiresAfterSeconds := $jwt.expiresAfterSeconds | default dict -}}
-{{- $volumeWriteExpirationConfigured := and $jwt.volumeWrite (gt (int $expiresAfterSeconds.volumeWrite) 0) -}}
-{{- if or .Values.global.seaweedfs.enableSecurity $volumeWriteExpirationConfigured $jwt.volumeRead $jwt.filerWrite $jwt.filerRead -}}
-true
-{{- end -}}
-{{- end -}}
-
 {{/* S3 TLS cert/key arguments, using custom secret if s3.tlsSecret is set */}}
 {{- define "seaweedfs.s3.tlsArgs" -}}
 {{- $prefix := .prefix -}}

k8s/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml

@@ -143,8 +143,6 @@ spec:
           {{- if kindIs "bool" .versioning }}
             {{- if .versioning }}
               {{- $bucketVersioning = "Enabled" }}
-            {{- else }}
-              {{- $bucketVersioning = "Suspended" }}
             {{- end }}
           {{- else if kindIs "string" .versioning }}
             {{- $versioningLower := lower .versioning }}

k8s/charts/seaweedfs/templates/shared/security-configmap.yaml

@@ -1,5 +1,5 @@
 {{- include "seaweedfs.compat" . -}}
-{{- if include "seaweedfs.securityConfigEnabled" . }}
+{{- if .Values.global.seaweedfs.enableSecurity }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -19,59 +19,42 @@ data:
   {{- $existing = lookup "v1" "ConfigMap" .Release.Namespace $legacyName }}
   {{- end }}
   {{- $securityConfig := fromToml (dig "data" "security.toml" "" $existing) }}
-  {{- $securityConfigValues := .Values.global.seaweedfs.securityConfig | default dict }}
-  {{- $jwtSigning := $securityConfigValues.jwtSigning | default dict }}
-  {{- $expiresAfterSeconds := $jwtSigning.expiresAfterSeconds | default dict }}
   security.toml: |-
     # this file is read by master, volume server, and filer
 
-    {{- if $jwtSigning.volumeWrite }}
+    {{- if .Values.global.seaweedfs.securityConfig.jwtSigning.volumeWrite }}
     # the jwt signing key is read by master and volume server
-    # the jwt defaults to expire after 10 seconds
+    # a jwt expires in 10 seconds
     [jwt.signing]
     key = "{{ dig "jwt" "signing" "key" (randAlphaNum 10 | b64enc) $securityConfig }}"
-    {{- if gt (int $expiresAfterSeconds.volumeWrite) 0 }}
-    expires_after_seconds = {{ int $expiresAfterSeconds.volumeWrite }}
-    {{- end }}
     {{- end }}
 
-    {{- if $jwtSigning.volumeRead }}
+    {{- if .Values.global.seaweedfs.securityConfig.jwtSigning.volumeRead }}
     # this jwt signing key is read by master and volume server, and it is used for read operations:
     # - the Master server generates the JWT, which can be used to read a certain file on a volume server
     # - the Volume server validates the JWT on reading
-    # the jwt defaults to expire after 60 seconds
     [jwt.signing.read]
     key = "{{ dig "jwt" "signing" "read" "key" (randAlphaNum 10 | b64enc) $securityConfig }}"
-    {{- if gt (int $expiresAfterSeconds.volumeRead) 0 }}
-    expires_after_seconds = {{ int $expiresAfterSeconds.volumeRead }}
-    {{- end }}
     {{- end }}
 
-    {{- if $jwtSigning.filerWrite }}
+    {{- if .Values.global.seaweedfs.securityConfig.jwtSigning.filerWrite }}
     # If this JWT key is configured, Filer only accepts writes over HTTP if they are signed with this JWT:
     # - f.e. the S3 API Shim generates the JWT
     # - the Filer server validates the JWT on writing
-    # the jwt defaults to expire after 10 seconds
+    # the jwt defaults to expire after 10 seconds.
     [jwt.filer_signing]
     key = "{{ dig "jwt" "filer_signing" "key" (randAlphaNum 10 | b64enc) $securityConfig }}"
-    {{- if gt (int $expiresAfterSeconds.filerWrite) 0 }}
-    expires_after_seconds = {{ int $expiresAfterSeconds.filerWrite }}
-    {{- end }}
     {{- end }}
 
-    {{- if $jwtSigning.filerRead }}
+    {{- if .Values.global.seaweedfs.securityConfig.jwtSigning.filerRead }}
     # If this JWT key is configured, Filer only accepts reads over HTTP if they are signed with this JWT:
     # - f.e. the S3 API Shim generates the JWT
     # - the Filer server validates the JWT on reading
-    # the jwt defaults to expire after 60 seconds
+    # the jwt defaults to expire after 10 seconds.
     [jwt.filer_signing.read]
     key = "{{ dig "jwt" "filer_signing" "read" "key" (randAlphaNum 10 | b64enc) $securityConfig }}"
-    {{- if gt (int $expiresAfterSeconds.filerRead) 0 }}
-    expires_after_seconds = {{ int $expiresAfterSeconds.filerRead }}
-    {{- end }}
     {{- end }}
 
-    {{- if .Values.global.seaweedfs.enableSecurity }}
     # all grpc tls authentications are mutual
     # the values for the following ca, cert, and key are paths to the PERM files.
     [grpc]
@@ -111,5 +94,4 @@ data:
     [https.volume]
     cert = ""
     key  = ""
-    {{- end }}
 {{- end }}

k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml

@@ -137,9 +137,6 @@ spec:
             - "/bin/sh"
             - "-ec"
             - |
-              {{- if $volume.rust }}
-              exec /usr/bin/weed-volume \
-              {{- else }}
               exec /usr/bin/weed \
                 {{- if $volume.logs }}
                 -logdir=/logs \
@@ -152,7 +149,6 @@ spec:
                 -v={{ $.Values.global.seaweedfs.loggingLevel }} \
                 {{- end }}
                 volume \
-              {{- end }}
                 -port={{ $volume.port }} \
                 {{- if $volume.metricsPort }}
                 -metricsPort={{ $volume.metricsPort }} \
@@ -184,7 +180,7 @@ spec:
                 {{- if $volume.imagesFixOrientation }}
                 -images.fix.orientation \
                 {{- end }}
-                {{- if and $volume.pulseSeconds (not $volume.rust) }}
+                {{- if $volume.pulseSeconds }}
                 -pulseSeconds={{ $volume.pulseSeconds }} \
                 {{- end }}
                 {{- if $volume.index }}
@@ -215,13 +211,11 @@ spec:
             - name: idx
               mountPath: "/idx/"
             {{- end }}
-            {{- if include "seaweedfs.securityConfigEnabled" $ }}
+            {{- if $.Values.global.seaweedfs.enableSecurity }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
-            {{- end }}
-            {{- if $.Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -339,12 +333,10 @@ spec:
           emptyDir: {}
        {{- end }}
      {{- end }}
-     {{- if include "seaweedfs.securityConfigEnabled" $ }}
+     {{- if $.Values.global.seaweedfs.enableSecurity }}
         - name: security-config
           configMap:
             name: {{ include "seaweedfs.fullname" $ }}-security-config
-     {{- end }}
-     {{- if $.Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
             secretName: {{ include "seaweedfs.fullname" $ }}-ca-cert

k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml

@@ -149,13 +149,11 @@ spec:
             - name: worker-logs
               mountPath: /logs
             {{- end }}
-            {{- if include "seaweedfs.securityConfigEnabled" . }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
-            {{- end }}
-            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -254,12 +252,10 @@ spec:
           persistentVolumeClaim:
             claimName: {{ .Values.worker.logs.claimName }}
         {{- end }}
-        {{- if include "seaweedfs.securityConfigEnabled" . }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: security-config
           configMap:
             name: {{ include "seaweedfs.fullname" . }}-security-config
-        {{- end }}
-        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
             secretName: {{ include "seaweedfs.fullname" . }}-ca-cert

k8s/charts/seaweedfs/values.yaml

@@ -18,21 +18,12 @@ global:
     loggingLevel: 1
     enableSecurity: false
     masterServer: null
-    # filerWrite: true mounts security.toml on filer + admin without needing
-    # enableSecurity (mTLS); required for the Admin UI Users tab.
     securityConfig:
       jwtSigning:
         volumeWrite: true
         volumeRead: false
         filerWrite: false
         filerRead: false
-        # Positive values override SeaweedFS token lifetime defaults.
-        # Zero keeps the runtime defaults: 10s for writes and 60s for reads.
-        expiresAfterSeconds:
-          volumeWrite: 0
-          volumeRead: 0
-          filerWrite: 0
-          filerRead: 0
     # we will use this serviceAccountName for all ClusterRoles/ClusterRoleBindings
     serviceAccountName: "seaweedfs"
     serviceAccountAnnotations: {}
@@ -312,11 +303,6 @@ volume:
   enabled: true
   imageOverride: null
   restartPolicy: null
-  # Run the Rust volume server (/usr/bin/weed-volume) instead of the Go one.
-  # Requires an image that ships the Rust binary (amd64/arm64). The Go-only
-  # log flags (-logtostderr/-logdir/-v) and -pulseSeconds are dropped; set log
-  # level via the RUST_LOG env var in extraEnvironmentVars if needed.
-  rust: false
   port: 8080
   grpcPort: 18080
   metricsPort: 9327
@@ -926,7 +912,7 @@ filer:
     # Buckets may be exposed publicly by setting `anonymousRead` to `true`
     # ttl format: [1-255][m|h|d|w|M|y] (e.g., 7d)
     # objectLock enables S3 Object Lock (irreversible, forces versioning)
-    # versioning: Enabled or Suspended (or bool true/false)
+    # versioning: Enabled or Suspended (or true to enable)
     # createBuckets:
     #   - name: bucket-a
     #     anonymousRead: true
@@ -979,7 +965,7 @@ s3:
   # Buckets may be exposed publicly by setting `anonymousRead` to `true`
   # ttl format: [1-255][m|h|d|w|M|y] (e.g., 7d)
   # objectLock enables S3 Object Lock (irreversible, forces versioning)
-  # versioning: Enabled or Suspended (or bool true/false)
+  # versioning: Enabled or Suspended (or true to enable)
   # createBuckets:
   #   - name: bucket-a
   #     anonymousRead: true
@@ -1145,7 +1131,7 @@ sftp:
   # SSH server configuration
   sshPrivateKey: "/etc/sw/seaweedfs_sftp_ssh_private_key"  # Path to the SSH private key file for host authentication
   hostKeysFolder: "/etc/sw/ssh"  # path to folder containing SSH private key files for host authentication
-  authMethods: "password,publickey"  # Comma-separated list of allowed auth methods: password, publickey, certificate
+  authMethods: "password,publickey"  # Comma-separated list of allowed auth methods: password, publickey, keyboard-interactive
   maxAuthTries: 6  # Maximum number of authentication attempts per connection
   bannerMessage: "SeaweedFS SFTP Server"  # Message displayed before authentication
   loginGraceTime: "2m"  # Timeout for authentication
@@ -1162,18 +1148,6 @@ sftp:
   # Set to the name of an existing kubernetes Secret with the list of ssh private keys for sftp
   existingSshConfigSecret: null
 
-  # SSH user-certificate authentication (CA-signed user certs). Mirrors
-  # OpenSSH `TrustedUserCAKeys` and MinIO `--sftp=trusted-user-ca-key`.
-  # Add "certificate" to `authMethods` to activate; when active, plain
-  # public keys are rejected on the public-key channel.
-  #
-  # Inline CA public keys in OpenSSH authorized_keys format (one per
-  # line). Ignored when `existingCAKeysSecret` is set.
-  trustedUserCAKeys: ""
-  # Set to the name of an existing kubernetes Secret carrying the CA
-  # public keys under data key `ca_user.pub`.
-  existingCAKeysSecret: null
-
   # Additional resources
   sidecars: []
   initContainers: ""
@@ -1312,13 +1286,6 @@ admin:
 
   extraEnvironmentVars: {}
 
-  # secret env variables (e.g. for injecting OIDC client secret from a Kubernetes Secret)
-  secretExtraEnvironmentVars: {}
-    # WEED_ADMIN_OIDC_CLIENT_SECRET:
-    #   secretKeyRef:
-    #     name: seaweedfs-admin-oidc
-    #     key: client_secret
-
   # Health checks
   livenessProbe:
     enabled: true
@@ -1533,7 +1500,7 @@ allInOne:
     # Buckets may be exposed publicly by setting `anonymousRead` to `true`
     # ttl format: [1-255][m|h|d|w|M|y] (e.g., 7d)
     # objectLock enables S3 Object Lock (irreversible, forces versioning)
-    # versioning: Enabled or Suspended (or bool true/false)
+    # versioning: Enabled or Suspended (or true to enable)
     # createBuckets:
     #   - name: bucket-a
     #     anonymousRead: true
@@ -1564,10 +1531,6 @@ allInOne:
     existingConfigSecret: null
     # Set to the name of an existing kubernetes Secret with the SSH keys
     existingSshConfigSecret: null
-    # SSH user-certificate authentication. See sftp.trustedUserCAKeys above.
-    # (null on either field inherits from the top-level sftp.* setting.)
-    trustedUserCAKeys: null
-    existingCAKeysSecret: null
 
   # Service settings
   service:

other/java/client/src/main/proto/filer.proto

@@ -22,24 +22,12 @@ service SeaweedFiler {
     rpc UpdateEntry (UpdateEntryRequest) returns (UpdateEntryResponse) {
     }
 
-    rpc TouchAccessTime (TouchAccessTimeRequest) returns (TouchAccessTimeResponse) {
-    }
-
     rpc AppendToEntry (AppendToEntryRequest) returns (AppendToEntryResponse) {
     }
 
     rpc DeleteEntry (DeleteEntryRequest) returns (DeleteEntryResponse) {
     }
 
-    rpc ObjectTransaction (ObjectTransactionRequest) returns (ObjectTransactionResponse) {
-    }
-
-    rpc ObjectTransactionBatch (ObjectTransactionBatchRequest) returns (ObjectTransactionBatchResponse) {
-    }
-
-    rpc PosixLock (PosixLockRequest) returns (PosixLockResponse) {
-    }
-
     rpc AtomicRenameEntry (AtomicRenameEntryRequest) returns (AtomicRenameEntryResponse) {
     }
     rpc StreamRenameEntry (StreamRenameEntryRequest) returns (stream StreamRenameEntryResponse) {
@@ -78,11 +66,6 @@ service SeaweedFiler {
     rpc SubscribeLocalMetadata (SubscribeMetadataRequest) returns (stream SubscribeMetadataResponse) {
     }
 
-    // List the metadata subscribers currently connected to this filer
-    // (FUSE mounts, S3, filer.sync, peer filers, ...).
-    rpc ListMetadataSubscribers (ListMetadataSubscribersRequest) returns (ListMetadataSubscribersResponse) {
-    }
-
     rpc KvGet (KvGetRequest) returns (KvGetResponse) {
     }
 
@@ -225,8 +208,6 @@ message FuseAttributes {
     int32 mtime_ns = 19; // nanosecond component of mtime (0-999999999)
     int32 ctime_ns = 20; // nanosecond component of ctime (0-999999999)
     int32 crtime_ns = 21; // nanosecond component of crtime (0-999999999)
-    int64 atime = 22; // unix time in seconds, last access time
-    int32 atime_ns = 23; // nanosecond component of atime (0-999999999)
 }
 
 message CreateEntryRequest {
@@ -236,56 +217,6 @@ message CreateEntryRequest {
     bool is_from_other_cluster = 4;
     repeated int32 signatures = 5;
     bool skip_check_parent_directory = 6;
-    // Optional precondition evaluated against the current entry atomically with
-    // the write, under the filer's per-path lock. The caller must route the
-    // key's writes to this entry's owner filer for the check to be authoritative.
-    WriteCondition condition = 7;
-}
-
-// WriteCondition is the precondition the filer evaluates against the existing
-// entry before writing, under the per-path lock. A failed condition returns
-// FilerError PRECONDITION_FAILED. The client maps request semantics (e.g. RFC
-// 7232) to clauses; the filer just compares.
-//
-// A condition is a list of clauses that ALL must hold (logical AND). One clause
-// is the common case; several express what a single comparison cannot: an ETag
-// set (If-Match / If-None-Match with multiple values), weak-ETag comparison, and
-// compound conditions (e.g. If-Match + If-Unmodified-Since together).
-message WriteCondition {
-    enum Kind {
-        NONE                  = 0; // unconditional
-        IF_NOT_EXISTS         = 1; // fail if the entry exists (If-None-Match: *)
-        IF_EXISTS             = 2; // fail if the entry is absent (If-Match: *)
-        IF_ETAG_MATCH         = 3; // fail if absent or etag matches none of the set (If-Match)
-        IF_ETAG_NOT_MATCH     = 4; // fail if present and etag matches any of the set (If-None-Match)
-        IF_UNMODIFIED_SINCE   = 5; // fail if present and mtime > unix_time
-        IF_MODIFIED_SINCE     = 6; // fail if present and mtime <= unix_time
-        IF_EXTENDED_NOT_EQUAL = 7; // fail if present and extended[ext_key] == ext_value
-        IF_EXTENDED_TIME_ELAPSED = 8; // fail if present and extended[ext_key] (unix seconds) is in the future
-    }
-    // Clause is one primitive comparison. IF_ETAG_MATCH holds when the current
-    // entry's ETag equals any value in etags; IF_ETAG_NOT_MATCH holds when it
-    // equals none. allow_weak permits weak-comparison (ignoring the W/ prefix).
-    //
-    // The IF_EXTENDED_* kinds are generic guards on an extended attribute, used
-    // to enforce object-lock without teaching the filer S3 semantics:
-    // IF_EXTENDED_NOT_EQUAL expresses a legal hold (block while a key equals a
-    // value), and IF_EXTENDED_TIME_ELAPSED expresses retention (block while a
-    // stored unix-second deadline is in the future, compared to the filer's
-    // clock). The caller composes these and, for governance-bypass, simply omits
-    // the retention clause when the bypass is authorized — the filer makes no
-    // authorization decision.
-    message Clause {
-        Kind kind = 1;
-        repeated string etags = 2; // ETag set for IF_ETAG_* kinds
-        int64 unix_time = 3;       // bound (unix seconds) for IF_*_SINCE kinds
-        bool allow_weak = 4;       // compare ETags ignoring the weak (W/) marker
-        string ext_key = 5;        // extended attribute name for IF_EXTENDED_* kinds
-        string ext_value = 6;      // blocking value for IF_EXTENDED_NOT_EQUAL
-        string gate_key = 7;       // IF_EXTENDED_TIME_ELAPSED: only enforce when extended[gate_key] == gate_value
-        string gate_value = 8;     // gate value (e.g. retention mode COMPLIANCE for governance bypass)
-    }
-    repeated Clause clauses = 1;   // all must hold (logical AND)
 }
 
 // Structured error codes for filer entry operations.
@@ -297,138 +228,6 @@ enum FilerError {
     EXISTING_IS_DIRECTORY = 3; // cannot overwrite directory with file
     EXISTING_IS_FILE      = 4; // cannot overwrite file with directory
     ENTRY_ALREADY_EXISTS  = 5; // O_EXCL and entry already exists
-    PRECONDITION_FAILED   = 6; // WriteCondition not satisfied
-}
-
-// ObjectMutation is one entry-level change applied by ObjectTransaction. All
-// mutations of a transaction run under a single per-path lock (the request's
-// lock_key) and in order, so the gateway can describe a multi-entry object
-// operation as one request instead of holding a distributed lock across
-// several RPCs. Data-bearing writes (entries with chunks) should be written
-// before the transaction; mutations here are metadata-scoped.
-message ObjectMutation {
-    enum Type {
-        PUT              = 0; // create or replace the entry (entry field)
-        DELETE           = 1; // delete the entry at directory/name (no error if absent)
-        PATCH_EXTENDED   = 2; // merge set_extended / remove delete_extended on the entry
-        RECOMPUTE_LATEST = 3; // scan a directory and re-point a parent entry (recompute)
-    }
-    Type type = 1;
-    string directory = 2;
-    string name = 3;                       // entry name for DELETE / PATCH_EXTENDED / RECOMPUTE_LATEST (the pointer entry)
-    Entry entry = 4;                        // full entry for PUT
-    map<string, bytes> set_extended = 5;   // PATCH_EXTENDED: keys to set
-    repeated string delete_extended = 6;   // PATCH_EXTENDED: keys to remove
-    bool is_delete_data = 7;               // DELETE: also delete chunk data
-    bool is_recursive = 8;                 // DELETE: recurse into a directory
-    Recompute recompute = 9;               // RECOMPUTE_LATEST parameters
-    bool set_content = 10;                 // PATCH_EXTENDED: replace Entry.content with content
-    bytes content = 11;                    // PATCH_EXTENDED: new Entry.content when set_content
-    bool touch_mtime = 12;                 // PATCH_EXTENDED: set the entry's Mtime to now (e.g. a metadata-replace copy)
-}
-
-// Recompute re-derives a pointer entry (directory/name on the mutation) from the
-// current contents of a scanned directory, atomically under the transaction's
-// lock. It is mechanical: the filer picks the child that sorts first or last by
-// name and copies the requested fields into the pointer; it has no knowledge of
-// what the entries mean. The caller (which does know the versioning scheme)
-// supplies the sort direction and the key mappings. This covers re-pointing the
-// latest version after a specific version is deleted, where the scan must run
-// under the lock.
-message Recompute {
-    string scan_dir = 1;                   // directory whose direct children are scanned
-    bool descending = 2;                   // pick the child that sorts last by name (else first)
-    map<string, string> copy_extended = 3; // pointer extended key -> source extended key on the chosen child
-    string name_to_key = 4;                // if set, store the chosen child's name under this pointer key
-    string size_to_key = 5;                // if set, store the chosen child's FileSize (decimal) under this pointer key
-    string mtime_to_key = 6;               // if set, store the chosen child's Mtime (decimal) under this pointer key
-    string demote_key = 7;                 // if set, stamp demote_value on the prior name_to_key target when it changes
-    bytes demote_value = 8;                // value for demote_key
-    string exclude_name = 9;               // if set, skip this child when scanning (e.g. a version about to be deleted)
-}
-
-// ObjectTransactionRequest applies an ordered list of mutations atomically with
-// respect to other writers of the same object, by holding the filer's per-path
-// lock on lock_key for the whole transaction. The optional condition is checked
-// first, against condition_key when set, else lock_key. Callers set route_key to
-// the object's stable owner ring key; a filer that is not the owner forwards the
-// transaction one hop to the owner, so a stale ring view is tolerated.
-message ObjectTransactionRequest {
-    string lock_key = 1;               // object path to lock and to evaluate the condition against
-    WriteCondition condition = 2;      // optional precondition, checked under the lock
-    repeated ObjectMutation mutations = 3;
-    bool is_from_other_cluster = 4;
-    repeated int32 signatures = 5;
-    string condition_key = 6;          // if set, evaluate the condition against this entry instead of lock_key (still locking lock_key)
-    string route_key = 7;              // ring key identifying the owner filer; a non-owner forwards the whole transaction to it
-    bool is_moved = 8;                 // set on a forwarded transaction so the receiver applies it locally instead of forwarding again
-}
-
-message ObjectTransactionResponse {
-    string error = 1;
-    FilerError error_code = 2;
-}
-
-// PosixLockRange is one advisory byte-range lock. Owner identity is (sid, owner):
-// sid is the mount session, owner the FUSE lock owner within it, so owners from
-// different mounts never alias. end is inclusive (max uint64 = to EOF); is_flock
-// separates the flock and fcntl namespaces, which never conflict.
-message PosixLockRange {
-    uint64 start = 1;
-    uint64 end = 2;
-    uint32 type = 3;       // 1=read, 2=write, 3=unlock
-    uint64 sid = 4;
-    uint64 owner = 5;
-    uint32 pid = 6;        // holder pid, for get_lk reporting only
-    bool is_flock = 7;
-}
-
-// PosixLock routes an advisory lock operation to the inode's owner filer, which
-// holds the authoritative in-memory lock table. key is the inode identity ring
-// key (the file path, or hl:<HardLinkId> for a hardlink) used both to resolve the
-// owner and to index the table. A non-owner filer forwards the request one hop;
-// is_moved bounds it so a stale ring view cannot loop.
-message PosixLockRequest {
-    string key = 1;
-    bool is_moved = 2;
-    PosixLockOp op = 3;
-    PosixLockRange lock = 4;
-    // locks carries the full set a mount holds on key for a KEEP_ALIVE
-    // re-assertion, so the current owner filer can rebuild its in-memory state
-    // after an ownership change or restart. lock.sid identifies the session.
-    repeated PosixLockRange locks = 5;
-    // cooling_probe marks a dual-read a new owner sends to the previous owner
-    // during a ring change, so the previous owner answers from local state
-    // without itself cooling-off (no recursion).
-    bool cooling_probe = 6;
-}
-
-enum PosixLockOp {
-    TRY_LOCK = 0;             // grant lock or report conflict (non-blocking)
-    UNLOCK = 1;              // release lock's owner's locks over its range
-    GET_LK = 2;             // report a conflicting lock, if any
-    RELEASE_POSIX_OWNER = 3; // drop the owner's fcntl locks (flush-time)
-    RELEASE_FLOCK_OWNER = 4; // drop the owner's flock locks (release-time)
-    KEEP_ALIVE = 5;         // renew the session's lease on this owner (lock.sid)
-}
-
-message PosixLockResponse {
-    bool granted = 1;            // for TRY_LOCK: whether the lock was granted
-    bool has_conflict = 2;       // whether conflict is populated
-    PosixLockRange conflict = 3; // the blocking lock (TRY_LOCK conflict / GET_LK result)
-}
-
-// ObjectTransactionBatch applies several object transactions in one round trip,
-// each under its own per-path lock and independent of the others (no cross-key
-// atomicity). A caller groups keys that route to the same owner filer and sends
-// one batch per owner, e.g. for a multi-object delete. Each response is parallel
-// to its request.
-message ObjectTransactionBatchRequest {
-    repeated ObjectTransactionRequest transactions = 1;
-}
-
-message ObjectTransactionBatchResponse {
-    repeated ObjectTransactionResponse responses = 1;
 }
 
 message CreateEntryResponse {
@@ -448,16 +247,6 @@ message UpdateEntryResponse {
     SubscribeMetadataResponse metadata_event = 1;
 }
 
-message TouchAccessTimeRequest {
-    string directory = 1;
-    string name = 2;
-    int64 client_atime_ns = 3; // nanoseconds since epoch; filer may override with relatime
-}
-message TouchAccessTimeResponse {
-    int64 persisted_atime_ns = 1; // nanoseconds since epoch; 0 if no update was performed
-    bool updated = 2;
-}
-
 message AppendToEntryRequest {
     string directory = 1;
     string entry_name = 2;
@@ -617,7 +406,6 @@ message SubscribeMetadataRequest {
     repeated string directories = 10;  // exact directory to watch
     bool client_supports_batching = 11; // client can unpack SubscribeMetadataResponse.events
     bool client_supports_metadata_chunks = 12; // client can read log file chunks from volume servers
-    bool client_supports_idle_heartbeat = 13; // server may send empty responses carrying the current time while the client is caught up
 }
 message SubscribeMetadataResponse {
     string directory = 1;
@@ -626,22 +414,6 @@ message SubscribeMetadataResponse {
     repeated SubscribeMetadataResponse events = 4; // batch of additional events (backlog catch-up)
     repeated LogFileChunkRef log_file_refs = 5;    // log file chunk refs for client direct-read
 }
-message ListMetadataSubscribersRequest {
-    repeated string client_types = 1; // optional filter by client type, e.g. "mount"; empty = all
-}
-message ListMetadataSubscribersResponse {
-    repeated MetadataSubscriber subscribers = 1;
-}
-message MetadataSubscriber {
-    string client_name = 1;     // "<type>@<address>"
-    string client_type = 2;     // e.g. "mount", "sw-vfs", "s3", "filer:<addr>"
-    string address = 3;         // client peer address
-    string path_prefix = 4;     // subscribed path prefix
-    int32 client_id = 5;
-    int32 client_epoch = 6;
-    int64 connected_at_ns = 7;
-    string filer_address = 8;   // the filer this subscriber is connected to
-}
 // A persisted log file that the client can read directly from volume servers.
 // The file format is: [4-byte size | protobuf LogEntry] repeated.
 // Each LogEntry.Data contains a marshaled SubscribeMetadataResponse.

seaweed-volume/proto/master.proto

@@ -147,11 +147,7 @@ message VolumeEcShardInformationMessage {
   repeated int64 shard_sizes = 7; // optimized: sizes for shards in order of set bits in ec_index_bits
   uint64 file_count = 8;   // total needles in the .ecx index (live + tombstoned)
   uint64 delete_count = 9; // node-local tombstones in the .ecj deletion journal
-  // encode-run identity (unix nanos) from the .vif EcShardConfig; lets the admin
-  // group shards by encode generation. Numbered 14 (not 10) to skip the
-  // enterprise fork's reserved 10-13.
-  int64 encode_ts_ns = 14;
-  // fields 15-19 reserved for future upstream open-source additions.
+  // fields 10-19 reserved for future upstream open-source additions.
   // fields 20+ are owned by the enterprise fork (e.g. data_shards/parity_shards)
   // and must not be used here without coordination.
 }

seaweed-volume/proto/volume_server.proto

@@ -247,9 +247,6 @@ message VolumeUnmountResponse {
 message VolumeDeleteRequest {
     uint32 volume_id = 1;
     bool only_empty = 2;
-    // when true, do not remove the cloud-tier object backing the volume.
-    // used for moves where another server is taking over the same .vif.
-    bool keep_remote_data = 3;
 }
 message VolumeDeleteResponse {
 }
@@ -450,18 +447,14 @@ message VolumeEcShardsDeleteRequest {
     uint32 volume_id = 1;
     string collection = 2;
     repeated uint32 shard_ids = 3;
-    bool full_teardown = 4; // pre-encode cleanup: wipe every EC artifact + generation for this volume, not just shard_ids
-    int64 encode_ts_ns = 5; // full_teardown generation fence: delete only a disk whose .vif generation is strictly OLDER than this; preserve same-or-newer, generation 0, and an unreadable .vif. 0 => wipe-all (shell pre-encode / pre-upgrade)
 }
 message VolumeEcShardsDeleteResponse {
-    bool full_teardown_done = 1; // set by a new server that performed full_teardown; absent from an old server lets the caller detect the silent no-op
 }
 
 message VolumeEcShardsMountRequest {
     uint32 volume_id = 1;
     string collection = 2;
     repeated uint32 shard_ids = 3;
-    string source_disk_type = 4; // disk type of the source volume, applied to the in-memory EC volume so heartbeats report under it (#9423)
 }
 message VolumeEcShardsMountResponse {
 }
@@ -469,7 +462,6 @@ message VolumeEcShardsMountResponse {
 message VolumeEcShardsUnmountRequest {
     uint32 volume_id = 1;
     repeated uint32 shard_ids = 3;
-    int64 encode_ts_ns = 4; // generation fence: skip a disk whose mounted EC volume is this generation or newer (0 = unfenced, unmount all)
 }
 message VolumeEcShardsUnmountResponse {
 }
@@ -480,13 +472,10 @@ message VolumeEcShardReadRequest {
     int64 offset = 3;
     int64 size = 4;
     uint64 file_key = 5;
-    reserved 6;
-    int64 encode_ts_ns = 7; // caller's expected encode time; the server rejects a shard from a different encode run
 }
 message VolumeEcShardReadResponse {
     bytes data = 1;
     bool is_deleted = 2;
-    int64 encode_ts_ns = 3; // identity of the shard actually served; client rejects a mismatch (0 = pre-upgrade server)
 }
 
 message VolumeEcBlobDeleteRequest {
@@ -584,7 +573,6 @@ message VolumeInfo {
 message EcShardConfig {
     uint32 data_shards = 1;   // Number of data shards (e.g., 10)
     uint32 parity_shards = 2; // Number of parity shards (e.g., 4)
-    int64 encode_ts_ns = 3;   // encode time (unix nanos); a read served from a shard of a different encode run is rejected
 }
 message OldVersionVolumeInfo {
     repeated RemoteFile files = 1;
@@ -649,7 +637,6 @@ message FetchAndWriteNeedleRequest {
     }
     repeated Replica replicas = 6;
     string auth = 7;
-    int32 download_concurrency = 8; // multipart download concurrency if supported by the remote storage client; for S3, 0 = default (5)
     // remote conf
     remote_pb.RemoteConf remote_conf = 15;
     remote_pb.RemoteStorageLocation remote_location = 16;

seaweed-volume/src/main.rs

@@ -288,10 +288,6 @@ async fn run(
         config.jwt_read_signing_expires_seconds,
     );
     let master_url = config.masters.first().cloned().unwrap_or_default();
-    // Defensive-copy the configured seed masters before freezing the lookup
-    // set, so any later mutation of config.masters cannot desync them.
-    let master_urls: Vec<String> = config.masters.clone();
-    let seed_master_set = VolumeServerState::build_seed_master_set(&master_urls);
     let self_url = format!("{}:{}", config.ip, config.port);
     let (http_client, outgoing_http_scheme) = build_outgoing_http_client(&config)?;
     let outgoing_grpc_tls = load_outgoing_grpc_tls(&config)?;
@@ -328,9 +324,7 @@ async fn run(
         ),
         read_mode: config.read_mode,
         master_url,
-        master_urls,
-        seed_master_set,
-        current_master_url: tokio::sync::RwLock::new(String::new()),
+        master_urls: config.masters.clone(),
         self_url,
         http_client,
         outgoing_http_scheme,
@@ -545,12 +539,6 @@ async fn run(
                     whitelist.extend(sec.guard_white_list.iter().cloned());
                     let mut guard = state_reload.guard.write().unwrap();
                     guard.update_whitelist(&whitelist);
-                    guard.update_signing_keys(
-                        SigningKey(sec.jwt_signing_key),
-                        sec.jwt_signing_expires,
-                        SigningKey(sec.jwt_read_signing_key),
-                        sec.jwt_read_signing_expires,
-                    );
                 }
 
                 // Trigger heartbeat to report new volumes

seaweed-volume/src/metrics.rs

@@ -424,10 +424,6 @@ mod tests {
     #[tokio::test]
     async fn test_push_metrics_once() {
         register_metrics();
-        // A CounterVec with no children emits nothing, so create a labelset
-        // instead of depending on another test having touched the counter
-        // first (test order is nondeterministic).
-        REQUEST_COUNTER.with_label_values(&["GET", "200"]).inc();
 
         let captured = Arc::new(Mutex::new(None::<String>));
         let captured_clone = captured.clone();

seaweed-volume/src/security.rs

@@ -172,26 +172,6 @@ impl Guard {
         self.is_write_active = !is_empty_whitelist || !self.signing_key.is_empty();
     }
 
-    /// Refresh the JWT signing keys and their expirations in place so operators
-    /// can rotate keys via SIGHUP without restarting the process. Mirrors Go's
-    /// `Guard::UpdateSigningKeys`: it swaps the fields and recomputes
-    /// `is_write_active`.
-    pub fn update_signing_keys(
-        &mut self,
-        signing_key: SigningKey,
-        expires_after_sec: i64,
-        read_signing_key: SigningKey,
-        read_expires_after_sec: i64,
-    ) {
-        self.signing_key = signing_key;
-        self.expires_after_sec = expires_after_sec;
-        self.read_signing_key = read_signing_key;
-        self.read_expires_after_sec = read_expires_after_sec;
-
-        let is_empty_whitelist = self.whitelist_ips.is_empty() && self.whitelist_cidrs.is_empty();
-        self.is_write_active = !is_empty_whitelist || !self.signing_key.is_empty();
-    }
-
     /// Check if a remote IP is in the whitelist.
     /// Returns true if write security is inactive (no whitelist and no signing key),
     /// if the whitelist is empty, or if the IP matches.
@@ -483,43 +463,6 @@ mod tests {
         assert!(matches!(err, Err(JwtError::FileIdMismatch { .. })));
     }
 
-    #[test]
-    fn test_update_signing_keys_rotates() {
-        let mut guard = Guard::new(
-            &[],
-            SigningKey::from_string("old-write"),
-            10,
-            SigningKey::from_string("old-read"),
-            60,
-        );
-
-        guard.update_signing_keys(
-            SigningKey::from_string("new-write"),
-            11,
-            SigningKey::from_string("new-read"),
-            61,
-        );
-
-        let token = gen_jwt(&guard.signing_key, 60, "3,01637037d6").unwrap();
-        // Validates with the rotated key, not the old one.
-        assert!(decode_jwt(&guard.signing_key, &token).is_ok());
-        assert!(decode_jwt(&SigningKey::from_string("old-write"), &token).is_err());
-        assert_eq!(guard.expires_after_sec, 11);
-        assert_eq!(guard.read_expires_after_sec, 61);
-    }
-
-    #[test]
-    fn test_update_signing_keys_toggles_write_active() {
-        let mut guard = Guard::new(&[], SigningKey(vec![]), 0, SigningKey(vec![]), 0);
-        assert!(guard.check_jwt(None, true).is_ok());
-
-        guard.update_signing_keys(SigningKey::from_string("write"), 10, SigningKey(vec![]), 0);
-        assert!(guard.is_write_active);
-
-        guard.update_signing_keys(SigningKey(vec![]), 0, SigningKey(vec![]), 0);
-        assert!(!guard.is_write_active);
-    }
-
     #[test]
     fn test_extract_host() {
         assert_eq!(extract_host("192.168.1.1:8080"), "192.168.1.1");

seaweed-volume/src/server/grpc_client.rs

@@ -107,57 +107,6 @@ pub fn build_grpc_endpoint(
     Ok(endpoint)
 }
 
-/// Parse a SeaweedFS server address (`"ip:port.grpcPort"` or
-/// `"ip:port"`) into the `host:grpcPort` form `build_grpc_endpoint`
-/// expects. With the trailing `.grpcPort` segment, that segment IS
-/// the gRPC port; without it, the gRPC port is `port + 10000`
-/// (SeaweedFS's HTTP↔gRPC port-offset convention).
-///
-/// Shared between `grpc_server.rs` and the distributed-EC-read path
-/// in `store_ec.rs` — keep this as the single source of truth so the
-/// HTTP↔gRPC port translation can't drift between callers.
-pub fn parse_grpc_address(source: &str) -> Result<String, String> {
-    let colon_idx = source
-        .rfind(':')
-        .ok_or_else(|| format!("cannot parse address: {}", source))?;
-    let host = &source[..colon_idx];
-    let port_part = &source[colon_idx + 1..];
-
-    if let Some(dot_idx) = port_part.rfind('.') {
-        // Format: "ip:port.grpcPort". Validate BOTH ports as u16
-        // so a malformed HTTP port (e.g. `host:abc.18080`) is
-        // rejected here rather than tripping a downstream
-        // `build_grpc_endpoint` URI parse failure with a less
-        // useful error.
-        let http_port = &port_part[..dot_idx];
-        let grpc_port = &port_part[dot_idx + 1..];
-        http_port
-            .parse::<u16>()
-            .map_err(|e| format!("invalid http port {:?}: {}", http_port, e))?;
-        grpc_port
-            .parse::<u16>()
-            .map_err(|e| format!("invalid grpc port {:?}: {}", grpc_port, e))?;
-        return Ok(format!("{}:{}", host, grpc_port));
-    }
-
-    // Format: "ip:port" → grpc = port + 10000. Reject inputs whose
-    // implicit grpc port would overflow the TCP port range (e.g.
-    // `host:60000` produces 70000 — invalid). Without this check
-    // the cast silently wraps and the endpoint call later fails
-    // with an opaque connection error.
-    let port: u16 = port_part
-        .parse()
-        .map_err(|e| format!("invalid port {:?}: {}", port_part, e))?;
-    let grpc_port = port as u32 + 10000;
-    if grpc_port > u16::MAX as u32 {
-        return Err(format!(
-            "implicit grpc port out of range: {} + 10000 = {}",
-            port, grpc_port
-        ));
-    }
-    Ok(format!("{}:{}", host, grpc_port))
-}
-
 #[cfg(test)]
 mod tests {
     use super::{build_grpc_endpoint, grpc_endpoint_uri, load_outgoing_grpc_tls};
@@ -254,50 +203,4 @@ mod tests {
         let endpoint = build_grpc_endpoint("127.0.0.1:19333", None).unwrap();
         assert_eq!(endpoint.uri().scheme_str(), Some("http"));
     }
-
-    #[test]
-    fn test_parse_grpc_address_dotted_form() {
-        use super::parse_grpc_address;
-        assert_eq!(
-            parse_grpc_address("127.0.0.1:8080.18080").unwrap(),
-            "127.0.0.1:18080"
-        );
-    }
-
-    #[test]
-    fn test_parse_grpc_address_implicit_form_adds_10000() {
-        use super::parse_grpc_address;
-        assert_eq!(
-            parse_grpc_address("127.0.0.1:8080").unwrap(),
-            "127.0.0.1:18080"
-        );
-    }
-
-    #[test]
-    fn test_parse_grpc_address_rejects_non_numeric_http_port_in_dotted_form() {
-        use super::parse_grpc_address;
-        let err = parse_grpc_address("host:abc.18080").unwrap_err();
-        assert!(err.contains("invalid http port"), "{}", err);
-    }
-
-    #[test]
-    fn test_parse_grpc_address_rejects_non_numeric_grpc_port_in_dotted_form() {
-        use super::parse_grpc_address;
-        let err = parse_grpc_address("host:8080.xyz").unwrap_err();
-        assert!(err.contains("invalid grpc port"), "{}", err);
-    }
-
-    #[test]
-    fn test_parse_grpc_address_rejects_implicit_port_that_overflows() {
-        use super::parse_grpc_address;
-        let err = parse_grpc_address("127.0.0.1:60000").unwrap_err();
-        assert!(err.contains("out of range"), "{}", err);
-    }
-
-    #[test]
-    fn test_parse_grpc_address_rejects_input_without_colon() {
-        use super::parse_grpc_address;
-        let err = parse_grpc_address("hostname").unwrap_err();
-        assert!(err.contains("cannot parse"), "{}", err);
-    }
 }

seaweed-volume/src/server/grpc_server.rs

@@ -145,37 +145,6 @@ pub struct VolumeGrpcService {
 }
 
 impl VolumeGrpcService {
-    /// Verifies the gRPC caller is allowed to invoke a destructive admin
-    /// operation. Mirrors the Go side's checkGrpcAdminAuth: an empty
-    /// whitelist accepts everyone (insecure-by-default for tests and
-    /// upgrades), a populated whitelist accepts only matching peer IPs.
-    ///
-    /// `remote_addr()` on a real gRPC connection always yields the peer's
-    /// SocketAddr; if it is somehow None we deny, matching "if we don't
-    /// know who the caller is, refuse."
-    fn check_grpc_admin_auth<T>(&self, request: &Request<T>) -> Result<(), Status> {
-        let remote = match request.remote_addr() {
-            Some(addr) => addr,
-            None => {
-                tracing::warn!("gRPC admin auth failed: no peer info");
-                return Err(Status::permission_denied("no peer info"));
-            }
-        };
-        let host = remote.ip().to_string();
-        let guard = self.state.guard.read().unwrap();
-        if !guard.check_whitelist(&host) {
-            tracing::warn!(
-                "gRPC admin auth failed: {} is not whitelisted (remote: {})",
-                host,
-                remote,
-            );
-            return Err(Status::permission_denied(format!(
-                "not authorized: {host}"
-            )));
-        }
-        Ok(())
-    }
-
     async fn notify_master_volume_readonly(
         &self,
         info: &MasterVolumeInfo,
@@ -399,27 +368,6 @@ impl VolumeServer for VolumeGrpcService {
 
             if !is_ec_volume {
                 let mut store = self.state.store.write().unwrap();
-                // Recheck EC state under the write lock before mutating the .dat. The
-                // is_ec_volume snapshot was taken earlier under a separate read lock;
-                // ec.encode mounts EC shards (copied from the .dat) BEFORE deleting the
-                // originals, so the vid can be EC now while the .dat still exists. A
-                // delete_volume_needle here would tombstone that .dat, which the encode
-                // then removes — the delete is lost and the needle resurrected from the
-                // pre-tombstone shards. If the vid is now EC, return a retriable 503 so
-                // the filer requeues the delete onto the EC path.
-                if store.has_ec_volume(file_id.volume_id) {
-                    results.push(volume_server_pb::DeleteResult {
-                        file_id: fid_str.clone(),
-                        status: 503,
-                        error: format!(
-                            "volume {} became ec during delete, try again",
-                            file_id.volume_id
-                        ),
-                        size: 0,
-                        version: 0,
-                    });
-                    continue;
-                }
                 match store.delete_volume_needle(file_id.volume_id, &mut n) {
                     Ok(size) => {
                         if size.0 == 0 {
@@ -441,35 +389,13 @@ impl VolumeServer for VolumeGrpcService {
                         }
                     }
                     Err(e) => {
-                        // The volume vanished between the is_ec_volume snapshot and
-                        // this mutation. If an EC volume now occupies the vid (ec.encode
-                        // mounted EC then deleted the .dat under us), the delete belongs
-                        // on the EC journal, not here — return a retriable 503 with the
-                        // "try again" token so the filer requeues it and the retry hits
-                        // the EC path. A bare exact "not found" would be dropped
-                        // permanently by the filer chunk-GC.
-                        if matches!(e, crate::storage::volume::VolumeError::NotFound)
-                            && store.has_ec_volume(file_id.volume_id)
-                        {
-                            results.push(volume_server_pb::DeleteResult {
-                                file_id: fid_str.clone(),
-                                status: 503,
-                                error: format!(
-                                    "volume {} became ec during delete, try again",
-                                    file_id.volume_id
-                                ),
-                                size: 0,
-                                version: 0,
-                            });
-                        } else {
-                            results.push(volume_server_pb::DeleteResult {
-                                file_id: fid_str.clone(),
-                                status: 500,
-                                error: e.to_string(),
-                                size: 0,
-                                version: 0,
-                            });
-                        }
+                        results.push(volume_server_pb::DeleteResult {
+                            file_id: fid_str.clone(),
+                            status: 500,
+                            error: e.to_string(),
+                            size: 0,
+                            version: 0,
+                        });
                     }
                 }
             } else {
@@ -533,7 +459,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::VacuumVolumeCompactRequest>,
     ) -> Result<Response<Self::VacuumVolumeCompactStream>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         self.state.check_maintenance()?;
         let req = request.into_inner();
         let vid = VolumeId(req.volume_id);
@@ -593,7 +518,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::VacuumVolumeCommitRequest>,
     ) -> Result<Response<volume_server_pb::VacuumVolumeCommitResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         self.state.check_maintenance()?;
         let vid = VolumeId(request.into_inner().volume_id);
 
@@ -629,7 +553,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::VacuumVolumeCleanupRequest>,
     ) -> Result<Response<volume_server_pb::VacuumVolumeCleanupResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         self.state.check_maintenance()?;
         let vid = VolumeId(request.into_inner().volume_id);
         let mut store = self.state.store.write().unwrap();
@@ -645,7 +568,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::DeleteCollectionRequest>,
     ) -> Result<Response<volume_server_pb::DeleteCollectionResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         let collection = &request.into_inner().collection;
         let mut store = self.state.store.write().unwrap();
         store
@@ -658,7 +580,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::AllocateVolumeRequest>,
     ) -> Result<Response<volume_server_pb::AllocateVolumeResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         self.state.check_maintenance()?;
         let req = request.into_inner();
         let vid = VolumeId(req.volume_id);
@@ -807,7 +728,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::VolumeMountRequest>,
     ) -> Result<Response<volume_server_pb::VolumeMountResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         let req = request.into_inner();
         let vid = VolumeId(req.volume_id);
 
@@ -824,7 +744,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::VolumeUnmountRequest>,
     ) -> Result<Response<volume_server_pb::VolumeUnmountResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         let vid = VolumeId(request.into_inner().volume_id);
         let mut store = self.state.store.write().unwrap();
         // Go returns nil when volume is not found (idempotent unmount)
@@ -838,7 +757,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::VolumeDeleteRequest>,
     ) -> Result<Response<volume_server_pb::VolumeDeleteResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         self.state.check_maintenance()?;
         let req = request.into_inner();
         let vid = VolumeId(req.volume_id);
@@ -852,7 +770,7 @@ impl VolumeServer for VolumeGrpcService {
             }
         }
         store
-            .delete_volume(vid, req.only_empty, req.keep_remote_data)
+            .delete_volume(vid, req.only_empty)
             .map_err(|e| Status::internal(e.to_string()))?;
         self.state.volume_state_notify.notify_one();
         Ok(Response::new(volume_server_pb::VolumeDeleteResponse {}))
@@ -862,7 +780,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::VolumeMarkReadonlyRequest>,
     ) -> Result<Response<volume_server_pb::VolumeMarkReadonlyResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         let req = request.into_inner();
         let vid = VolumeId(req.volume_id);
         // Go: volume lookup (L239-241) happens before maintenance check (L166 in makeVolumeReadonly)
@@ -882,7 +799,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::VolumeMarkWritableRequest>,
     ) -> Result<Response<volume_server_pb::VolumeMarkWritableResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         let req = request.into_inner();
         let vid = VolumeId(req.volume_id);
         let info = {
@@ -932,7 +848,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::VolumeConfigureRequest>,
     ) -> Result<Response<volume_server_pb::VolumeConfigureResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         self.state.check_maintenance()?;
         let req = request.into_inner();
         let vid = VolumeId(req.volume_id);
@@ -1080,15 +995,18 @@ impl VolumeServer for VolumeGrpcService {
         let req = request.into_inner();
         let vid = VolumeId(req.volume_id);
 
-        // A pre-existing local replica is NOT deleted up front. Deleting before
-        // the source is confirmed reachable destroys a healthy copy on a
-        // transient source outage (and, on retry, can lose the volume
-        // entirely). The delete is deferred until read_volume_file_status below
-        // proves the source holds the volume; readability alone is the gate.
-        let had_existing_volume = {
+        // If volume already exists locally, delete it first
+        {
             let store = self.state.store.read().unwrap();
-            store.find_volume(vid).is_some()
-        };
+            if store.find_volume(vid).is_some() {
+                drop(store);
+                let mut store = self.state.store.write().unwrap();
+                store.delete_volume(vid, false).map_err(|e| {
+                    Status::internal(format!("failed to delete existing volume {}: {}", vid, e))
+                })?;
+                self.state.volume_state_notify.notify_one();
+            }
+        }
 
         // Parse source_data_node address: "ip:port.grpcPort" or "ip:port" (grpc = port + 10000)
         let source = &req.source_data_node;
@@ -1129,19 +1047,6 @@ impl VolumeServer for VolumeGrpcService {
             .map_err(|e| Status::internal(format!("read volume file status failed, {}", e)))?
             .into_inner();
 
-        // Source is reachable and holds the volume: only now is it safe to drop
-        // an existing local replica before overwriting its files.
-        if had_existing_volume {
-            let mut store = self.state.store.write().unwrap();
-            // keep remote data: the inbound copy carries a .vif that may point
-            // at the same cloud-tier object the existing volume references.
-            store.delete_volume(vid, false, true).map_err(|e| {
-                Status::internal(format!("failed to delete existing volume {}: {}", vid, e))
-            })?;
-            drop(store);
-            self.state.volume_state_notify.notify_one();
-        }
-
         let requested_disk_type = if !req.disk_type.is_empty() {
             DiskType::from_string(&req.disk_type)
         } else {
@@ -1173,12 +1078,9 @@ impl VolumeServer for VolumeGrpcService {
         let idx_base_name =
             crate::storage::volume::volume_file_name(&idx_base, &vol_info.collection, vid);
 
-        // Write a .note file to indicate copy in progress. A leftover note
-        // fails the volume load on restart, so a write failure must abort.
+        // Write a .note file to indicate copy in progress
         let note_path = format!("{}.note", data_base_name);
-        std::fs::write(&note_path, format!("copying from {}", source)).map_err(|e| {
-            Status::internal(format!("write .note for volume {}: {}", vid, e))
-        })?;
+        let _ = std::fs::write(&note_path, format!("copying from {}", source));
 
         let has_remote_dat = vol_info
             .volume_info
@@ -1257,7 +1159,7 @@ impl VolumeServer for VolumeGrpcService {
                     .await
                     .map_err(|e| Status::internal(e))?;
                     if dat_modified_ts_ns > 0 {
-                        let _ = set_file_mtime(&dat_path, dat_modified_ts_ns);
+                        set_file_mtime(&dat_path, dat_modified_ts_ns);
                     }
                 }
 
@@ -1282,7 +1184,7 @@ impl VolumeServer for VolumeGrpcService {
                 .await
                 .map_err(|e| Status::internal(e))?;
                 if idx_modified_ts_ns > 0 {
-                    let _ = set_file_mtime(&idx_path, idx_modified_ts_ns);
+                    set_file_mtime(&idx_path, idx_modified_ts_ns);
                 }
 
                 // Copy .vif file (ignore if not found on source)
@@ -1306,19 +1208,11 @@ impl VolumeServer for VolumeGrpcService {
                 .await
                 .map_err(|e| Status::internal(e))?;
                 if vif_modified_ts_ns > 0 {
-                    let _ = set_file_mtime(&vif_path, vif_modified_ts_ns);
+                    set_file_mtime(&vif_path, vif_modified_ts_ns);
                 }
 
-                // Remove the .note file. A leftover note fails the load on the
-                // next restart, so a removal failure must fail the copy.
-                if let Err(e) = std::fs::remove_file(&note_path) {
-                    if e.kind() != std::io::ErrorKind::NotFound {
-                        return Err(Status::internal(format!(
-                            "remove .note for volume {}: {}",
-                            vid, e
-                        )));
-                    }
-                }
+                // Remove the .note file
+                let _ = std::fs::remove_file(&note_path);
 
                 // Verify file sizes
                 if !has_remote_dat {
@@ -1572,11 +1466,9 @@ impl VolumeServer for VolumeGrpcService {
                             // EcVolume holds fds on the same inodes, so overwriting
                             // corrupts live readers.
                             if store.has_ec_volume(VolumeId(info.volume_id)) {
-                                let mounted_disks =
-                                    store.find_ec_volume_disk_ids(VolumeId(info.volume_id));
                                 resp_error = Some(format!(
-                                    "ec volume {} is mounted on disk_ids:{:?}; unmount before ReceiveFile",
-                                    info.volume_id, mounted_disks
+                                    "ec volume {} is mounted; unmount before ReceiveFile",
+                                    info.volume_id
                                 ));
                                 break;
                             }
@@ -2194,12 +2086,6 @@ impl VolumeServer for VolumeGrpcService {
                 ec_shard_config: Some(crate::storage::volume::VifEcShardConfig {
                     data_shards: data_shards,
                     parity_shards: parity_shards,
-                    // This run's identity; the read path rejects a shard from a
-                    // different encode run.
-                    encode_ts_ns: std::time::SystemTime::now()
-                        .duration_since(std::time::UNIX_EPOCH)
-                        .unwrap_or_default()
-                        .as_nanos() as i64,
                 }),
                 ..Default::default()
             };
@@ -2656,78 +2542,15 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::VolumeEcShardsDeleteRequest>,
     ) -> Result<Response<volume_server_pb::VolumeEcShardsDeleteResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         self.state.check_maintenance()?;
         let req = request.into_inner();
         let vid = VolumeId(req.volume_id);
-
-        if req.full_teardown {
-            if req.encode_ts_ns == 0 {
-                // Blanket teardown (shell pre-encode cleanup / pre-upgrade caller): evict
-                // the volume and wipe every EC artifact for it on every disk, not just the
-                // listed shards, so a remote node retains no stale generation a fresh copy
-                // collides with. Echo the acknowledgement so the caller can tell a
-                // pre-upgrade server apart.
-                {
-                    let mut store = self.state.store.write().unwrap();
-                    let _ = store.remove_ec_volume(vid);
-                    for loc in &store.locations {
-                        loc.remove_ec_volume_files_full_teardown(&req.collection, vid)
-                            .map_err(|e| {
-                                Status::internal(format!(
-                                    "full teardown of ec volume {}: {}",
-                                    req.volume_id, e
-                                ))
-                            })?;
-                    }
-                }
-            } else {
-                // Generation-fenced teardown (stale-worker pre-distribute cleanup): wipe
-                // only a disk whose .vif generation is strictly OLDER than the request;
-                // preserve same-or-newer, generation 0 (recovered/pre-upgrade live volume),
-                // and an unreadable .vif, so a stale run never wipes a newer run's live
-                // shards. Unload and remove only the strictly-older disks, never node-wide.
-                let mut store = self.state.store.write().unwrap();
-                for disk_id in 0..store.locations.len() {
-                    let disk_gen = store.locations[disk_id].ec_generation_ts_ns(&req.collection, vid);
-                    let older = matches!(disk_gen, Some(g) if g > 0 && g < req.encode_ts_ns);
-                    if !older {
-                        tracing::info!(
-                            volume_id = vid.0,
-                            disk_id,
-                            ?disk_gen,
-                            req = req.encode_ts_ns,
-                            "ec full teardown preserved: generation not older than request"
-                        );
-                        continue;
-                    }
-                    store.locations[disk_id].remove_ec_volume(vid);
-                    store.locations[disk_id]
-                        .remove_ec_volume_files_full_teardown(&req.collection, vid)
-                        .map_err(|e| {
-                            Status::internal(format!(
-                                "fenced teardown of ec volume {}: {}",
-                                req.volume_id, e
-                            ))
-                        })?;
-                }
-            }
-            self.state.volume_state_notify.notify_one();
-            return Ok(Response::new(
-                volume_server_pb::VolumeEcShardsDeleteResponse {
-                    full_teardown_done: true,
-                },
-            ));
-        }
-
         let mut store = self.state.store.write().unwrap();
         store.delete_ec_shards(vid, &req.collection, &req.shard_ids);
         drop(store);
         self.state.volume_state_notify.notify_one();
         Ok(Response::new(
-            volume_server_pb::VolumeEcShardsDeleteResponse {
-                full_teardown_done: false,
-            },
+            volume_server_pb::VolumeEcShardsDeleteResponse {},
         ))
     }
 
@@ -2743,7 +2566,7 @@ impl VolumeServer for VolumeGrpcService {
         let mut store = self.state.store.write().unwrap();
         for &shard_id in &req.shard_ids {
             store
-                .mount_ec_shard(vid, &req.collection, shard_id, &req.source_disk_type)
+                .mount_ec_shard(vid, &req.collection, shard_id)
                 .map_err(|e| {
                     Status::internal(format!("mount {}.{}: {}", req.volume_id, shard_id, e))
                 })?;
@@ -2767,11 +2590,9 @@ impl VolumeServer for VolumeGrpcService {
         // Matches Go: for _, shardId := range req.ShardIds { err = vs.store.UnmountEcShards(...) }
         let mut store = self.state.store.write().unwrap();
         for &shard_id in &req.shard_ids {
-            store
-                .unmount_ec_shard(vid, shard_id, req.encode_ts_ns)
-                .map_err(|e| {
-                    Status::internal(format!("unmount {}.{}: {}", req.volume_id, shard_id, e))
-                })?;
+            store.unmount_ec_shard(vid, shard_id).map_err(|e| {
+                Status::internal(format!("unmount {}.{}: {}", req.volume_id, shard_id, e))
+            })?;
         }
         drop(store);
         self.state.volume_state_notify.notify_one();
@@ -2803,21 +2624,6 @@ impl VolumeServer for VolumeGrpcService {
                 ))
             })?;
 
-        // Reject a shard whose identity doesn't match the caller's index; the caller
-        // then recovers from parity. Lenient only when the caller has no identity
-        // (pre-upgrade reader): a known caller must not accept an unstamped holder,
-        // which would serve a stale shard from a different encode run.
-        if req.encode_ts_ns != 0 && req.encode_ts_ns != ec_vol.encode_ts_ns {
-            return Err(Status::failed_precondition(format!(
-                "ec shard {}.{} belongs to a different encode run",
-                req.volume_id, req.shard_id
-            )));
-        }
-
-        // Identity of the shard actually served, echoed on every response chunk so
-        // the client can reject a different encode run even from a pre-upgrade server.
-        let served_encode_ts_ns = ec_vol.encode_ts_ns;
-
         // Check if the requested needle is deleted (via .ecx index, matching Go)
         if req.file_key > 0 {
             let needle_id = NeedleId(req.file_key);
@@ -2828,7 +2634,6 @@ impl VolumeServer for VolumeGrpcService {
                 if size.is_deleted() {
                     let results = vec![Ok(volume_server_pb::VolumeEcShardReadResponse {
                         is_deleted: true,
-                        encode_ts_ns: served_encode_ts_ns,
                         ..Default::default()
                     })];
                     return Ok(Response::new(Box::pin(tokio_stream::iter(results))));
@@ -2877,7 +2682,6 @@ impl VolumeServer for VolumeGrpcService {
             results.push(Ok(volume_server_pb::VolumeEcShardReadResponse {
                 data: buf,
                 is_deleted: false,
-                encode_ts_ns: served_encode_ts_ns,
             }));
             if n < chunk_size {
                 break; // short read means EOF
@@ -3146,15 +2950,6 @@ impl VolumeServer for VolumeGrpcService {
             dat_path
         };
 
-        // Store the source .dat mtime, not the upload time, so a reload computes
-        // TTL from real data age (matches Go VolumeTierMoveDatToRemote).
-        let dat_modified_secs = std::fs::metadata(&dat_path)
-            .and_then(|m| m.modified())
-            .map_err(|e| Status::internal(format!("stat data file {}: {}", dat_path, e)))?
-            .duration_since(std::time::UNIX_EPOCH)
-            .map(|d| d.as_secs())
-            .unwrap_or(0);
-
         // Look up the S3 tier backend
         let backend = {
             let registry = self.state.s3_tier_registry.read().unwrap();
@@ -3207,13 +3002,18 @@ impl VolumeServer for VolumeGrpcService {
                 {
                     let mut store = state.store.write().unwrap();
                     if let Some((_, vol)) = store.find_volume_mut(vid) {
+                        let now_unix = std::time::SystemTime::now()
+                            .duration_since(std::time::UNIX_EPOCH)
+                            .unwrap_or_default()
+                            .as_secs();
+
                         vol.volume_info.files.push(volume_server_pb::RemoteFile {
                             backend_type: backend_type.clone(),
                             backend_id: backend_id.clone(),
                             key,
                             offset: 0,
                             file_size: size,
-                            modified_time: dat_modified_secs,
+                            modified_time: now_unix,
                             extension: ".dat".to_string(),
                         });
                         vol.refresh_remote_write_mode();
@@ -3264,7 +3064,7 @@ impl VolumeServer for VolumeGrpcService {
         let vid = VolumeId(req.volume_id);
 
         // Validate volume and get remote storage info
-        let (dat_path, storage_name, storage_key, remote_modified_secs) = {
+        let (dat_path, storage_name, storage_key) = {
             let store = self.state.store.read().unwrap();
             let (_, vol) = store
                 .find_volume(vid)
@@ -3294,14 +3094,7 @@ impl VolumeServer for VolumeGrpcService {
                 )));
             }
 
-            let remote_modified_secs = vol
-                .volume_info
-                .files
-                .first()
-                .map(|f| f.modified_time)
-                .unwrap_or(0);
-
-            (dat_path, storage_name, storage_key, remote_modified_secs)
+            (dat_path, storage_name, storage_key)
         };
 
         // Look up the S3 tier backend
@@ -3349,15 +3142,6 @@ impl VolumeServer for VolumeGrpcService {
                         ))
                     })?;
 
-                // Restore the .dat mtime so a reload computes TTL from real data age,
-                // not download time (matches Go VolumeTierMoveDatFromRemote).
-                if remote_modified_secs > 0 {
-                    let modified_ts_ns = (remote_modified_secs as i64).saturating_mul(1_000_000_000);
-                    if let Err(e) = set_file_mtime(&dat_path, modified_ts_ns) {
-                        tracing::warn!("volume {} restore data file {} modified time: {}", vid, dat_path, e);
-                    }
-                }
-
                 if !keep_remote {
                     // Delete remote file
                     backend.delete_file(&storage_key).await.map_err(|e| {
@@ -3456,9 +3240,8 @@ impl VolumeServer for VolumeGrpcService {
 
     async fn volume_server_leave(
         &self,
-        request: Request<volume_server_pb::VolumeServerLeaveRequest>,
+        _request: Request<volume_server_pb::VolumeServerLeaveRequest>,
     ) -> Result<Response<volume_server_pb::VolumeServerLeaveResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         *self.state.is_stopping.write().unwrap() = true;
         self.state.is_heartbeating.store(false, Ordering::Relaxed);
         // Wake heartbeat loop to send deregistration.
@@ -3608,7 +3391,6 @@ impl VolumeServer for VolumeGrpcService {
         &self,
         request: Request<volume_server_pb::ScrubVolumeRequest>,
     ) -> Result<Response<volume_server_pb::ScrubVolumeResponse>, Status> {
-        self.check_grpc_admin_auth(&request)?;
         let req = request.into_inner();
 
         // Validate mode
@@ -4068,24 +3850,6 @@ impl VolumeServer for VolumeGrpcService {
 
         let start = now_ns();
 
-        // Empty target is a self-liveness probe and stays unauthenticated.
-        // Otherwise gate the dial on cluster membership: volume servers only
-        // know masters, so any other target type is refused. Mirrors Go's
-        // volume_grpc_admin.go Ping admission check. tonic forbids returning
-        // a body alongside an error, so we surface the InvalidArgument status
-        // alone — behaviour-identical to Go's status.Errorf return.
-        if !req.target.is_empty()
-            && !self
-                .state
-                .is_known_ping_target(&req.target, &req.target_type)
-                .await
-        {
-            return Err(Status::invalid_argument(format!(
-                "unknown ping target {} of type {}",
-                req.target, req.target_type
-            )));
-        }
-
         // Route ping based on target type (matches Go's volume_grpc_admin.go Ping)
         let remote_time_ns = if req.target_type == "volumeServer" {
             match ping_volume_server_target(&req.target, self.state.outgoing_grpc_tls.as_ref())
@@ -4221,24 +3985,42 @@ async fn ping_filer_target(
     Ok(resp.into_inner().start_time_ns)
 }
 
-// parse_grpc_address moved to super::grpc_client::parse_grpc_address
-// for sharing with the distributed-EC-read path in server/store_ec.rs.
-// In-file callers below still write `parse_grpc_address(...)`; this
-// `use` makes them resolve to the new home without churning every
-// call site.
-use super::grpc_client::parse_grpc_address;
+/// Parse a SeaweedFS server address ("ip:port.grpcPort" or "ip:port") into a gRPC address.
+fn parse_grpc_address(source: &str) -> Result<String, String> {
+    if let Some(colon_idx) = source.rfind(':') {
+        let port_part = &source[colon_idx + 1..];
+        if let Some(dot_idx) = port_part.rfind('.') {
+            // Format: "ip:port.grpcPort"
+            let host = &source[..colon_idx];
+            let grpc_port = &port_part[dot_idx + 1..];
+            grpc_port
+                .parse::<u16>()
+                .map_err(|e| format!("invalid grpc port: {}", e))?;
+            return Ok(format!("{}:{}", host, grpc_port));
+        }
+        // Format: "ip:port" → grpc = port + 10000
+        let port: u16 = port_part
+            .parse()
+            .map_err(|e| format!("invalid port: {}", e))?;
+        let grpc_port = port as u32 + 10000;
+        let host = &source[..colon_idx];
+        return Ok(format!("{}:{}", host, grpc_port));
+    }
+    Err(format!("cannot parse address: {}", source))
+}
 
 /// Set the modification time of a file from nanoseconds since Unix epoch.
-fn set_file_mtime(path: &str, modified_ts_ns: i64) -> std::io::Result<()> {
+fn set_file_mtime(path: &str, modified_ts_ns: i64) {
     use std::time::{Duration, SystemTime};
     let ts = if modified_ts_ns >= 0 {
         SystemTime::UNIX_EPOCH + Duration::from_nanos(modified_ts_ns as u64)
     } else {
         SystemTime::UNIX_EPOCH
     };
-    let file = std::fs::File::open(path)?;
-    let ft = std::fs::FileTimes::new().set_accessed(ts).set_modified(ts);
-    file.set_times(ft)
+    if let Ok(file) = std::fs::File::open(path) {
+        let ft = std::fs::FileTimes::new().set_accessed(ts).set_modified(ts);
+        let _ = file.set_times(ft);
+    }
 }
 
 /// Copy a file from a remote volume server via CopyFile streaming RPC.
@@ -4730,8 +4512,6 @@ mod tests {
             read_mode: crate::config::ReadMode::Local,
             master_url: String::new(),
             master_urls: Vec::new(),
-            seed_master_set: std::collections::HashSet::new(),
-            current_master_url: tokio::sync::RwLock::new(String::new()),
             self_url: String::new(),
             http_client: reqwest::Client::new(),
             outgoing_http_scheme: "http".to_string(),
@@ -4834,8 +4614,6 @@ mod tests {
             read_mode: crate::config::ReadMode::Local,
             master_url: String::new(),
             master_urls: Vec::new(),
-            seed_master_set: std::collections::HashSet::new(),
-            current_master_url: tokio::sync::RwLock::new(String::new()),
             self_url: String::new(),
             http_client: reqwest::Client::new(),
             outgoing_http_scheme: "http".to_string(),
@@ -4884,206 +4662,6 @@ mod tests {
             .remove("s3.incr_copy_test");
     }
 
-    /// Build a bare-bones service with no on-disk store but a configurable
-    /// seed master set, for Ping admission tests. Matches the structure of
-    /// `make_local_service_with_volume` minus the volume bits.
-    fn make_service_with_seed_masters(seeds: &[&str]) -> (VolumeGrpcService, TempDir) {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        store
-            .add_location(
-                dir,
-                dir,
-                10,
-                DiskType::HardDrive,
-                MinFreeSpace::Percent(1.0),
-                Vec::new(),
-            )
-            .unwrap();
-
-        let master_urls: Vec<String> = seeds.iter().map(|s| (*s).to_string()).collect();
-        let seed_master_set =
-            crate::server::volume_server::VolumeServerState::build_seed_master_set(&master_urls);
-
-        let state = Arc::new(VolumeServerState {
-            store: RwLock::new(store),
-            guard: RwLock::new(Guard::new(
-                &[],
-                SigningKey(vec![]),
-                0,
-                SigningKey(vec![]),
-                0,
-            )),
-            is_stopping: RwLock::new(false),
-            maintenance: std::sync::atomic::AtomicBool::new(false),
-            state_version: std::sync::atomic::AtomicU32::new(0),
-            concurrent_upload_limit: 0,
-            concurrent_download_limit: 0,
-            inflight_upload_data_timeout: std::time::Duration::from_secs(60),
-            inflight_download_data_timeout: std::time::Duration::from_secs(60),
-            inflight_upload_bytes: std::sync::atomic::AtomicI64::new(0),
-            inflight_download_bytes: std::sync::atomic::AtomicI64::new(0),
-            upload_notify: tokio::sync::Notify::new(),
-            download_notify: tokio::sync::Notify::new(),
-            data_center: String::new(),
-            rack: String::new(),
-            file_size_limit_bytes: 0,
-            maintenance_byte_per_second: 0,
-            is_heartbeating: std::sync::atomic::AtomicBool::new(true),
-            has_master: false,
-            pre_stop_seconds: 0,
-            volume_state_notify: tokio::sync::Notify::new(),
-            write_queue: std::sync::OnceLock::new(),
-            s3_tier_registry: std::sync::RwLock::new(
-                crate::remote_storage::s3_tier::S3TierRegistry::new(),
-            ),
-            read_mode: crate::config::ReadMode::Local,
-            master_url: master_urls.first().cloned().unwrap_or_default(),
-            master_urls,
-            seed_master_set,
-            current_master_url: tokio::sync::RwLock::new(String::new()),
-            self_url: String::new(),
-            http_client: reqwest::Client::new(),
-            outgoing_http_scheme: "http".to_string(),
-            outgoing_grpc_tls: None,
-            metrics_runtime: std::sync::RwLock::new(
-                crate::server::volume_server::RuntimeMetricsConfig::default(),
-            ),
-            metrics_notify: tokio::sync::Notify::new(),
-            fix_jpg_orientation: false,
-            has_slow_read: false,
-            read_buffer_size_bytes: 1024 * 1024,
-            security_file: String::new(),
-            cli_white_list: vec![],
-            state_file_path: String::new(),
-        });
-
-        (VolumeGrpcService { state }, tmp)
-    }
-
-    #[tokio::test]
-    async fn test_ping_empty_target_is_self_probe() {
-        // Empty target stays unauthenticated and returns Ok with timing fields
-        // populated — it is the local liveness probe path.
-        let (service, _tmp) = make_service_with_seed_masters(&[]);
-        let response = service
-            .ping(Request::new(volume_server_pb::PingRequest {
-                target: String::new(),
-                target_type: String::new(),
-            }))
-            .await
-            .expect("empty target ping must succeed");
-        let inner = response.into_inner();
-        assert!(inner.start_time_ns > 0);
-        assert!(inner.stop_time_ns >= inner.start_time_ns);
-    }
-
-    #[tokio::test]
-    async fn test_ping_seed_master_target_passes_admission() {
-        // A target that matches a configured seed master clears admission.
-        // The dial itself may or may not succeed depending on what's listening
-        // on the loopback; either way, the response must not be the
-        // InvalidArgument the gate would surface.
-        let (service, _tmp) = make_service_with_seed_masters(&["localhost:9333"]);
-        let result = service
-            .ping(Request::new(volume_server_pb::PingRequest {
-                target: "localhost:9333".to_string(),
-                target_type: "master".to_string(),
-            }))
-            .await;
-        if let Err(err) = result {
-            assert_ne!(err.code(), tonic::Code::InvalidArgument, "got {err:?}");
-            assert!(
-                !err.message().contains("unknown ping target"),
-                "admission gate should have allowed this target: {}",
-                err.message()
-            );
-        }
-    }
-
-    #[tokio::test]
-    async fn test_ping_unknown_master_target_rejected() {
-        // A master-type target not in the seed list and not the current
-        // master is refused with InvalidArgument.
-        let (service, _tmp) = make_service_with_seed_masters(&["localhost:9333"]);
-        let err = service
-            .ping(Request::new(volume_server_pb::PingRequest {
-                target: "localhost:9999".to_string(),
-                target_type: "master".to_string(),
-            }))
-            .await
-            .expect_err("unknown master target must be rejected");
-        assert_eq!(err.code(), tonic::Code::InvalidArgument);
-        assert_eq!(
-            err.message(),
-            "unknown ping target localhost:9999 of type master"
-        );
-    }
-
-    #[tokio::test]
-    async fn test_ping_volume_server_target_always_rejected() {
-        // Volume servers do not maintain a peer-volume list, so volumeServer
-        // pings are refused regardless of address.
-        let (service, _tmp) = make_service_with_seed_masters(&["localhost:9333"]);
-        let err = service
-            .ping(Request::new(volume_server_pb::PingRequest {
-                target: "localhost:8080".to_string(),
-                target_type: "volumeServer".to_string(),
-            }))
-            .await
-            .expect_err("volumeServer target must be rejected");
-        assert_eq!(err.code(), tonic::Code::InvalidArgument);
-        assert_eq!(
-            err.message(),
-            "unknown ping target localhost:8080 of type volumeServer"
-        );
-    }
-
-    #[tokio::test]
-    async fn test_ping_current_master_target_passes_admission() {
-        // A target that matches the current (post-leader-change) master also
-        // clears admission, even if it is not in the seed list. Pick a port
-        // that is extremely unlikely to be live so the test does not flake on
-        // a developer machine that happens to be running a real master.
-        let (service, _tmp) = make_service_with_seed_masters(&["localhost:9333"]);
-        // Simulate the heartbeat goroutine having moved to a new leader.
-        *service.state.current_master_url.write().await = "127.0.0.1:1".to_string();
-
-        let result = service
-            .ping(Request::new(volume_server_pb::PingRequest {
-                target: "127.0.0.1:1".to_string(),
-                target_type: "master".to_string(),
-            }))
-            .await;
-        if let Err(err) = result {
-            assert_ne!(err.code(), tonic::Code::InvalidArgument, "got {err:?}");
-            assert!(
-                !err.message().contains("unknown ping target"),
-                "leader-change master should be admitted: {}",
-                err.message()
-            );
-        }
-    }
-
-    #[tokio::test]
-    async fn test_ping_target_with_grpc_port_suffix_is_normalised() {
-        // Seed masters in pb.ServerAddress form (`host:port.grpcPort`) must
-        // match a Ping target sent in plain `host:port` form, since the gate
-        // normalises both sides through to_http_address.
-        let (service, _tmp) = make_service_with_seed_masters(&["localhost:9333.19333"]);
-        let result = service
-            .ping(Request::new(volume_server_pb::PingRequest {
-                target: "localhost:9333".to_string(),
-                target_type: "master".to_string(),
-            }))
-            .await;
-        if let Err(err) = result {
-            assert_ne!(err.code(), tonic::Code::InvalidArgument, "got {err:?}");
-        }
-    }
-
     #[tokio::test]
     async fn test_volume_ec_shards_generate_persists_expire_at_sec() {
         let ttl = crate::storage::needle::ttl::TTL::read("3m").unwrap();

seaweed-volume/src/server/handlers.rs

@@ -23,27 +23,6 @@ use crate::pb::volume_server_pb;
 use crate::storage::needle::needle::Needle;
 use crate::storage::types::*;
 
-/// Slack added over the configured file-size limit when bounding the raw
-/// request body, to allow for multipart/form-data framing overhead. The exact
-/// per-file limit is still enforced on the parsed data after multipart parsing.
-const UPLOAD_BODY_OVERHEAD: usize = 16 * 1024 * 1024; // 16 MiB
-
-/// Upper bound on bytes we will materialize in memory for a single request when
-/// expanding stored content (gzip decompression or chunk-manifest assembly).
-/// Guards against gzip bombs and crafted/oversized manifest sizes OOM-killing
-/// the server; legitimate large objects are read via client-side chunk fetches.
-const MAX_EXPANSION_BYTES: u64 = 2 * 1024 * 1024 * 1024; // 2 GiB
-
-/// Why `maybe_decompress_gzip` failed, so callers can distinguish a recoverable
-/// "not valid gzip, use the raw bytes" from "the bomb cap was hit, reject it".
-#[derive(Debug)]
-enum GunzipError {
-    /// Input was not valid gzip / decode failed — callers may fall back to raw.
-    Decode,
-    /// Decompressed output would exceed `MAX_EXPANSION_BYTES` — must be rejected.
-    TooLarge,
-}
-
 // ============================================================================
 // Inflight Throttle Guard
 // ============================================================================
@@ -859,6 +838,8 @@ pub struct ReadQueryParams {
     pub response_content_disposition: Option<String>,
     /// Pretty print JSON response
     pub pretty: Option<String>,
+    /// JSONP callback function name
+    pub callback: Option<String>,
 }
 
 // ============================================================================
@@ -1038,44 +1019,43 @@ async fn get_or_head_handler_inner(
 
     if has_ec_volume && !has_volume {
         // ---- EC volume read path (always full read, no streaming) ----
-        //
-        // The distributed read path already does a local-first pass
-        // in its Snapshot phase under the same store read lock the
-        // legacy code would have taken — so calling it directly
-        // serves both the "all shards local" fast case and the
-        // "some intervals need peer fetch + reconstruct" general
-        // case without paying for the local interval reads twice.
-        match crate::server::store_ec::read_ec_shard_needle_distributed(
-            &state, vid, needle_id,
-        )
-        .await
-        {
-            Ok(Some(ec_needle)) => {
-                n = ec_needle;
-            }
-            Ok(None) => {
+        let store = state.store.read().unwrap();
+        match store.find_ec_volume(vid) {
+            Some(ecv) => match ecv.read_ec_shard_needle(needle_id) {
+                Ok(Some(ec_needle)) => {
+                    n = ec_needle;
+                }
+                Ok(None) => {
+                    metrics::HANDLER_COUNTER
+                        .with_label_values(&[metrics::ERROR_GET_NOT_FOUND])
+                        .inc();
+                    return StatusCode::NOT_FOUND.into_response();
+                }
+                Err(e) => {
+                    if e.kind() == std::io::ErrorKind::NotFound {
+                        metrics::HANDLER_COUNTER
+                            .with_label_values(&[metrics::ERROR_GET_NOT_FOUND])
+                            .inc();
+                        return StatusCode::NOT_FOUND.into_response();
+                    }
+                    metrics::HANDLER_COUNTER
+                        .with_label_values(&[metrics::ERROR_GET_INTERNAL])
+                        .inc();
+                    return (
+                        StatusCode::INTERNAL_SERVER_ERROR,
+                        format!("read ec error: {}", e),
+                    )
+                        .into_response();
+                }
+            },
+            None => {
                 metrics::HANDLER_COUNTER
                     .with_label_values(&[metrics::ERROR_GET_NOT_FOUND])
                     .inc();
                 return StatusCode::NOT_FOUND.into_response();
             }
-            Err(e) => {
-                let kind = if e.kind() == std::io::ErrorKind::NotFound {
-                    metrics::ERROR_GET_NOT_FOUND
-                } else {
-                    metrics::ERROR_GET_INTERNAL
-                };
-                metrics::HANDLER_COUNTER.with_label_values(&[kind]).inc();
-                if e.kind() == std::io::ErrorKind::NotFound {
-                    return StatusCode::NOT_FOUND.into_response();
-                }
-                return (
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    format!("ec read: {}", e),
-                )
-                    .into_response();
-            }
         }
+        drop(store);
 
         // Validate cookie (matches Go behavior after ReadEcShardNeedle)
         if n.cookie != cookie {
@@ -1473,16 +1453,12 @@ async fn get_or_head_handler_inner(
     if is_compressed {
         if needs_image_ops {
             // Always decompress for image operations (Go decompresses before resize/crop)
-            match maybe_decompress_gzip(&data) {
-                Ok(decompressed) => data = decompressed,
-                Err(GunzipError::TooLarge) => {
-                    return (
-                        StatusCode::PAYLOAD_TOO_LARGE,
-                        "compressed object exceeds decompression limit",
-                    )
-                        .into_response()
-                }
-                Err(GunzipError::Decode) => {} // not valid gzip; keep raw bytes
+            use flate2::read::GzDecoder;
+            use std::io::Read as _;
+            let mut decoder = GzDecoder::new(&data[..]);
+            let mut decompressed = Vec::new();
+            if decoder.read_to_end(&mut decompressed).is_ok() {
+                data = decompressed;
             }
         } else {
             let accept_encoding = headers
@@ -1499,16 +1475,12 @@ async fn get_or_head_handler_inner(
                 response_headers.insert(header::CONTENT_ENCODING, "gzip".parse().unwrap());
             } else {
                 // Decompress for client
-                match maybe_decompress_gzip(&data) {
-                    Ok(decompressed) => data = decompressed,
-                    Err(GunzipError::TooLarge) => {
-                        return (
-                            StatusCode::PAYLOAD_TOO_LARGE,
-                            "compressed object exceeds decompression limit",
-                        )
-                            .into_response()
-                    }
-                    Err(GunzipError::Decode) => {} // not valid gzip; keep raw bytes
+                use flate2::read::GzDecoder;
+                use std::io::Read as _;
+                let mut decoder = GzDecoder::new(&data[..]);
+                let mut decompressed = Vec::new();
+                if decoder.read_to_end(&mut decompressed).is_ok() {
+                    data = decompressed;
                 }
             }
         }
@@ -2163,30 +2135,15 @@ pub async fn post_handler(
         .and_then(|v| v.to_str().ok())
         .map(|s| s.to_string());
 
-    // Read body, bounded by the configured file-size limit so a single upload
-    // cannot buffer unbounded memory and OOM-kill the server (mirrors Go's
-    // io.LimitReader(r.Body, sizeLimit+1)). A margin covers multipart framing;
-    // the exact per-file limit is still enforced on the parsed data below.
-    let body_limit = if state.file_size_limit_bytes > 0 {
-        // try_from (not `as usize`) so a >usize::MAX limit on 32-bit caps at
-        // usize::MAX instead of silently truncating/wrapping to a tiny value.
-        usize::try_from(state.file_size_limit_bytes)
-            .unwrap_or(usize::MAX)
-            .saturating_add(UPLOAD_BODY_OVERHEAD)
-    } else {
-        usize::MAX
-    };
-    let body = match axum::body::to_bytes(request.into_body(), body_limit).await {
+    // Read body
+    let body = match axum::body::to_bytes(request.into_body(), usize::MAX).await {
         Ok(b) => b,
         Err(e) => {
-            // With a limit configured, an error here means the body exceeded it
-            // before we buffered the whole thing; report it like the size check.
-            let msg = if state.file_size_limit_bytes > 0 {
-                format!("file over the limited {} bytes", state.file_size_limit_bytes)
-            } else {
-                format!("read body: {}", e)
-            };
-            return json_error_with_query(StatusCode::BAD_REQUEST, msg, Some(&query));
+            return json_error_with_query(
+                StatusCode::BAD_REQUEST,
+                format!("read body: {}", e),
+                Some(&query),
+            )
         }
     };
 
@@ -2326,17 +2283,7 @@ pub async fn post_handler(
     };
 
     let uncompressed_data = if is_gzipped {
-        match maybe_decompress_gzip(&body_data_raw) {
-            Ok(d) => d,
-            Err(GunzipError::TooLarge) => {
-                return json_error_with_query(
-                    StatusCode::PAYLOAD_TOO_LARGE,
-                    "compressed object exceeds decompression limit",
-                    Some(&query),
-                );
-            }
-            Err(GunzipError::Decode) => body_data_raw.clone(),
-        }
+        maybe_decompress_gzip(&body_data_raw).unwrap_or_else(|| body_data_raw.clone())
     } else {
         body_data_raw.clone()
     };
@@ -2815,16 +2762,14 @@ pub async fn delete_handler(
     // If this is a chunk manifest, delete child chunks first
     if n.is_chunk_manifest() {
         let manifest_data = if n.is_compressed() {
-            match maybe_decompress_gzip(&n.data) {
-                Ok(d) => d,
-                Err(GunzipError::TooLarge) => {
-                    return json_error_with_query(
-                        StatusCode::PAYLOAD_TOO_LARGE,
-                        "compressed manifest exceeds decompression limit",
-                        Some(&del_query),
-                    );
-                }
-                Err(GunzipError::Decode) => n.data.clone(),
+            use flate2::read::GzDecoder;
+            use std::io::Read as _;
+            let mut decoder = GzDecoder::new(&n.data[..]);
+            let mut decompressed = Vec::new();
+            if decoder.read_to_end(&mut decompressed).is_ok() {
+                decompressed
+            } else {
+                n.data.clone()
             }
         } else {
             n.data.clone()
@@ -3180,19 +3125,14 @@ fn try_expand_chunk_manifest(
     last_modified_str: &Option<String>,
 ) -> Option<Response> {
     let data = if n.is_compressed() {
-        match maybe_decompress_gzip(&n.data) {
-            Ok(d) => d,
-            Err(GunzipError::TooLarge) => {
-                return Some(
-                    (
-                        StatusCode::PAYLOAD_TOO_LARGE,
-                        "compressed manifest exceeds decompression limit",
-                    )
-                        .into_response(),
-                )
-            }
-            Err(GunzipError::Decode) => return None,
+        use flate2::read::GzDecoder;
+        use std::io::Read as _;
+        let mut decoder = GzDecoder::new(&n.data[..]);
+        let mut decompressed = Vec::new();
+        if decoder.read_to_end(&mut decompressed).is_err() {
+            return None;
         }
+        decompressed
     } else {
         n.data.clone()
     };
@@ -3202,13 +3142,6 @@ fn try_expand_chunk_manifest(
         Err(_) => return None,
     };
 
-    // Guard the attacker-controlled manifest size before allocating: a negative
-    // value would wrap to a huge usize (capacity-overflow panic) and an oversized
-    // one would OOM-kill the server.
-    if manifest.size < 0 || manifest.size as u64 > MAX_EXPANSION_BYTES {
-        return None;
-    }
-
     // Read and concatenate all chunks
     let mut result = vec![0u8; manifest.size as usize];
     let store = state.store.read().unwrap();
@@ -3242,54 +3175,24 @@ fn try_expand_chunk_manifest(
                 )
             }
         }
-        // Validate the attacker-controlled chunk offset before indexing: a
-        // negative value would wrap to a huge usize, and an out-of-range one has
-        // nowhere to land.
-        if chunk.offset < 0 {
-            return Some(
-                (
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    format!("invalid negative chunk offset in {}", chunk.fid),
-                )
-                    .into_response(),
-            );
-        }
-        let offset = chunk.offset as usize;
-        if offset >= result.len() {
-            continue;
-        }
-        // Write the chunk into its window in `result`. Compressed chunks inflate
-        // directly into the destination slice (bounded by the remaining window),
-        // so a chunk never allocates a second large buffer — peak memory stays at
-        // ~manifest.size instead of doubling. Bytes past the window are dropped,
-        // matching the prior truncation behavior.
-        if chunk_needle.is_compressed() {
+        let chunk_data = if chunk_needle.is_compressed() {
             use flate2::read::GzDecoder;
             use std::io::Read as _;
             let mut decoder = GzDecoder::new(&chunk_needle.data[..]);
-            let window = &mut result[offset..];
-            let mut written = 0usize;
-            let mut decode_failed = false;
-            while written < window.len() {
-                match decoder.read(&mut window[written..]) {
-                    Ok(0) => break,
-                    Ok(n) => written += n,
-                    Err(_) => {
-                        decode_failed = true;
-                        break;
-                    }
-                }
-            }
-            // On any decode failure, drop the partial output and fall back to the
-            // chunk's raw bytes (truncated to the window), preserving prior behavior.
-            if decode_failed {
-                window[..written].fill(0);
-                let copy_len = chunk_needle.data.len().min(window.len());
-                window[..copy_len].copy_from_slice(&chunk_needle.data[..copy_len]);
+            let mut decompressed = Vec::new();
+            if decoder.read_to_end(&mut decompressed).is_ok() {
+                decompressed
+            } else {
+                chunk_needle.data.clone()
             }
         } else {
-            let copy_len = chunk_needle.data.len().min(result.len() - offset);
-            result[offset..offset + copy_len].copy_from_slice(&chunk_needle.data[..copy_len]);
+            chunk_needle.data.clone()
+        };
+        let offset = chunk.offset as usize;
+        let end = std::cmp::min(offset + chunk_data.len(), result.len());
+        let copy_len = end - offset;
+        if copy_len > 0 {
+            result[offset..offset + copy_len].copy_from_slice(&chunk_data[..copy_len]);
         }
     }
 
@@ -3498,6 +3401,10 @@ fn json_response_with_params<T: Serialize>(
     let is_pretty = params
         .and_then(|params| params.pretty.as_ref())
         .is_some_and(|value| !value.is_empty());
+    let callback = params
+        .and_then(|params| params.callback.as_ref())
+        .filter(|value| !value.is_empty())
+        .cloned();
 
     let json_body = if is_pretty {
         to_pretty_json(body)
@@ -3505,15 +3412,24 @@ fn json_response_with_params<T: Serialize>(
         serde_json::to_string(body).unwrap()
     };
 
-    Response::builder()
-        .status(status)
-        .header(header::CONTENT_TYPE, "application/json")
-        .header("X-Content-Type-Options", "nosniff")
-        .body(Body::from(json_body))
-        .unwrap()
+    if let Some(callback) = callback {
+        Response::builder()
+            .status(status)
+            .header(header::CONTENT_TYPE, "application/javascript")
+            .body(Body::from(format!("{}({})", callback, json_body)))
+            .unwrap()
+    } else {
+        Response::builder()
+            .status(status)
+            .header(header::CONTENT_TYPE, "application/json")
+            .body(Body::from(json_body))
+            .unwrap()
+    }
 }
 
-/// Return a JSON error response, honoring `?pretty=<any non-empty value>` for pretty-printed JSON.
+/// Return a JSON error response with optional query string for pretty/JSONP support.
+/// Supports `?pretty=<any non-empty value>` for pretty-printed JSON and `?callback=fn` for JSONP,
+/// matching Go's writeJsonError behavior.
 pub(super) fn json_error_with_query(
     status: StatusCode,
     msg: impl Into<String>,
@@ -3521,10 +3437,18 @@ pub(super) fn json_error_with_query(
 ) -> Response {
     let body = serde_json::json!({"error": msg.into()});
 
-    let is_pretty = query.is_some_and(|q| {
-        q.split('&')
-            .any(|p| p.starts_with("pretty=") && p.len() > "pretty=".len())
-    });
+    let (is_pretty, callback) = if let Some(q) = query {
+        let pretty = q
+            .split('&')
+            .any(|p| p.starts_with("pretty=") && p.len() > "pretty=".len());
+        let cb = q
+            .split('&')
+            .find_map(|p| p.strip_prefix("callback="))
+            .map(|s| s.to_string());
+        (pretty, cb)
+    } else {
+        (false, None)
+    };
 
     let json_body = if is_pretty {
         to_pretty_json(&body)
@@ -3532,19 +3456,35 @@ pub(super) fn json_error_with_query(
         serde_json::to_string(&body).unwrap()
     };
 
-    Response::builder()
-        .status(status)
-        .header(header::CONTENT_TYPE, "application/json")
-        .header("X-Content-Type-Options", "nosniff")
-        .body(Body::from(json_body))
-        .unwrap()
+    if let Some(cb) = callback {
+        let jsonp = format!("{}({})", cb, json_body);
+        Response::builder()
+            .status(status)
+            .header(header::CONTENT_TYPE, "application/javascript")
+            .body(Body::from(jsonp))
+            .unwrap()
+    } else {
+        Response::builder()
+            .status(status)
+            .header(header::CONTENT_TYPE, "application/json")
+            .body(Body::from(json_body))
+            .unwrap()
+    }
 }
 
-/// Return a JSON response honoring `?pretty=<any non-empty value>` from a raw query string.
+/// Return a JSON response with optional pretty/JSONP support from raw query string.
+/// Matches Go's writeJsonQuiet behavior for write success responses.
 fn json_result_with_query<T: Serialize>(status: StatusCode, body: &T, query: &str) -> Response {
-    let is_pretty = query
-        .split('&')
-        .any(|p| p.starts_with("pretty=") && p.len() > "pretty=".len());
+    let (is_pretty, callback) = {
+        let pretty = query
+            .split('&')
+            .any(|p| p.starts_with("pretty=") && p.len() > "pretty=".len());
+        let cb = query
+            .split('&')
+            .find_map(|p| p.strip_prefix("callback="))
+            .map(|s| s.to_string());
+        (pretty, cb)
+    };
 
     let json_body = if is_pretty {
         to_pretty_json(body)
@@ -3552,12 +3492,20 @@ fn json_result_with_query<T: Serialize>(status: StatusCode, body: &T, query: &st
         serde_json::to_string(body).unwrap()
     };
 
-    Response::builder()
-        .status(status)
-        .header(header::CONTENT_TYPE, "application/json")
-        .header("X-Content-Type-Options", "nosniff")
-        .body(Body::from(json_body))
-        .unwrap()
+    if let Some(cb) = callback {
+        let jsonp = format!("{}({})", cb, json_body);
+        Response::builder()
+            .status(status)
+            .header(header::CONTENT_TYPE, "application/javascript")
+            .body(Body::from(jsonp))
+            .unwrap()
+    } else {
+        Response::builder()
+            .status(status)
+            .header(header::CONTENT_TYPE, "application/json")
+            .body(Body::from(json_body))
+            .unwrap()
+    }
 }
 
 /// Extract JWT token from query param, Authorization header, or Cookie.
@@ -3662,22 +3610,13 @@ fn try_gzip_data(data: &[u8]) -> Option<Vec<u8>> {
     encoder.finish().ok()
 }
 
-fn maybe_decompress_gzip(data: &[u8]) -> Result<Vec<u8>, GunzipError> {
+fn maybe_decompress_gzip(data: &[u8]) -> Option<Vec<u8>> {
     use flate2::read::GzDecoder;
     use std::io::Read;
-    // Cap the output so a crafted, highly-compressible (gzip-bomb) needle cannot
-    // OOM the server when decompressed on read or upload. take(limit+1) lets us
-    // tell "exactly at the limit" apart from "over it", which we reject as
-    // TooLarge so callers fail the request instead of silently using raw bytes.
-    let mut decoder = GzDecoder::new(data).take(MAX_EXPANSION_BYTES + 1);
+    let mut decoder = GzDecoder::new(data);
     let mut decompressed = Vec::new();
-    decoder
-        .read_to_end(&mut decompressed)
-        .map_err(|_| GunzipError::Decode)?;
-    if decompressed.len() as u64 > MAX_EXPANSION_BYTES {
-        return Err(GunzipError::TooLarge);
-    }
-    Ok(decompressed)
+    decoder.read_to_end(&mut decompressed).ok()?;
+    Some(decompressed)
 }
 
 fn compute_md5_base64(data: &[u8]) -> String {
@@ -3919,11 +3858,7 @@ mod tests {
         let compressed = try_gzip_data(data).unwrap();
         let decompressed = maybe_decompress_gzip(&compressed).unwrap();
         assert_eq!(decompressed, data);
-        // Non-gzip input is reported as a decode error (callers fall back to raw).
-        assert!(matches!(
-            maybe_decompress_gzip(data),
-            Err(GunzipError::Decode)
-        ));
+        assert!(maybe_decompress_gzip(data).is_none());
     }
 
     #[test]

seaweed-volume/src/server/heartbeat.rs

@@ -314,7 +314,6 @@ fn collect_ec_shard_delta_messages(
                         disk_type: ec_vol.disk_type.to_string(),
                         expire_at_sec: ec_vol.expire_at_sec,
                         disk_id: disk_id as u32,
-                        encode_ts_ns: ec_vol.encode_ts_ns,
                         ..Default::default()
                     },
                 );
@@ -345,12 +344,6 @@ fn diff_ec_shard_delta_messages(
         if !current.contains_key(key) {
             let mut deleted = message.clone();
             deleted.shard_sizes = vec![0];
-            tracing::info!(
-                volume_id = deleted.id,
-                disk_id = deleted.disk_id,
-                ec_index_bits = deleted.ec_index_bits,
-                "deletes ec shards"
-            );
             deleted_ec_shards.push(deleted);
         }
     }
@@ -404,15 +397,6 @@ async fn do_heartbeat(
     let mut response_stream = client.send_heartbeat(stream).await?.into_inner();
 
     info!("Heartbeat stream established with {}", grpc_addr);
-    // Publish the master we're now talking to in canonical http host:port
-    // form so Ping admission can recognise it once a leader change moves us
-    // off the seed list. Mirrors Go's vs.setCurrentMaster(masterAddress).
-    {
-        let normalised =
-            super::volume_server::to_http_address(current_master).into_owned();
-        let mut guard = state.current_master_url.write().await;
-        *guard = normalised;
-    }
     if is_stopping(state) {
         state.is_heartbeating.store(false, Ordering::Relaxed);
         send_deregister_heartbeat(config, state, &tx).await;
@@ -876,7 +860,7 @@ fn build_heartbeat_with_ec_status(
         }
 
         for vid in delete_vids {
-            let _ = loc.delete_volume(vid, false, false);
+            let _ = loc.delete_volume(vid, false);
         }
     }
 
@@ -1049,8 +1033,6 @@ mod tests {
             read_mode: ReadMode::Local,
             master_url: String::new(),
             master_urls: Vec::new(),
-            seed_master_set: std::collections::HashSet::new(),
-            current_master_url: tokio::sync::RwLock::new(String::new()),
             self_url: String::new(),
             http_client: reqwest::Client::new(),
             outgoing_http_scheme: "http".to_string(),
@@ -1259,7 +1241,7 @@ mod tests {
         let shard_path = format!("{}/ec_metrics_case_27.ec00", dir);
         std::fs::write(&shard_path, b"ec-shard").unwrap();
         store.locations[0]
-            .mount_ec_shards(VolumeId(27), "ec_metrics_case", &[0], "")
+            .mount_ec_shards(VolumeId(27), "ec_metrics_case", &[0])
             .unwrap();
 
         let state = test_state_with_store(store);
@@ -1301,7 +1283,7 @@ mod tests {
 
         std::fs::write(format!("{}/expired_heartbeat_ec_31.ec00", dir), b"expired").unwrap();
         store.locations[0]
-            .mount_ec_shards(VolumeId(31), "expired_heartbeat_ec", &[0], "")
+            .mount_ec_shards(VolumeId(31), "expired_heartbeat_ec", &[0])
             .unwrap();
         store
             .find_ec_volume_mut(VolumeId(31))
@@ -1604,7 +1586,7 @@ mod tests {
 
         std::fs::write(format!("{}/ec_delta_case_81.ec00", dir), b"delta").unwrap();
         store.locations[0]
-            .mount_ec_shards(VolumeId(81), "ec_delta_case", &[0], "")
+            .mount_ec_shards(VolumeId(81), "ec_delta_case", &[0])
             .unwrap();
         let current = collect_ec_shard_delta_messages(&store);
         let (new_ec_shards, deleted_ec_shards) =

seaweed-volume/src/server/mod.rs

@@ -9,7 +9,6 @@ pub mod memory_status;
 pub mod profiling;
 pub mod request_id;
 pub mod server_stats;
-pub mod store_ec;
 pub mod ui;
 pub mod volume_server;
 pub mod write_queue;

seaweed-volume/src/server/store_ec.rs

@@ -1,705 +0,0 @@
-//! Distributed EC read path. Mirror of `weed/storage/store_ec.go`'s
-//! `readEcShardIntervals` → `readOneEcShardInterval` →
-//! `readRemoteEcShardInterval` → `recoverOneRemoteEcShardInterval`
-//! chain.
-//!
-//! The existing `EcVolume::read_ec_shard_needle` reads only locally-
-//! mounted shards and returns `NotFound` if any interval requires a
-//! shard held on a peer server. In a standard RS(10,4)-across-14
-//! deployment each server holds one shard, so every read needs >=9
-//! peer fetches. This module fills the gap by:
-//!
-//!   1. Locating the needle in `.ecx` (under the Store read lock) and
-//!      computing the per-interval (shard_id, shard_offset, size).
-//!   2. Reading the local-resident intervals while still holding the
-//!      lock — same path the local-only helper uses.
-//!   3. Dropping the lock and, for any remaining intervals, fetching
-//!      from peer volume servers via `VolumeEcShardRead`. If the
-//!      direct peer read fails, fan-out reads to other shards at the
-//!      same (shard_offset, size) and rebuild the missing shard via
-//!      Reed-Solomon — exactly Go's flow.
-//!   4. Refreshing the per-EcVolume `shard_locations` cache from the
-//!      master's `LookupEcVolume` RPC when the cached map is stale.
-//!
-//! All gRPC IO is async; the file IO portion runs under the sync
-//! Store read lock, matching Go's `readLocalEcShardInterval`. The
-//! cache write-back briefly reacquires the EcVolume's internal
-//! `RwLock` so we do not contend with the Store-level lock at all.
-
-use std::collections::HashMap;
-use std::io;
-use std::sync::Arc;
-use std::time::{Duration, Instant};
-
-use futures::future::join_all;
-use reed_solomon_erasure::galois_8::ReedSolomon;
-use tonic::Request;
-
-use crate::pb::master_pb::{self, seaweed_client::SeaweedClient, LookupEcVolumeRequest};
-use crate::pb::volume_server_pb::{
-    volume_server_client::VolumeServerClient, VolumeEcShardReadRequest,
-};
-use crate::server::grpc_client::{build_grpc_endpoint, parse_grpc_address, GRPC_MAX_MESSAGE_SIZE};
-use crate::server::request_id::outgoing_request_id_interceptor;
-use crate::server::volume_server::VolumeServerState;
-use crate::storage::erasure_coding::ec_shard::ShardId;
-use crate::storage::needle::needle::{get_actual_size, Needle};
-use crate::storage::types::*;
-
-/// One interval's data after Phase A.
-enum IntervalResult {
-    /// Already read from a locally-mounted shard.
-    Local(Vec<u8>),
-    /// Shard not local (or local read failed). Must be fetched.
-    NeedRemote {
-        shard_id: ShardId,
-        shard_offset: i64,
-        size: usize,
-    },
-}
-
-/// Snapshot extracted under the Store read lock so Phases B/C can run
-/// without holding any sync lock across `.await`.
-struct Snapshot {
-    data_shards: u32,
-    parity_shards: u32,
-    version: Version,
-    actual_size: usize,
-    offset: Offset,
-    size_for_parse: Size,
-    intervals: Vec<IntervalResult>,
-    cached_locations: HashMap<ShardId, Vec<String>>,
-    cache_refreshed_at: Option<Instant>,
-    /// This volume's encode identity, carried to peers on remote shard reads so a
-    /// shard from a different encode run is rejected rather than served at a
-    /// mismatched offset. 0 for a pre-feature volume (lenient).
-    encode_ts_ns: i64,
-}
-
-/// Top-level entry point. Returns `Ok(None)` for "not found" (matches
-/// Go's `ReadEcShardNeedle`); errors propagate as `io::Error`.
-pub async fn read_ec_shard_needle_distributed(
-    state: &Arc<VolumeServerState>,
-    vid: VolumeId,
-    needle_id: NeedleId,
-) -> io::Result<Option<Needle>> {
-    // Phase A — under the Store read lock, locate the needle, compute
-    // intervals, and read any locally-mounted shard intervals. We must
-    // not `.await` while holding this guard (std::sync::RwLockReadGuard
-    // is !Send).
-    let snapshot = match snapshot_under_lock(state, vid, needle_id)? {
-        Some(s) => s,
-        None => return Ok(None),
-    };
-
-    // Phase B — refresh the shard_locations cache from the master if
-    // it is stale. Do this lazily: if every needed interval was read
-    // locally we can skip the master RPC entirely.
-    let any_remote = snapshot
-        .intervals
-        .iter()
-        .any(|r| matches!(r, IntervalResult::NeedRemote { .. }));
-    let total_shards = (snapshot.data_shards + snapshot.parity_shards) as usize;
-
-    let mut shard_locations = snapshot.cached_locations.clone();
-    if any_remote
-        && needs_refresh(
-            &shard_locations,
-            snapshot.cache_refreshed_at,
-            snapshot.data_shards as usize,
-            total_shards,
-        )
-    {
-        match cached_lookup_ec_shard_locations(state, vid).await {
-            Ok(fresh) => {
-                shard_locations = fresh.clone();
-                write_back_shard_locations(state, vid, fresh);
-            }
-            Err(e) => {
-                // Lookup failed — proceed with cached values. If cache
-                // is empty, the remote fetch below will fail and we
-                // surface a NotFound (matching Go's behavior when no
-                // locations are known).
-                tracing::warn!(
-                    "ec lookup failed for volume {}: {} — using cached locations ({} entries)",
-                    vid.0,
-                    e,
-                    shard_locations.len(),
-                );
-            }
-        }
-    }
-
-    // Phase C — fetch missing intervals, reconstructing when the
-    // direct peer read fails.
-    let mut assembled: Vec<Vec<u8>> = Vec::with_capacity(snapshot.intervals.len());
-    for res in snapshot.intervals {
-        match res {
-            IntervalResult::Local(buf) => assembled.push(buf),
-            IntervalResult::NeedRemote {
-                shard_id,
-                shard_offset,
-                size,
-            } => {
-                let buf = fetch_one_interval(
-                    state,
-                    vid,
-                    needle_id,
-                    shard_id,
-                    shard_offset,
-                    size,
-                    &shard_locations,
-                    snapshot.data_shards as usize,
-                    snapshot.parity_shards as usize,
-                    snapshot.encode_ts_ns,
-                )
-                .await?;
-                assembled.push(buf);
-            }
-        }
-    }
-
-    // Phase D — assemble and parse the Needle. Mirrors the tail of
-    // `EcVolume::read_ec_shard_needle`.
-    let mut bytes = Vec::with_capacity(snapshot.actual_size);
-    for chunk in assembled {
-        bytes.extend_from_slice(&chunk);
-    }
-    bytes.truncate(snapshot.actual_size);
-    if bytes.len() < snapshot.actual_size {
-        return Err(io::Error::new(
-            io::ErrorKind::UnexpectedEof,
-            format!(
-                "read {} bytes but need {} for needle {}",
-                bytes.len(),
-                snapshot.actual_size,
-                needle_id
-            ),
-        ));
-    }
-
-    let mut n = Needle::default();
-    n.id = needle_id;
-    n.read_bytes(
-        &bytes,
-        snapshot.offset.to_actual_offset(),
-        snapshot.size_for_parse,
-        snapshot.version,
-    )
-    .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, format!("{}", e)))?;
-    Ok(Some(n))
-}
-
-fn snapshot_under_lock(
-    state: &Arc<VolumeServerState>,
-    vid: VolumeId,
-    needle_id: NeedleId,
-) -> io::Result<Option<Snapshot>> {
-    let store = state.store.read().unwrap();
-    let ecv = match store.find_ec_volume(vid) {
-        Some(v) => v,
-        None => return Ok(None),
-    };
-
-    // Reuse EcVolume::locate_needle for offset/size resolution AND
-    // the per-needle shard-interval math — it's the same routine the
-    // local-only read path uses, so we stay byte-identical on the
-    // shard-size + interval boundaries.
-    let (offset, size, intervals) = match ecv.locate_needle(needle_id)? {
-        Some(v) => v,
-        None => return Ok(None),
-    };
-    if intervals.is_empty() {
-        return Err(io::Error::new(
-            io::ErrorKind::InvalidData,
-            "no intervals for needle",
-        ));
-    }
-    let actual = get_actual_size(size, ecv.version);
-
-    // Phase A.local: for each interval read the local shard if we
-    // hold it; otherwise fall through to remote. We accumulate the
-    // results in interval order so the assembly step is just a
-    // concat.
-    let mut interval_results = Vec::with_capacity(intervals.len());
-    for interval in &intervals {
-        let (shard_id, shard_offset) = interval.to_shard_id_and_offset(ecv.data_shards);
-        let buf_size = interval.size as usize;
-        let local = ecv
-            .shards
-            .get(shard_id as usize)
-            .and_then(|s| s.as_ref());
-        match local {
-            Some(shard) => {
-                let mut buf = vec![0u8; buf_size];
-                match shard.read_at(&mut buf, shard_offset as u64) {
-                    Ok(n) if n == buf_size => {
-                        interval_results.push(IntervalResult::Local(buf));
-                    }
-                    _ => interval_results.push(IntervalResult::NeedRemote {
-                        shard_id,
-                        shard_offset,
-                        size: buf_size,
-                    }),
-                }
-            }
-            None => interval_results.push(IntervalResult::NeedRemote {
-                shard_id,
-                shard_offset,
-                size: buf_size,
-            }),
-        }
-    }
-
-    let cached_locations = ecv.shard_locations.read().unwrap().clone();
-    let cache_refreshed_at = *ecv.shard_locations_refresh_time.lock().unwrap();
-
-    Ok(Some(Snapshot {
-        data_shards: ecv.data_shards,
-        parity_shards: ecv.parity_shards,
-        version: ecv.version,
-        actual_size: actual as usize,
-        offset,
-        size_for_parse: size,
-        intervals: interval_results,
-        cached_locations,
-        cache_refreshed_at,
-        encode_ts_ns: ecv.encode_ts_ns,
-    }))
-}
-
-/// Master `LookupEcVolume` freshness rules — match Go's
-/// `cachedLookupEcShardLocations` thresholds in store_ec.go.
-fn needs_refresh(
-    locations: &HashMap<ShardId, Vec<String>>,
-    refreshed_at: Option<Instant>,
-    data_shards: usize,
-    total_shards: usize,
-) -> bool {
-    let now = Instant::now();
-    let age = match refreshed_at {
-        Some(t) => now.saturating_duration_since(t),
-        None => return true,
-    };
-    let shard_count = locations.len();
-    if shard_count < data_shards && age < Duration::from_secs(11) {
-        return false;
-    }
-    if shard_count == total_shards && age < Duration::from_secs(37 * 60) {
-        return false;
-    }
-    if shard_count >= data_shards && age < Duration::from_secs(7 * 60) {
-        return false;
-    }
-    true
-}
-
-async fn cached_lookup_ec_shard_locations(
-    state: &Arc<VolumeServerState>,
-    vid: VolumeId,
-) -> io::Result<HashMap<ShardId, Vec<String>>> {
-    let master = {
-        let live = state.current_master_url.read().await.clone();
-        if !live.is_empty() {
-            live
-        } else {
-            state.master_url.clone()
-        }
-    };
-    if master.is_empty() {
-        return Err(io::Error::new(
-            io::ErrorKind::Other,
-            "no master configured for ec shard lookup",
-        ));
-    }
-
-    let grpc_addr = parse_grpc_address(&master)
-        .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
-    let endpoint = build_grpc_endpoint(&grpc_addr, state.outgoing_grpc_tls.as_ref())
-        .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
-    let channel = endpoint
-        .connect_timeout(Duration::from_secs(5))
-        .timeout(Duration::from_secs(10))
-        .connect()
-        .await
-        .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("master connect: {}", e)))?;
-
-    let mut client = SeaweedClient::with_interceptor(channel, outgoing_request_id_interceptor)
-        .max_decoding_message_size(GRPC_MAX_MESSAGE_SIZE)
-        .max_encoding_message_size(GRPC_MAX_MESSAGE_SIZE);
-
-    let resp = client
-        .lookup_ec_volume(Request::new(LookupEcVolumeRequest { volume_id: vid.0 }))
-        .await
-        .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("lookup_ec_volume: {}", e)))?;
-    let resp = resp.into_inner();
-
-    let mut out = HashMap::new();
-    for entry in resp.shard_id_locations {
-        let addrs: Vec<String> = entry
-            .locations
-            .iter()
-            .map(format_location_as_server_address)
-            .collect();
-        out.insert(entry.shard_id as ShardId, addrs);
-    }
-    Ok(out)
-}
-
-fn write_back_shard_locations(
-    state: &Arc<VolumeServerState>,
-    vid: VolumeId,
-    locations: HashMap<ShardId, Vec<String>>,
-) {
-    let store = state.store.read().unwrap();
-    if let Some(ecv) = store.find_ec_volume(vid) {
-        // Atomic swap + freshness stamp so a concurrent reader sees
-        // either the prior cache or the fresh one — never an
-        // intermediate half-replaced map with the freshness flag
-        // already flipped.
-        ecv.replace_shard_locations(locations);
-    }
-}
-
-/// Build a SeaweedFS-style `host:httpPort.grpcPort` address from a
-/// master `Location` so the result is what `parse_grpc_address` (and
-/// the heartbeat path) already understand.
-fn format_location_as_server_address(loc: &master_pb::Location) -> String {
-    let raw = loc
-        .url
-        .trim_start_matches("http://")
-        .trim_start_matches("https://");
-    if loc.grpc_port > 0 {
-        if let Some((host, http_port)) = raw.rsplit_once(':') {
-            return format!("{}:{}.{}", host, http_port, loc.grpc_port);
-        }
-    }
-    raw.to_string()
-}
-
-/// Try direct peer read; on failure, reconstruct via Reed-Solomon
-/// from the other shards. Mirrors `readOneEcShardInterval`'s tail.
-async fn fetch_one_interval(
-    state: &Arc<VolumeServerState>,
-    vid: VolumeId,
-    needle_id: NeedleId,
-    shard_id: ShardId,
-    shard_offset: i64,
-    size: usize,
-    shard_locations: &HashMap<ShardId, Vec<String>>,
-    data_shards: usize,
-    parity_shards: usize,
-    expected_encode_ts_ns: i64,
-) -> io::Result<Vec<u8>> {
-    // Direct peer read against the cached locations for this shard.
-    if let Some(sources) = shard_locations.get(&shard_id) {
-        if !sources.is_empty() {
-            match read_remote_ec_shard_interval(
-                state,
-                sources,
-                vid,
-                needle_id,
-                shard_id,
-                shard_offset,
-                size,
-                expected_encode_ts_ns,
-            )
-            .await
-            {
-                Ok(buf) => return Ok(buf),
-                Err(e) => {
-                    tracing::debug!(
-                        "direct read ec shard {}.{} from {:?} failed: {} — will reconstruct",
-                        vid.0,
-                        shard_id,
-                        sources,
-                        e
-                    );
-                }
-            }
-        }
-    }
-
-    // Reconstruct: fan-out reads to every other shard at the same
-    // (shard_offset, size). Mirrors `recoverOneRemoteEcShardInterval`.
-    recover_one_remote_ec_shard_interval(
-        state,
-        vid,
-        needle_id,
-        shard_id,
-        shard_offset,
-        size,
-        shard_locations,
-        data_shards,
-        parity_shards,
-        expected_encode_ts_ns,
-    )
-    .await
-}
-
-async fn read_remote_ec_shard_interval(
-    state: &Arc<VolumeServerState>,
-    sources: &[String],
-    vid: VolumeId,
-    needle_id: NeedleId,
-    shard_id: ShardId,
-    shard_offset: i64,
-    size: usize,
-    expected_encode_ts_ns: i64,
-) -> io::Result<Vec<u8>> {
-    let mut last_err: Option<io::Error> = None;
-    for src in sources {
-        match do_read_remote_ec_shard_interval(
-            state,
-            src,
-            vid,
-            needle_id,
-            shard_id,
-            shard_offset,
-            size,
-            expected_encode_ts_ns,
-        )
-        .await
-        {
-            Ok(buf) => return Ok(buf),
-            Err(e) => last_err = Some(e),
-        }
-    }
-    Err(last_err.unwrap_or_else(|| {
-        io::Error::new(
-            io::ErrorKind::NotFound,
-            format!("no source for ec shard {}.{}", vid.0, shard_id),
-        )
-    }))
-}
-
-async fn do_read_remote_ec_shard_interval(
-    state: &Arc<VolumeServerState>,
-    source: &str,
-    vid: VolumeId,
-    needle_id: NeedleId,
-    shard_id: ShardId,
-    shard_offset: i64,
-    size: usize,
-    expected_encode_ts_ns: i64,
-) -> io::Result<Vec<u8>> {
-    let grpc_addr =
-        parse_grpc_address(source).map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
-    let endpoint = build_grpc_endpoint(&grpc_addr, state.outgoing_grpc_tls.as_ref())
-        .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
-    let channel = endpoint
-        .connect_timeout(Duration::from_secs(5))
-        .timeout(Duration::from_secs(30))
-        .connect()
-        .await
-        .map_err(|e| {
-            io::Error::new(
-                io::ErrorKind::Other,
-                format!("connect to {}: {}", source, e),
-            )
-        })?;
-
-    // TODO(grpc-jwt): clusters with `jwt.signing.key` configured will
-    // reject peer-to-peer VolumeEcShardRead calls until the Rust
-    // crate grows an outgoing-JWT interceptor. The gap is shared
-    // with every other peer gRPC call from this binary
-    // (`copy_file_from_source`, `batch_delete`, …) — handling it
-    // here in isolation would split the credential plumbing across
-    // call sites. Re-visit when outgoing JWT signing lands as a
-    // server-wide helper.
-    let mut client = VolumeServerClient::with_interceptor(channel, outgoing_request_id_interceptor)
-        .max_decoding_message_size(GRPC_MAX_MESSAGE_SIZE)
-        .max_encoding_message_size(GRPC_MAX_MESSAGE_SIZE);
-
-    let req = VolumeEcShardReadRequest {
-        volume_id: vid.0,
-        shard_id: shard_id as u32,
-        offset: shard_offset,
-        size: size as i64,
-        file_key: needle_id.0,
-        encode_ts_ns: expected_encode_ts_ns,
-    };
-    let resp = client
-        .volume_ec_shard_read(Request::new(req))
-        .await
-        .map_err(|e| {
-            io::Error::new(
-                io::ErrorKind::Other,
-                format!("volume_ec_shard_read {}.{} from {}: {}", vid.0, shard_id, source, e),
-            )
-        })?;
-    let mut stream = resp.into_inner();
-
-    let mut out = Vec::with_capacity(size);
-    while let Some(msg) = stream
-        .message()
-        .await
-        .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("recv: {}", e)))?
-    {
-        // Validate the served shard's identity client-side, so the guard holds even
-        // against a pre-upgrade server that ignored the request field (returns 0).
-        // A mismatch fails the read; the caller recovers from parity.
-        if expected_encode_ts_ns != 0 && msg.encode_ts_ns != expected_encode_ts_ns {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!(
-                    "ec shard {}.{} from {} belongs to a different encode run (want {} got {})",
-                    vid.0, shard_id, source, expected_encode_ts_ns, msg.encode_ts_ns
-                ),
-            ));
-        }
-        if !msg.data.is_empty() {
-            out.extend_from_slice(&msg.data);
-        }
-    }
-    if out.len() < size {
-        return Err(io::Error::new(
-            io::ErrorKind::UnexpectedEof,
-            format!(
-                "short read from {} for ec shard {}.{}: got {} want {}",
-                source,
-                vid.0,
-                shard_id,
-                out.len(),
-                size
-            ),
-        ));
-    }
-    out.truncate(size);
-    Ok(out)
-}
-
-async fn recover_one_remote_ec_shard_interval(
-    state: &Arc<VolumeServerState>,
-    vid: VolumeId,
-    needle_id: NeedleId,
-    shard_id_to_recover: ShardId,
-    shard_offset: i64,
-    size: usize,
-    shard_locations: &HashMap<ShardId, Vec<String>>,
-    data_shards: usize,
-    parity_shards: usize,
-    expected_encode_ts_ns: i64,
-) -> io::Result<Vec<u8>> {
-    let total_shards = data_shards + parity_shards;
-    let rs = ReedSolomon::new(data_shards, parity_shards).map_err(|e| {
-        io::Error::new(
-            io::ErrorKind::Other,
-            format!("reed-solomon init: {:?}", e),
-        )
-    })?;
-
-    let mut bufs: Vec<Option<Vec<u8>>> = vec![None; total_shards];
-
-    // Phase 0: seed bufs from LOCALLY mounted shards. If this node
-    // already holds enough sibling shards, reconstruction completes
-    // without any peer fan-out — and even with a cold/incomplete
-    // shard_locations cache or a failed master lookup, local
-    // survivors still contribute. Mirrors Go's
-    // recoverOneRemoteEcShardInterval behaviour, which is implicitly
-    // local-aware because the Store fan-out targets ALL known
-    // locations (including the caller's own server address); the
-    // Rust port had been remote-only, so reconstructing with a cold
-    // cache failed even when enough siblings were on disk.
-    {
-        let store = state.store.read().unwrap();
-        if let Some(ecv) = store.find_ec_volume(vid) {
-            for sid in 0..total_shards {
-                if sid as ShardId == shard_id_to_recover {
-                    continue;
-                }
-                if let Some(Some(shard)) = ecv.shards.get(sid) {
-                    let mut buf = vec![0u8; size];
-                    if shard.read_at(&mut buf, shard_offset as u64).map(|n| n == size).unwrap_or(false) {
-                        bufs[sid] = Some(buf);
-                    }
-                }
-            }
-        }
-    }
-
-    // Phase 1: remote fan-out — one task per known shard location
-    // we DON'T already have locally and DON'T need to recover.
-    let mut tasks = Vec::new();
-    for (sid, locs) in shard_locations {
-        if *sid == shard_id_to_recover || locs.is_empty() {
-            continue;
-        }
-        if bufs[*sid as usize].is_some() {
-            continue;
-        }
-        let sid = *sid;
-        let locs = locs.clone();
-        let state = state.clone();
-        tasks.push(async move {
-            let res = read_remote_ec_shard_interval(
-                &state,
-                &locs,
-                vid,
-                needle_id,
-                sid,
-                shard_offset,
-                size,
-                expected_encode_ts_ns,
-            )
-            .await;
-            (sid, res)
-        });
-    }
-    let results = join_all(tasks).await;
-
-    for (sid, res) in results {
-        match res {
-            Ok(buf) => {
-                if (sid as usize) < total_shards {
-                    bufs[sid as usize] = Some(buf);
-                }
-            }
-            Err(e) => {
-                tracing::debug!(
-                    "recover: read {}.{} for needle {} failed: {}",
-                    vid.0,
-                    sid,
-                    needle_id,
-                    e
-                );
-            }
-        }
-    }
-
-    let available = bufs.iter().filter(|b| b.is_some()).count();
-    if available < data_shards {
-        return Err(io::Error::new(
-            io::ErrorKind::Other,
-            format!(
-                "cannot recover ec shard {}.{}: only {} shards available, need at least {}",
-                vid.0, shard_id_to_recover, available, data_shards
-            ),
-        ));
-    }
-
-    rs.reconstruct(&mut bufs).map_err(|e| {
-        io::Error::new(
-            io::ErrorKind::Other,
-            format!(
-                "reed-solomon reconstruct ec shard {}.{}: {:?}",
-                vid.0, shard_id_to_recover, e
-            ),
-        )
-    })?;
-
-    match bufs.into_iter().nth(shard_id_to_recover as usize).flatten() {
-        Some(buf) => Ok(buf),
-        None => Err(io::Error::new(
-            io::ErrorKind::Other,
-            format!(
-                "reconstructed buffer for shard {}.{} missing after RS reconstruct",
-                vid.0, shard_id_to_recover
-            ),
-        )),
-    }
-}
-
-// parse_grpc_address lives in `grpc_client.rs` and is re-exported
-// here via the use above so this module shares a single
-// HTTP↔gRPC port-translation routine with grpc_server.rs.

seaweed-volume/src/server/volume_server.rs

@@ -81,16 +81,6 @@ pub struct VolumeServerState {
     pub master_url: String,
     /// Seed master addresses for UI rendering.
     pub master_urls: Vec<String>,
-    /// Canonical http `host:port` form of every configured seed master.
-    /// Built once at construction so Ping admission stays O(1). Mirrors
-    /// Go's `seedMasterSet` on `VolumeServer`.
-    pub seed_master_set: std::collections::HashSet<String>,
-    /// Current master this server is heartbeating with, in canonical http
-    /// `host:port` form. Empty when no heartbeat connection is active. The
-    /// heartbeat goroutine writes; admission reads — the lock keeps them
-    /// from racing on a leader change. Mirrors Go's `currentMaster` plus
-    /// `currentMasterLock`.
-    pub current_master_url: tokio::sync::RwLock<String>,
     /// This server's own address (ip:port) for filtering self from lookup results.
     pub self_url: String,
     /// HTTP client for proxy requests and master lookups.
@@ -127,35 +117,6 @@ impl VolumeServerState {
         }
         Ok(())
     }
-
-    /// Build the seed master set from a list of raw `host:port[.grpcPort]`
-    /// addresses, normalised the same way Go's `pb.ServerAddress.ToHttpAddress`
-    /// does (drop the `.grpcPort` suffix, preserve everything else).
-    pub fn build_seed_master_set(master_urls: &[String]) -> std::collections::HashSet<String> {
-        master_urls
-            .iter()
-            .map(|m| to_http_address(m).into_owned())
-            .collect()
-    }
-
-    /// Returns true iff `target` (normalised to canonical http `host:port`)
-    /// is a master this server already knows about. Volume servers do not
-    /// keep a peer-volume or peer-filer list, so Ping is scoped to masters.
-    /// Mirrors Go's `VolumeServer.isKnownPingTarget`.
-    pub async fn is_known_ping_target(&self, target: &str, target_type: &str) -> bool {
-        if target_type != "master" {
-            return false;
-        }
-        let key = to_http_address(target).into_owned();
-        if key.is_empty() {
-            return false;
-        }
-        let current = self.current_master_url.read().await.clone();
-        if !current.is_empty() && current == key {
-            return true;
-        }
-        self.seed_master_set.contains(&key)
-    }
 }
 
 pub fn build_metrics_router() -> Router {

seaweed-volume/src/server/write_queue.rs

@@ -207,8 +207,6 @@ mod tests {
             read_mode: crate::config::ReadMode::Local,
             master_url: String::new(),
             master_urls: Vec::new(),
-            seed_master_set: std::collections::HashSet::new(),
-            current_master_url: tokio::sync::RwLock::new(String::new()),
             self_url: String::new(),
             http_client: reqwest::Client::new(),
             outgoing_http_scheme: "http".to_string(),

seaweed-volume/src/storage/disk_location.rs

@@ -10,7 +10,7 @@ use std::io;
 use std::sync::atomic::{AtomicBool, AtomicI32, AtomicU64, Ordering};
 use std::sync::Arc;
 
-use tracing::warn;
+use tracing::{info, warn};
 
 use crate::config::MinFreeSpace;
 use crate::storage::erasure_coding::ec_shard::{
@@ -19,11 +19,9 @@ use crate::storage::erasure_coding::ec_shard::{
 };
 use crate::storage::erasure_coding::ec_volume::EcVolume;
 use crate::storage::needle_map::NeedleMapKind;
-use crate::storage::super_block::{ReplicaPlacement, SUPER_BLOCK_SIZE};
+use crate::storage::super_block::ReplicaPlacement;
 use crate::storage::types::*;
-use crate::storage::volume::{
-    remove_volume_files, volume_file_name, VifVolumeInfo, Volume, VolumeError,
-};
+use crate::storage::volume::{remove_volume_files, volume_file_name, Volume, VolumeError};
 
 /// A single disk location managing volumes in one directory.
 pub struct DiskLocation {
@@ -106,12 +104,6 @@ impl DiskLocation {
             fs::create_dir_all(&self.idx_directory)?;
         }
 
-        // Recover any interrupted compaction commit before the volume scan. This
-        // must run here, not inside the .dat loop: that loop is keyed on .dat
-        // files and would miss the marker-only or already-renamed-.idx states a
-        // mid-commit crash can leave behind.
-        self.reconcile_compact_states();
-
         // Scan for .dat files
         let entries = fs::read_dir(&self.directory)?;
         let mut dat_files: Vec<(String, VolumeId)> = Vec::new();
@@ -131,9 +123,16 @@ impl DiskLocation {
             let volume_name = volume_file_name(&self.directory, &collection, vid);
             let idx_name = volume_file_name(&self.idx_directory, &collection, vid);
 
-            // Sweep a leftover empty `.dat` stub (a phantom from the pre-fix
-            // loader) before it loads as a phantom volume or blocks startup.
-            if remove_empty_ec_dat_stub(&volume_name, &idx_name, vid) {
+            // Check for incomplete volume (.note file means a VolumeCopy was interrupted)
+            let note_path = format!("{}.note", volume_name);
+            if std::path::Path::new(&note_path).exists() {
+                let note = fs::read_to_string(&note_path).unwrap_or_default();
+                warn!(
+                    volume_id = vid.0,
+                    "volume was not completed: {}, removing files", note
+                );
+                remove_volume_files(&volume_name);
+                remove_volume_files(&idx_name);
                 continue;
             }
 
@@ -157,36 +156,21 @@ impl DiskLocation {
                         volume_id = vid.0,
                         "EC volume validation failed, removing incomplete EC files"
                     );
-                    let _ = self.remove_ec_volume_files(&collection, vid);
+                    self.remove_ec_volume_files(&collection, vid);
                     // Fall through to load .dat file
                 }
             }
 
-            // Stale .cpd/.cpx temp files were already rolled forward or back by
-            // the reconcile_compact_states pre-pass above.
-
-            // Check for an incomplete volume (.note means a VolumeCopy was
-            // interrupted). This runs BELOW the empty-stub sweep and EC
-            // validation: when an .ecx for this vid coexists on the disk, the
-            // regular and EC volumes share <base>.vif, so removing the
-            // incomplete regular copy must keep the .vif (keep_vif=true) or it
-            // would strip the EC volume's info file.
-            let note_path = format!("{}.note", volume_name);
-            if std::path::Path::new(&note_path).exists() {
-                let note = fs::read_to_string(&note_path).unwrap_or_default();
-                warn!(
-                    volume_id = vid.0,
-                    "volume was not completed: {}, removing files", note
-                );
-                // Re-check .ecx now (not the pre-validation ecx_exists): the
-                // invalid-EC cleanup above may have removed it, in which case
-                // the .vif is no longer shared and must not be preserved.
-                let keep_vif = std::path::Path::new(&ecx_path).exists()
-                    || (self.idx_directory != self.directory
-                        && std::path::Path::new(&format!("{}.ecx", volume_name)).exists());
-                remove_volume_files(&volume_name, keep_vif);
-                remove_volume_files(&idx_name, keep_vif);
-                continue;
+            // Clean up stale compaction temp files
+            let cpd_path = format!("{}.cpd", volume_name);
+            let cpx_path = format!("{}.cpx", idx_name);
+            if std::path::Path::new(&cpd_path).exists() {
+                info!(volume_id = vid.0, "removing stale compaction file .cpd");
+                let _ = fs::remove_file(&cpd_path);
+            }
+            if std::path::Path::new(&cpx_path).exists() {
+                info!(volume_id = vid.0, "removing stale compaction file .cpx");
+                let _ = fs::remove_file(&cpx_path);
             }
 
             // Skip if already loaded (e.g., from a previous call)
@@ -194,26 +178,6 @@ impl DiskLocation {
                 continue;
             }
 
-            // Load existing data only; never create a phantom `.dat`. A lone
-            // `.vif`/`.idx` (e.g. an EC sidecar whose `.ecx` is on a sibling
-            // disk) would otherwise have Volume::new write an 8-byte stub that
-            // the sibling-.dat prune deletes real shards against. Remote-tiered
-            // volumes also have no local `.dat`, but their `.vif` points at
-            // remote files and must still load via the remote path.
-            // Plain existence check (not check_dat_file_exists): an empty
-            // .dat here is a fresh, needle-less volume that must still load.
-            // A stat error other than NotFound counts as present so a
-            // transient error doesn't skip a real volume.
-            let dat_path = format!("{}.dat", volume_name);
-            let dat_missing = matches!(fs::metadata(&dat_path),
-                Err(ref e) if e.kind() == io::ErrorKind::NotFound);
-            if dat_missing
-                && !vif_references_remote_file(&format!("{}.vif", volume_name))
-                && !vif_references_remote_file(&format!("{}.vif", idx_name))
-            {
-                continue;
-            }
-
             match Volume::new(
                 &self.directory,
                 &self.idx_directory,
@@ -250,78 +214,22 @@ impl DiskLocation {
         Ok(())
     }
 
-    /// Directory pre-pass that recovers interrupted compaction commits. Collects
-    /// every volume id that still has a .cpc commit marker or a leftover
-    /// .cpd/.cpx temp file across the data and idx directories, then rolls the
-    /// swap forward (marker present) or back (marker absent) per volume.
-    fn reconcile_compact_states(&self) {
-        let mut pending: HashSet<(String, VolumeId)> = HashSet::new();
-        let mut collect = |dir: &str| {
-            if let Ok(entries) = fs::read_dir(dir) {
-                for entry in entries.flatten() {
-                    let name = entry.file_name().into_string().unwrap_or_default();
-                    let stem = name
-                        .strip_suffix(".cpc")
-                        .or_else(|| name.strip_suffix(".cpd"))
-                        .or_else(|| name.strip_suffix(".cpx"));
-                    if let Some(stem) = stem {
-                        if let Some(key) = parse_collection_volume_id(stem) {
-                            pending.insert(key);
-                        }
-                    }
-                }
-            }
-        };
-        collect(&self.directory);
-        if self.idx_directory != self.directory {
-            collect(&self.idx_directory);
-        }
-
-        for (collection, vid) in pending {
-            // On a runtime reload (SIGHUP), an already-loaded volume may be
-            // mid-vacuum: its .cpd/.cpx are live, not crash leftovers, and
-            // rolling them back would clobber the in-flight compaction. Only
-            // reconcile vids not currently loaded; genuine startup recovery
-            // runs before any volume is loaded.
-            if self.volumes.contains_key(&vid) {
-                continue;
-            }
-            let v = Volume::new_unloaded(&self.directory, &self.idx_directory, &collection, vid);
-            if let Err(e) = v.reconcile_compact_state() {
-                warn!(volume_id = vid.0, error = %e, "reconcile interrupted compaction failed");
-            }
-        }
-    }
-
-    /// Reports whether the EC files for (collection, vid) on this disk may be
-    /// deleted to reclaim the local .dat. Returns false (delete) only when that
-    /// provably loses no data; every ambiguity returns true (keep), since the
-    /// shards may be the only copy. Mirrors Go's validateEcVolume.
+    /// Validate EC volume shards: all shards must be same size, and if .dat exists,
+    /// need at least DATA_SHARDS_COUNT shards with size matching expected.
     fn validate_ec_volume(&self, collection: &str, vid: VolumeId) -> bool {
         let base = volume_file_name(&self.directory, collection, vid);
         let dat_path = format!("{}.dat", base);
 
-        // Custom ratio comes from the volume's own .vif; the server holds no
-        // cluster EC config in memory.
-        let data_shards =
-            ec_data_shards_from_vif(&self.directory, &self.idx_directory, collection, vid);
-
-        // On-disk .dat: an empty <= superblock one is a stub; a transient stat
-        // error keeps the shards rather than deleting.
         let mut expected_shard_size: Option<i64> = None;
-        let dat_exists = match fs::metadata(&dat_path) {
-            Ok(meta) if meta.len() > SUPER_BLOCK_SIZE as u64 => {
-                expected_shard_size =
-                    Some(calculate_expected_shard_size(meta.len() as i64, data_shards));
-                true
+        let dat_exists = std::path::Path::new(&dat_path).exists();
+
+        if dat_exists {
+            if let Ok(meta) = fs::metadata(&dat_path) {
+                expected_shard_size = Some(calculate_expected_shard_size(meta.len() as i64));
+            } else {
+                return false;
             }
-            Ok(_) => false,
-            Err(e) if e.kind() == io::ErrorKind::NotFound => false,
-            Err(e) => {
-                warn!(volume_id = vid.0, error = %e, "cannot stat .dat; keeping EC shards");
-                return true;
-            }
-        };
+        }
 
         let mut shard_count = 0usize;
         let mut actual_shard_size: Option<i64> = None;
@@ -334,10 +242,14 @@ impl DiskLocation {
                     let size = meta.len() as i64;
                     if let Some(prev) = actual_shard_size {
                         if size != prev {
-                            // Inconsistent sizes signal corruption or mixed
-                            // generations; not trusted for deletion -> keep.
-                            warn!(volume_id = vid.0, shard = i, size, expected = prev, "EC shard size mismatch; keeping shards");
-                            return true;
+                            warn!(
+                                volume_id = vid.0,
+                                shard = i,
+                                size,
+                                expected = prev,
+                                "EC shard size mismatch"
+                            );
+                            return false;
                         }
                     } else {
                         actual_shard_size = Some(size);
@@ -345,112 +257,71 @@ impl DiskLocation {
                     shard_count += 1;
                 }
                 Err(e) if e.kind() != io::ErrorKind::NotFound => {
-                    warn!(volume_id = vid.0, shard = i, error = %e, "cannot stat EC shard; keeping shards");
-                    return true;
+                    warn!(
+                        volume_id = vid.0,
+                        shard = i,
+                        error = %e,
+                        "failed to stat EC shard"
+                    );
+                    return false;
                 }
                 _ => {} // not found or zero size — skip
             }
         }
 
-        if !dat_exists {
-            return true; // distributed EC; any shard count is valid
-        }
-
-        // Reclaim only when it loses no data. Shards smaller than this .dat's
-        // full encode are an interrupted encode whose .dat is the complete
-        // source -> reclaim. Shards >= expected (valid/distributing EC, or a
-        // stale/partial .dat beside larger real shards) may be the only copy -> keep.
-        if shard_count == 0 {
-            return false;
-        }
-        if let (Some(actual), Some(expected)) = (actual_shard_size, expected_shard_size) {
-            if actual < expected {
-                warn!(volume_id = vid.0, actual, expected, "shards smaller than the .dat's full encode; reclaiming the complete .dat");
-                return false;
+        // If .dat exists, validate shard size matches expected
+        if dat_exists {
+            if let (Some(actual), Some(expected)) = (actual_shard_size, expected_shard_size) {
+                if actual != expected {
+                    warn!(
+                        volume_id = vid.0,
+                        actual_shard_size = actual,
+                        expected_shard_size = expected,
+                        "EC shard size doesn't match .dat file"
+                    );
+                    return false;
+                }
             }
         }
+
+        // Distributed EC (no .dat): any shard count is valid
+        if !dat_exists {
+            return true;
+        }
+
+        // With .dat: need at least DATA_SHARDS_COUNT shards
+        if shard_count < DATA_SHARDS_COUNT {
+            warn!(
+                volume_id = vid.0,
+                shard_count,
+                required = DATA_SHARDS_COUNT,
+                "EC volume has .dat but too few shards"
+            );
+            return false;
+        }
+
         true
     }
 
     /// Remove all EC-related files for a volume.
-    /// `pub(crate)` so the Store-level cross-disk passes in
-    /// `store_ec_reconcile.rs` can call it to scrub partial EC artefacts
-    /// when a healthy `.dat` for the same vid lives on a sibling disk
-    /// (seaweedfs/seaweedfs#9478).
-    pub(crate) fn remove_ec_volume_files(&self, collection: &str, vid: VolumeId) -> io::Result<()> {
+    fn remove_ec_volume_files(&self, collection: &str, vid: VolumeId) {
         let base = volume_file_name(&self.directory, collection, vid);
         let idx_base = volume_file_name(&self.idx_directory, collection, vid);
         const MAX_SHARD_COUNT: usize = 32;
 
         // Remove index files from idx directory (.ecx, .ecj)
-        rm_if_present(format!("{}.ecx", idx_base))?;
-        rm_if_present(format!("{}.ecj", idx_base))?;
+        let _ = fs::remove_file(format!("{}.ecx", idx_base));
+        let _ = fs::remove_file(format!("{}.ecj", idx_base));
         // Also try data directory in case .ecx/.ecj were created before -dir.idx was configured
         if self.idx_directory != self.directory {
-            rm_if_present(format!("{}.ecx", base))?;
-            rm_if_present(format!("{}.ecj", base))?;
+            let _ = fs::remove_file(format!("{}.ecx", base));
+            let _ = fs::remove_file(format!("{}.ecj", base));
         }
 
         // Remove all EC shard files (.ec00 ~ .ec31)
         for i in 0..MAX_SHARD_COUNT {
-            rm_if_present(format!("{}.ec{:02}", base, i))?;
+            let _ = fs::remove_file(format!("{}.ec{:02}", base, i));
         }
-        Ok(())
-    }
-
-    /// Full-teardown variant: everything remove_ec_volume_files clears, PLUS the
-    /// normal-volume <base>.vif on a SHARD-ONLY node. An interrupted shard copy
-    /// (which installs shards + .ecx before .vif) could otherwise mount a fresh
-    /// generation under the prior run's identity / ratio / dat_file_size carried by
-    /// a stale .vif. Gated on .idx absence so a source-volume holder keeps its live
-    /// .vif. Reconcile/load-fallback call remove_ec_volume_files directly and
-    /// intentionally preserve it, mirroring Go's removeEcVolumeFiles (reconcile) vs
-    /// removeStaleEcArtifacts (teardown) split.
-    pub(crate) fn remove_ec_volume_files_full_teardown(
-        &self,
-        collection: &str,
-        vid: VolumeId,
-    ) -> io::Result<()> {
-        self.remove_ec_volume_files(collection, vid)?;
-        let base = volume_file_name(&self.directory, collection, vid);
-        let idx_base = volume_file_name(&self.idx_directory, collection, vid);
-        // try_exists, not exists(): a stat error on a PRESENT .idx must not read as
-        // "shard-only" and delete a live source volume's .vif. Only Ok(false) (genuine
-        // NotFound) clears it; on a stat error stay conservative and keep the sidecar.
-        if matches!(
-            std::path::Path::new(&format!("{}.idx", idx_base)).try_exists(),
-            Ok(false)
-        ) {
-            rm_if_present(format!("{}.vif", idx_base))?;
-            if self.idx_directory != self.directory
-                && matches!(
-                    std::path::Path::new(&format!("{}.idx", base)).try_exists(),
-                    Ok(false)
-                )
-            {
-                rm_if_present(format!("{}.vif", base))?;
-            }
-        }
-        Ok(())
-    }
-
-    /// EC encode generation recorded in this disk's .vif (data dir first, then idx
-    /// dir for the split-disk layout). None if no .vif was readable, so the fenced
-    /// teardown preserves it (fail-safe). A present .vif with no ec_shard_config
-    /// yields Some(0) (a recovered or pre-upgrade live volume), also preserved.
-    pub(crate) fn ec_generation_ts_ns(&self, collection: &str, vid: VolumeId) -> Option<i64> {
-        for dir in [&self.directory, &self.idx_directory] {
-            let vif = format!("{}.vif", volume_file_name(dir, collection, vid));
-            if let Ok(s) = fs::read_to_string(&vif) {
-                if let Ok(vi) = serde_json::from_str::<VifVolumeInfo>(&s) {
-                    return Some(vi.ec_shard_config.map(|c| c.encode_ts_ns).unwrap_or(0));
-                }
-            }
-            if self.directory == self.idx_directory {
-                break;
-            }
-        }
-        None
     }
 
     /// Find a volume by ID.
@@ -515,20 +386,13 @@ impl DiskLocation {
         }
     }
 
-    /// Remove, close, and delete all files for a volume. When keep_remote_data
-    /// is true the cloud-tier object backing the volume is left intact — used
-    /// by moves where another server is taking over the same .vif.
-    pub fn delete_volume(
-        &mut self,
-        vid: VolumeId,
-        only_empty: bool,
-        keep_remote_data: bool,
-    ) -> Result<(), VolumeError> {
+    /// Remove, close, and delete all files for a volume.
+    pub fn delete_volume(&mut self, vid: VolumeId, only_empty: bool) -> Result<(), VolumeError> {
         if let Some(mut v) = self.volumes.remove(&vid) {
             crate::metrics::VOLUME_GAUGE
                 .with_label_values(&[&v.collection, "volume"])
                 .dec();
-            v.destroy(only_empty, keep_remote_data)?;
+            v.destroy(only_empty)?;
             Ok(())
         } else {
             Err(VolumeError::NotFound)
@@ -549,7 +413,7 @@ impl DiskLocation {
                 crate::metrics::VOLUME_GAUGE
                     .with_label_values(&[&v.collection, "volume"])
                     .dec();
-                if let Err(e) = v.destroy(false, false) {
+                if let Err(e) = v.destroy(false) {
                     warn!(volume_id = vid.0, error = %e, "delete collection: failed to destroy volume");
                 }
             }
@@ -729,22 +593,14 @@ impl DiskLocation {
     }
 
     /// Mount EC shards for a volume on this location.
-    ///
-    /// `source_disk_type` is the source volume's disk type carried on the
-    /// `VolumeEcShardsMount` RPC. When non-empty it overrides the in-memory
-    /// EC volume's reported disk type so heartbeats keep reporting under
-    /// the source's disk type after EC encoding (#9423). Empty means "use
-    /// this location's disk type" — used by disk-scan reload paths that
-    /// have no orchestrator context.
     pub fn mount_ec_shards(
         &mut self,
         vid: VolumeId,
         collection: &str,
         shard_ids: &[u32],
-        source_disk_type: &str,
     ) -> Result<(), VolumeError> {
         let idx_dir = self.idx_directory.clone();
-        self.mount_ec_shards_with_idx_dir(vid, collection, shard_ids, &idx_dir, source_disk_type)
+        self.mount_ec_shards_with_idx_dir(vid, collection, shard_ids, &idx_dir)
     }
 
     /// Mount EC shards but explicitly specify the idx directory the
@@ -764,7 +620,6 @@ impl DiskLocation {
         collection: &str,
         shard_ids: &[u32],
         idx_dir: &str,
-        source_disk_type: &str,
     ) -> Result<(), VolumeError> {
         let dir = self.directory.clone();
         // Avoid the entry().or_insert_with() pattern here: that closure
@@ -781,22 +636,10 @@ impl DiskLocation {
             .ec_volumes
             .get_mut(&vid)
             .expect("just inserted above");
-        // When the orchestrator supplied a source disk type on the Mount
-        // RPC, override the EC volume's disk type so heartbeats report
-        // under the source volume's disk type (#9423). When the caller
-        // passed "" (disk-scan reload, orphan-shard reconcile, restart)
-        // we only default to this location's disk type for a fresh EC
-        // volume; otherwise we leave whatever a prior RPC mount set in
-        // place, so empty-source reloads don't reintroduce the drift.
-        if !source_disk_type.is_empty() {
-            ec_vol.set_disk_type(DiskType::from_string(source_disk_type));
-        } else if ec_vol.shard_count() == 0 {
-            ec_vol.set_disk_type(self.disk_type.clone());
-        }
+        ec_vol.disk_type = self.disk_type.clone();
 
         for &shard_id in shard_ids {
-            let mut shard = EcVolumeShard::new(&dir, collection, vid, shard_id as u8);
-            shard.disk_type = ec_vol.disk_type.clone();
+            let shard = EcVolumeShard::new(&dir, collection, vid, shard_id as u8);
             ec_vol.add_shard(shard).map_err(VolumeError::Io)?;
             crate::metrics::VOLUME_GAUGE
                 .with_label_values(&[collection, "ec_shards"])
@@ -949,23 +792,34 @@ impl DiskLocation {
                 volume_id = vid.0,
                 "Incomplete or invalid EC volume: .dat exists but validation failed, cleaning up EC files",
             );
-            let _ = self.remove_ec_volume_files(collection, vid);
+            self.remove_ec_volume_files(collection, vid);
             return;
         }
 
         let shard_ids: Vec<u32> = shards.iter().map(|(_, sid)| *sid).collect();
-        if let Err(e) = self.mount_ec_shards(vid, collection, &shard_ids, "") {
-            // A mount failure (corrupt/locked .ecx, EMFILE, transient I/O) is
-            // not proof the shards are disposable -- validate_ec_volume already
-            // decided they may be the only copy. Release partially-mounted
-            // shards (mirror-decrements the metric) but keep the files; never
-            // delete on a load error.
-            warn!(
-                volume_id = vid.0,
-                "Failed to load EC shards: {}; keeping files for retry",
-                e,
-            );
-            self.unmount_ec_shards(vid, &shard_ids);
+        if let Err(e) = self.mount_ec_shards(vid, collection, &shard_ids) {
+            // mount_ec_shards adds shards one at a time and increments
+            // the per-shard metric for each. If it fails halfway, plain
+            // ec_volumes.remove(vid) would leak metric increments for
+            // the shards that did mount. Drive cleanup through
+            // unmount_ec_shards which mirror-decrements the metric, then
+            // the empty EcVolume drops itself.
+            if dat_exists {
+                warn!(
+                    volume_id = vid.0,
+                    "Failed to load EC shards and .dat exists ({}), cleaning up EC files to use .dat",
+                    e,
+                );
+                self.unmount_ec_shards(vid, &shard_ids);
+                self.remove_ec_volume_files(collection, vid);
+            } else {
+                warn!(
+                    volume_id = vid.0,
+                    "Failed to load EC shards: {} (this may be normal for distributed EC volumes)",
+                    e,
+                );
+                self.unmount_ec_shards(vid, &shard_ids);
+            }
         }
     }
 
@@ -991,7 +845,7 @@ impl DiskLocation {
                 "Found {} EC shards without .ecx file (incomplete encoding interrupted before .ecx), cleaning up",
                 shards.len(),
             );
-            let _ = self.remove_ec_volume_files(collection, vid);
+            self.remove_ec_volume_files(collection, vid);
             return true;
         }
         false
@@ -1052,14 +906,14 @@ pub fn get_disk_stats(path: &str) -> (u64, u64) {
 /// Calculate expected EC shard size from .dat file size.
 /// Matches Go's `calculateExpectedShardSize`: large blocks (1GB * data_shards) first,
 /// then small blocks (1MB * data_shards) for the remainder.
-fn calculate_expected_shard_size(dat_file_size: i64, data_shards: usize) -> i64 {
-    let large_batch_size = ERASURE_CODING_LARGE_BLOCK_SIZE as i64 * data_shards as i64;
+fn calculate_expected_shard_size(dat_file_size: i64) -> i64 {
+    let large_batch_size = ERASURE_CODING_LARGE_BLOCK_SIZE as i64 * DATA_SHARDS_COUNT as i64;
     let num_large_batches = dat_file_size / large_batch_size;
     let mut shard_size = num_large_batches * ERASURE_CODING_LARGE_BLOCK_SIZE as i64;
     let remaining = dat_file_size - (num_large_batches * large_batch_size);
 
     if remaining > 0 {
-        let small_batch_size = ERASURE_CODING_SMALL_BLOCK_SIZE as i64 * data_shards as i64;
+        let small_batch_size = ERASURE_CODING_SMALL_BLOCK_SIZE as i64 * DATA_SHARDS_COUNT as i64;
         // Ceiling division
         let num_small_batches = (remaining + small_batch_size - 1) / small_batch_size;
         shard_size += num_small_batches * ERASURE_CODING_SMALL_BLOCK_SIZE as i64;
@@ -1068,39 +922,6 @@ fn calculate_expected_shard_size(dat_file_size: i64, data_shards: usize) -> i64
     shard_size
 }
 
-/// Resolve the EC data-shard count from the volume's own `.vif` (the volume
-/// server never holds the cluster EC config in memory), checking the data dir
-/// then the idx dir. Falls back to the default ratio when no EC `.vif` is found.
-/// Remove a file, treating a missing file as success but propagating real errors
-/// (permissions, disk full). Mirrors Go's removeFileIfExists so a teardown failure
-/// surfaces instead of silently leaving stale artifacts.
-fn rm_if_present(path: String) -> io::Result<()> {
-    match fs::remove_file(&path) {
-        Err(e) if e.kind() != io::ErrorKind::NotFound => Err(e),
-        _ => Ok(()),
-    }
-}
-
-fn ec_data_shards_from_vif(directory: &str, idx_directory: &str, collection: &str, vid: VolumeId) -> usize {
-    for dir in [directory, idx_directory] {
-        let vif = format!("{}.vif", volume_file_name(dir, collection, vid));
-        if let Some(ds) = fs::read_to_string(&vif)
-            .ok()
-            .and_then(|s| serde_json::from_str::<VifVolumeInfo>(&s).ok())
-            .and_then(|vi| vi.ec_shard_config)
-            .map(|c| c.data_shards as usize)
-        {
-            if ds > 0 {
-                return ds;
-            }
-        }
-        if directory == idx_directory {
-            break;
-        }
-    }
-    DATA_SHARDS_COUNT
-}
-
 /// Parse a volume filename like "collection_42.dat" or "42.dat" into (collection, VolumeId).
 /// Parse a `<collection>_<vid>` or `<vid>` base name into its parts.
 /// Mirrors `parseCollectionVolumeId` in
@@ -1154,77 +975,31 @@ fn parse_ec_shard_extension(ext: &str) -> Option<u32> {
     Some(id)
 }
 
-/// Robust check that a `.dat` with actual data exists. An empty `.dat`
-/// (<= a superblock, zero needles) is a leftover stub, not an encode source,
-/// and counts as absent so it never justifies deleting shards. Any unexpected
-/// stat error (permission, I/O) is treated as "exists" so we don't misclassify
-/// local EC as distributed EC. Mirrors `checkDatFileExists` in Go.
+/// Robust `.dat` existence check: any unexpected stat error (permission,
+/// I/O) is treated as "exists" so we don't misclassify local EC as
+/// distributed EC. Mirrors `checkDatFileExists` in Go.
 fn check_dat_file_exists(path: &str) -> bool {
     match fs::metadata(path) {
-        Ok(meta) => meta.len() > SUPER_BLOCK_SIZE as u64,
+        Ok(_) => true,
         Err(e) if e.kind() == io::ErrorKind::NotFound => false,
         Err(_) => true,
     }
 }
 
-/// True when a `.vif` references remote-tier files: a remote-only volume
-/// that has no local `.dat` but must still load via the remote path,
-/// rather than be skipped as a lone EC sidecar.
-fn vif_references_remote_file(vif_path: &str) -> bool {
-    fs::read_to_string(vif_path)
-        .ok()
-        .and_then(|s| serde_json::from_str::<VifVolumeInfo>(&s).ok())
-        .map(|vif| !vif.files.is_empty())
-        .unwrap_or(false)
-}
-
-/// True when a `.vif` records an EC shard config, i.e. the volume was
-/// erasure-coded. Such a volume keeps no local `.dat`, so an empty `.dat`
-/// alongside it is a leftover stub safe to remove.
-fn vif_is_ec_volume(vif_path: &str) -> bool {
-    fs::read_to_string(vif_path)
-        .ok()
-        .and_then(|s| serde_json::from_str::<VifVolumeInfo>(&s).ok())
-        .map(|vif| vif.ec_shard_config.is_some())
-        .unwrap_or(false)
-}
-
-/// Remove a leftover empty EC `.dat` stub and return whether one was swept.
-///
-/// A stub is an empty `.dat` (<= a superblock, i.e. zero needles) whose `.vif`
-/// records an EC shard config. An EC volume keeps no local `.dat`, so the stub
-/// holds no data — its shards live on other servers. Such stubs (phantoms from
-/// the pre-fix loader) otherwise load as phantom empty volumes, and a same-vid
-/// stub on two disks blocks startup via the duplicate-vid check. The `.dat` and
-/// its empty `.idx` are removed; non-EC empty `.dat` files are left alone. The
-/// `.vif` is looked up in both the data and idx directories (which differ only
-/// when `-dir.idx` is configured), each read at most once.
-fn remove_empty_ec_dat_stub(volume_name: &str, idx_name: &str, vid: VolumeId) -> bool {
-    let dat_path = format!("{}.dat", volume_name);
-    match fs::metadata(&dat_path) {
-        Ok(meta) if meta.len() <= SUPER_BLOCK_SIZE as u64 => {}
-        _ => return false,
-    }
-
-    let data_vif = format!("{}.vif", volume_name);
-    let idx_vif = format!("{}.vif", idx_name);
-    let is_ec = vif_is_ec_volume(&data_vif) || (idx_vif != data_vif && vif_is_ec_volume(&idx_vif));
-    if !is_ec {
-        return false;
-    }
-
-    warn!(volume_id = vid.0, "removing leftover empty .dat stub for EC volume");
-    let _ = fs::remove_file(&dat_path);
-    let _ = fs::remove_file(format!("{}.idx", idx_name));
-    true
-}
-
 fn parse_volume_filename(filename: &str) -> Option<(String, VolumeId)> {
     let stem = filename
         .strip_suffix(".dat")
         .or_else(|| filename.strip_suffix(".vif"))
         .or_else(|| filename.strip_suffix(".idx"))?;
-    parse_collection_volume_id(stem)
+    if let Some(pos) = stem.rfind('_') {
+        let collection = &stem[..pos];
+        let id_str = &stem[pos + 1..];
+        let id: u32 = id_str.parse().ok()?;
+        Some((collection.to_string(), VolumeId(id)))
+    } else {
+        let id: u32 = stem.parse().ok()?;
+        Some((String::new(), VolumeId(id)))
+    }
 }
 
 // ============================================================================
@@ -1236,138 +1011,6 @@ mod tests {
     use super::*;
     use tempfile::TempDir;
 
-    /// When `-dir.idx` is configured the EC `.vif` may live in the idx
-    /// directory; the sweep must look there too, not only the data dir.
-    #[test]
-    fn test_remove_empty_ec_dat_stub_finds_vif_in_idx_dir() {
-        let tmp = TempDir::new().unwrap();
-        let data = tmp.path().join("data");
-        let idx = tmp.path().join("idx");
-        std::fs::create_dir_all(&data).unwrap();
-        std::fs::create_dir_all(&idx).unwrap();
-        let vbase = format!("{}/warp-cal_42", data.to_str().unwrap());
-        let ibase = format!("{}/warp-cal_42", idx.to_str().unwrap());
-        std::fs::write(format!("{}.dat", vbase), vec![0u8; 8]).unwrap();
-
-        let vif = VifVolumeInfo {
-            version: 3,
-            ec_shard_config: Some(crate::storage::volume::VifEcShardConfig {
-                data_shards: 10,
-                parity_shards: 4,
-                ..Default::default()
-            }),
-            ..Default::default()
-        };
-        std::fs::write(format!("{}.vif", ibase), serde_json::to_string(&vif).unwrap()).unwrap();
-
-        assert!(
-            remove_empty_ec_dat_stub(&vbase, &ibase, VolumeId(42)),
-            "EC .vif in the idx dir should be found and the stub removed",
-        );
-        assert!(!std::path::Path::new(&format!("{}.dat", vbase)).exists());
-    }
-
-    // The headline geometry: a stale/partial .dat (e.g. an interrupted decode)
-    // smaller than the volume's real source sits next to the full-size shards
-    // that are the only copy. validate_ec_volume must keep the shards.
-    #[test]
-    fn test_validate_ec_volume_partial_dat_next_to_full_shards_keeps() {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-        let loc = DiskLocation::new(dir, dir, 10, DiskType::HardDrive, MinFreeSpace::Percent(1.0), Vec::new()).unwrap();
-        let base = volume_file_name(dir, "", VolumeId(70));
-        let ds = crate::storage::erasure_coding::ec_shard::DATA_SHARDS_COUNT;
-        let full = calculate_expected_shard_size(30 * 1024 * 1024, ds);
-        for i in 0..ds {
-            std::fs::File::create(format!("{}.ec{:02}", base, i)).unwrap().set_len(full as u64).unwrap();
-        }
-        // Partial .dat: bigger than a superblock so it is not swept as a stub,
-        // but smaller than what these shards encode.
-        std::fs::File::create(format!("{}.dat", base)).unwrap().set_len(5 * 1024 * 1024).unwrap();
-        assert!(
-            loc.validate_ec_volume("", VolumeId(70)),
-            "full-size shards beside a smaller (stale/partial) .dat must be kept",
-        );
-    }
-
-    // The legitimate cleanup: a full source .dat next to shards SMALLER than it
-    // would encode (an interrupted encode). The .dat is the complete source, so
-    // reclaiming it loses no data.
-    #[test]
-    fn test_validate_ec_volume_interrupted_encode_reclaims() {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-        let loc = DiskLocation::new(dir, dir, 10, DiskType::HardDrive, MinFreeSpace::Percent(1.0), Vec::new()).unwrap();
-        let base = volume_file_name(dir, "", VolumeId(71));
-        let ds = crate::storage::erasure_coding::ec_shard::DATA_SHARDS_COUNT;
-        let dat_size = 30 * 1024 * 1024i64;
-        std::fs::File::create(format!("{}.dat", base)).unwrap().set_len(dat_size as u64).unwrap();
-        let partial = calculate_expected_shard_size(dat_size, ds) / 3;
-        assert!(partial > 0);
-        for i in 0..ds {
-            std::fs::File::create(format!("{}.ec{:02}", base, i)).unwrap().set_len(partial as u64).unwrap();
-        }
-        assert!(
-            !loc.validate_ec_volume("", VolumeId(71)),
-            "shards smaller than the full source .dat should be reclaimable",
-        );
-    }
-
-    // The per-disk generation reader behind the fenced EC teardown: a present .vif
-    // yields its generation (or 0 with no EC config), a missing .vif is unreadable
-    // (preserved, fail-safe), and the idx dir is a fallback for the split-disk layout.
-    #[test]
-    fn test_ec_generation_ts_ns_reads_and_fences() {
-        let tmp = TempDir::new().unwrap();
-        let data = tmp.path().join("data");
-        let idx = tmp.path().join("idx");
-        std::fs::create_dir_all(&data).unwrap();
-        std::fs::create_dir_all(&idx).unwrap();
-        let loc = DiskLocation::new(
-            data.to_str().unwrap(),
-            idx.to_str().unwrap(),
-            10,
-            DiskType::HardDrive,
-            MinFreeSpace::Percent(1.0),
-            Vec::new(),
-        )
-        .unwrap();
-        let vid = VolumeId(88);
-        let dbase = volume_file_name(data.to_str().unwrap(), "", vid);
-        let ibase = volume_file_name(idx.to_str().unwrap(), "", vid);
-
-        // No .vif anywhere -> unreadable (the fenced teardown preserves on None).
-        assert_eq!(loc.ec_generation_ts_ns("", vid), None);
-
-        // .vif in the data dir carries its generation.
-        let with_gen = VifVolumeInfo {
-            version: 3,
-            ec_shard_config: Some(crate::storage::volume::VifEcShardConfig {
-                data_shards: 10,
-                parity_shards: 4,
-                encode_ts_ns: 4242,
-                ..Default::default()
-            }),
-            ..Default::default()
-        };
-        std::fs::write(format!("{}.vif", dbase), serde_json::to_string(&with_gen).unwrap()).unwrap();
-        assert_eq!(loc.ec_generation_ts_ns("", vid), Some(4242));
-
-        // A .vif with no EC config reads as generation 0 (recovered/pre-upgrade live volume).
-        std::fs::remove_file(format!("{}.vif", dbase)).unwrap();
-        let no_cfg = VifVolumeInfo {
-            version: 3,
-            ..Default::default()
-        };
-        std::fs::write(format!("{}.vif", dbase), serde_json::to_string(&no_cfg).unwrap()).unwrap();
-        assert_eq!(loc.ec_generation_ts_ns("", vid), Some(0));
-
-        // idx-dir fallback: only the idx dir holds the .vif.
-        std::fs::remove_file(format!("{}.vif", dbase)).unwrap();
-        std::fs::write(format!("{}.vif", ibase), serde_json::to_string(&with_gen).unwrap()).unwrap();
-        assert_eq!(loc.ec_generation_ts_ns("", vid), Some(4242));
-    }
-
     #[test]
     fn test_parse_volume_filename() {
         assert_eq!(
@@ -1514,7 +1157,7 @@ mod tests {
         .unwrap();
         assert_eq!(loc.volumes_len(), 2);
 
-        loc.delete_volume(VolumeId(1), false, false).unwrap();
+        loc.delete_volume(VolumeId(1), false).unwrap();
         assert_eq!(loc.volumes_len(), 1);
         assert!(loc.find_volume(VolumeId(1)).is_none());
     }
@@ -1587,7 +1230,7 @@ mod tests {
         let shard_path = format!("{}/pics_7.ec00", dir);
         std::fs::write(&shard_path, b"ec-shard").unwrap();
 
-        loc.mount_ec_shards(VolumeId(7), "pics", &[0], "").unwrap();
+        loc.mount_ec_shards(VolumeId(7), "pics", &[0]).unwrap();
         assert!(loc.has_ec_volume(VolumeId(7)));
         assert!(std::path::Path::new(&shard_path).exists());
         assert!(std::path::Path::new(&format!("{}/pics_7.ecj", dir)).exists());
@@ -1599,56 +1242,6 @@ mod tests {
         assert!(!std::path::Path::new(&format!("{}/pics_7.ecj", dir)).exists());
     }
 
-    /// #9423: after an RPC `VolumeEcShardsMount` records the source
-    /// volume's disk type on the EcVolume, a later empty-source mount
-    /// call (disk-scan reload, orphan-shard reconcile, restart) must
-    /// not clobber that override back to the physical location's disk
-    /// type — otherwise heartbeat reporting drifts back to "hdd" on
-    /// every reload.
-    #[test]
-    fn test_mount_ec_shards_empty_source_preserves_existing_disk_type() {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-        let mut loc = DiskLocation::new(
-            dir,
-            dir,
-            10,
-            DiskType::HardDrive,
-            MinFreeSpace::Percent(1.0),
-            Vec::new(),
-        )
-        .unwrap();
-
-        // Plant the first shard so the EC volume can mount, then call
-        // mount_ec_shards with source_disk_type="ssd" — simulating the
-        // VolumeEcShardsMount RPC path.
-        std::fs::write(format!("{}/pics_7.ec00", dir), b"ec-shard").unwrap();
-        loc.mount_ec_shards(VolumeId(7), "pics", &[0], "ssd").unwrap();
-        {
-            let ec_vol = loc.find_ec_volume(VolumeId(7)).expect("ec volume mounted");
-            assert_eq!(
-                ec_vol.disk_type,
-                DiskType::Ssd,
-                "first RPC mount should have set disk type to source's value",
-            );
-        }
-
-        // Plant another shard and re-mount with an empty source —
-        // matching what a disk-scan reload or orphan-shard reconcile
-        // would pass. The previously-recorded "ssd" override must
-        // survive.
-        std::fs::write(format!("{}/pics_7.ec01", dir), b"ec-shard").unwrap();
-        loc.mount_ec_shards(VolumeId(7), "pics", &[1], "").unwrap();
-        {
-            let ec_vol = loc.find_ec_volume(VolumeId(7)).expect("ec volume still mounted");
-            assert_eq!(
-                ec_vol.disk_type,
-                DiskType::Ssd,
-                "empty-source remount must not reset disk type to the physical location's",
-            );
-        }
-    }
-
     #[test]
     fn test_disk_location_persists_directory_uuid_and_tags() {
         let tmp = TempDir::new().unwrap();

seaweed-volume/src/storage/erasure_coding/ec_decoder.rs

@@ -11,7 +11,7 @@ use crate::storage::idx;
 use crate::storage::needle::needle::get_actual_size;
 use crate::storage::super_block::SUPER_BLOCK_SIZE;
 use crate::storage::types::*;
-use crate::storage::volume::{fsync_dir, volume_file_name};
+use crate::storage::volume::volume_file_name;
 
 /// Calculate .dat file size from the max offset entry in .ecx.
 /// Reads the volume version from the first EC shard (.ec00) superblock,
@@ -123,81 +123,60 @@ pub fn write_dat_file_from_shards_with_dirs(
     }
     let base = volume_file_name(dat_dir, collection, volume_id);
     let dat_path = format!("{}.dat", base);
-    // Write to a temp file and atomically rename into place, so a crash
-    // mid-write never leaves a partial .dat at the final name beside the
-    // source shards.
-    let tmp_path = format!("{}.tmp", dat_path);
 
-    let write_result = (|| -> io::Result<()> {
-        // Open data shards from their individual home dirs.
-        let mut shards: Vec<EcVolumeShard> = (0..data_shards as u8)
-            .map(|i| EcVolumeShard::new(&shard_dirs[i as usize], collection, volume_id, i))
-            .collect();
+    // Open data shards from their individual home dirs.
+    let mut shards: Vec<EcVolumeShard> = (0..data_shards as u8)
+        .map(|i| EcVolumeShard::new(&shard_dirs[i as usize], collection, volume_id, i))
+        .collect();
 
-        for shard in &mut shards {
-            shard.open()?;
-        }
-
-        let mut dat_file = File::create(&tmp_path)?;
-        let mut remaining = dat_file_size;
-        let large_block_size = ERASURE_CODING_LARGE_BLOCK_SIZE;
-        let small_block_size = ERASURE_CODING_SMALL_BLOCK_SIZE;
-        let large_row_size = (large_block_size * data_shards) as i64;
-
-        let mut shard_offset: u64 = 0;
-
-        // Read large blocks
-        while remaining >= large_row_size {
-            for i in 0..data_shards {
-                let mut buf = vec![0u8; large_block_size];
-                shards[i].read_at(&mut buf, shard_offset)?;
-                let to_write = large_block_size.min(remaining as usize);
-                dat_file.write_all(&buf[..to_write])?;
-                remaining -= to_write as i64;
-                if remaining <= 0 {
-                    break;
-                }
-            }
-            shard_offset += large_block_size as u64;
-        }
-
-        // Read small blocks
-        while remaining > 0 {
-            for i in 0..data_shards {
-                let mut buf = vec![0u8; small_block_size];
-                shards[i].read_at(&mut buf, shard_offset)?;
-                let to_write = small_block_size.min(remaining as usize);
-                dat_file.write_all(&buf[..to_write])?;
-                remaining -= to_write as i64;
-                if remaining <= 0 {
-                    break;
-                }
-            }
-            shard_offset += small_block_size as u64;
-        }
-
-        for shard in &mut shards {
-            shard.close();
-        }
-
-        // fsync, rename, then fsync the dir so the decoded .dat is durable and
-        // atomically published before the caller deletes the source shards.
-        dat_file.sync_all()?;
-        drop(dat_file);
-        // Windows rename does not replace an existing file on every version;
-        // remove the destination first, matching the compaction commit path.
-        #[cfg(windows)]
-        {
-            let _ = std::fs::remove_file(&dat_path);
-        }
-        std::fs::rename(&tmp_path, &dat_path)?;
-        fsync_dir(&dat_path)?;
-        Ok(())
-    })();
-    if write_result.is_err() {
-        let _ = std::fs::remove_file(&tmp_path);
+    for shard in &mut shards {
+        shard.open()?;
     }
-    write_result
+
+    let mut dat_file = File::create(&dat_path)?;
+    let mut remaining = dat_file_size;
+    let large_block_size = ERASURE_CODING_LARGE_BLOCK_SIZE;
+    let small_block_size = ERASURE_CODING_SMALL_BLOCK_SIZE;
+    let large_row_size = (large_block_size * data_shards) as i64;
+
+    let mut shard_offset: u64 = 0;
+
+    // Read large blocks
+    while remaining >= large_row_size {
+        for i in 0..data_shards {
+            let mut buf = vec![0u8; large_block_size];
+            shards[i].read_at(&mut buf, shard_offset)?;
+            let to_write = large_block_size.min(remaining as usize);
+            dat_file.write_all(&buf[..to_write])?;
+            remaining -= to_write as i64;
+            if remaining <= 0 {
+                break;
+            }
+        }
+        shard_offset += large_block_size as u64;
+    }
+
+    // Read small blocks
+    while remaining > 0 {
+        for i in 0..data_shards {
+            let mut buf = vec![0u8; small_block_size];
+            shards[i].read_at(&mut buf, shard_offset)?;
+            let to_write = small_block_size.min(remaining as usize);
+            dat_file.write_all(&buf[..to_write])?;
+            remaining -= to_write as i64;
+            if remaining <= 0 {
+                break;
+            }
+        }
+        shard_offset += small_block_size as u64;
+    }
+
+    for shard in &mut shards {
+        shard.close();
+    }
+
+    dat_file.sync_all()?;
+    Ok(())
 }
 
 /// Write .idx file from .ecx index + .ecj deletion journal.
@@ -213,59 +192,34 @@ pub fn write_idx_file_from_ec_index(
     let ecx_path = format!("{}.ecx", base);
     let ecj_path = format!("{}.ecj", base);
     let idx_path = format!("{}.idx", base);
-    // Write to a temp file and atomically rename into place, so a crash
-    // mid-write never leaves a partial .idx at the final name beside the
-    // source shards.
-    let tmp_path = format!("{}.tmp", idx_path);
 
-    let write_result = (|| -> io::Result<()> {
-        // Copy .ecx to the temp .idx
-        std::fs::copy(&ecx_path, &tmp_path)?;
+    // Copy .ecx to .idx
+    std::fs::copy(&ecx_path, &idx_path)?;
 
-        // Append deletions from .ecj as tombstones. Read the journal directly
-        // and treat only NotFound as "no journal": Path::exists would also
-        // swallow a permission/IO error and silently skip deletions, which
-        // would resurrect deleted needles as live.
-        let mut idx_file = std::fs::OpenOptions::new()
-            .write(true)
-            .append(true)
-            .open(&tmp_path)?;
-        match std::fs::read(&ecj_path) {
-            Ok(ecj_data) => {
-                let count = ecj_data.len() / NEEDLE_ID_SIZE;
-                for i in 0..count {
-                    let start = i * NEEDLE_ID_SIZE;
-                    let needle_id = NeedleId::from_bytes(&ecj_data[start..start + NEEDLE_ID_SIZE]);
-                    idx::write_index_entry(
-                        &mut idx_file,
-                        needle_id,
-                        Offset::default(),
-                        TOMBSTONE_FILE_SIZE,
-                    )?;
-                }
+    // Append deletions from .ecj as tombstones
+    if std::path::Path::new(&ecj_path).exists() {
+        let ecj_data = std::fs::read(&ecj_path)?;
+        if !ecj_data.is_empty() {
+            let mut idx_file = std::fs::OpenOptions::new()
+                .write(true)
+                .append(true)
+                .open(&idx_path)?;
+
+            let count = ecj_data.len() / NEEDLE_ID_SIZE;
+            for i in 0..count {
+                let start = i * NEEDLE_ID_SIZE;
+                let needle_id = NeedleId::from_bytes(&ecj_data[start..start + NEEDLE_ID_SIZE]);
+                idx::write_index_entry(
+                    &mut idx_file,
+                    needle_id,
+                    Offset::default(),
+                    TOMBSTONE_FILE_SIZE,
+                )?;
             }
-            Err(e) if e.kind() == io::ErrorKind::NotFound => {}
-            Err(e) => return Err(e),
         }
-
-        // fsync, rename, then fsync the dir so the decoded .idx is durable and
-        // atomically published before the caller deletes the source shards.
-        idx_file.sync_all()?;
-        drop(idx_file);
-        // Windows rename does not replace an existing file on every version;
-        // remove the destination first, matching the compaction commit path.
-        #[cfg(windows)]
-        {
-            let _ = std::fs::remove_file(&idx_path);
-        }
-        std::fs::rename(&tmp_path, &idx_path)?;
-        fsync_dir(&idx_path)?;
-        Ok(())
-    })();
-    if write_result.is_err() {
-        let _ = std::fs::remove_file(&tmp_path);
     }
-    write_result
+
+    Ok(())
 }
 
 #[cfg(test)]
@@ -334,10 +288,6 @@ mod tests {
             .unwrap();
         write_idx_file_from_ec_index(dir, "", VolumeId(1)).unwrap();
 
-        // Atomic publish must rename the temp files away, never leaving them behind.
-        assert!(!std::path::Path::new(&format!("{}/1.dat.tmp", dir)).exists());
-        assert!(!std::path::Path::new(&format!("{}/1.idx.tmp", dir)).exists());
-
         // Verify reconstructed .dat matches original
         let reconstructed_dat = std::fs::read(format!("{}/1.dat", dir)).unwrap();
         assert_eq!(
@@ -369,16 +319,4 @@ mod tests {
             assert_eq!(&n.data, expected_data, "needle {} data should match", id);
         }
     }
-
-    #[test]
-    fn test_decode_missing_shard_leaves_no_dat() {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-        // No shard files exist, so de-striping must fail and publish nothing:
-        // neither the final .dat nor a partial .dat.tmp may remain.
-        let res = write_dat_file_from_shards(dir, "", VolumeId(7), 100, 10);
-        assert!(res.is_err());
-        assert!(!std::path::Path::new(&format!("{}/7.dat", dir)).exists());
-        assert!(!std::path::Path::new(&format!("{}/7.dat.tmp", dir)).exists());
-    }
 }

seaweed-volume/src/storage/erasure_coding/ec_encoder.rs

@@ -136,22 +136,11 @@ pub fn rebuild_ec_files(
         // Allocate buffers for all shards. Option<Vec<u8>> is required by rs.reconstruct()
         let mut buffers: Vec<Option<Vec<u8>>> = vec![None; total_shards];
 
-        // Read available shards. A short read means a truncated/corrupt input
-        // shard; treat it as an error rather than reconstructing over a
-        // zero-padded tail and publishing the result as restored redundancy.
+        // Read available shards
         for (i, shard) in shards.iter().enumerate() {
             if !missing_shard_ids.contains(&(i as u32)) {
                 let mut buf = vec![0u8; to_process];
-                let n = shard.read_at(&mut buf, offset)?;
-                if n != to_process {
-                    return Err(io::Error::new(
-                        io::ErrorKind::UnexpectedEof,
-                        format!(
-                            "ec rebuild short read shard {} at {}: got {} want {}",
-                            i, offset, n, to_process
-                        ),
-                    ));
-                }
+                shard.read_at(&mut buf, offset)?;
                 buffers[i] = Some(buf);
             }
         }
@@ -666,81 +655,6 @@ mod tests {
         assert!(std::path::Path::new(&ecx_path).exists());
     }
 
-    // encode_sample_volume writes a small volume and EC-encodes it, returning
-    // the dir path so a test can drop/truncate shards and rebuild.
-    fn encode_sample_volume(tmp: &TempDir) -> String {
-        let dir = tmp.path().to_str().unwrap().to_string();
-        let mut v = Volume::new(
-            &dir,
-            &dir,
-            "",
-            VolumeId(1),
-            NeedleMapKind::InMemory,
-            None,
-            None,
-            0,
-            Version::current(),
-        )
-        .unwrap();
-        for i in 1..=20 {
-            let data = format!("test data for needle {} padded with bytes", i).repeat(64);
-            let mut n = Needle {
-                id: NeedleId(i),
-                cookie: Cookie(i as u32),
-                data: data.as_bytes().to_vec(),
-                data_size: data.len() as u32,
-                ..Needle::default()
-            };
-            v.write_needle(&mut n, true).unwrap();
-        }
-        v.sync_to_disk().unwrap();
-        v.close();
-        write_ec_files(&dir, &dir, "", VolumeId(1), 10, 4).unwrap();
-        dir
-    }
-
-    // A truncated/corrupt input shard must abort rebuild_ec_files with an error
-    // rather than reconstructing over a zero-padded tail and publishing a
-    // truncated shard as restored redundancy.
-    #[test]
-    fn test_rebuild_ec_files_short_read_input_errors() {
-        let tmp = TempDir::new().unwrap();
-        let dir = encode_sample_volume(&tmp);
-
-        // Truncate a present input shard to half its size.
-        let victim = format!("{}/1.ec03", dir);
-        let full = std::fs::metadata(&victim).unwrap().len();
-        assert!(full > 0, "encoded shard should be non-empty");
-        let f = std::fs::OpenOptions::new().write(true).open(&victim).unwrap();
-        f.set_len(full / 2).unwrap();
-        drop(f);
-
-        // Rebuild a different (genuinely missing) shard.
-        std::fs::remove_file(format!("{}/1.ec07", dir)).unwrap();
-        let res = rebuild_ec_files(&dir, "", VolumeId(1), &[7], 10, 4);
-        assert!(res.is_err(), "truncated input shard must abort the rebuild");
-    }
-
-    // Happy path: dropping a shard and rebuilding it from the rest must succeed
-    // and recreate the shard file (the short-read guard must not false-positive).
-    #[test]
-    fn test_rebuild_ec_files_happy_path() {
-        let tmp = TempDir::new().unwrap();
-        let dir = encode_sample_volume(&tmp);
-
-        let dropped = format!("{}/1.ec07", dir);
-        std::fs::remove_file(&dropped).unwrap();
-        rebuild_ec_files(&dir, "", VolumeId(1), &[7], 10, 4).unwrap();
-        assert!(
-            std::path::Path::new(&dropped).exists(),
-            "rebuilt shard .ec07 should exist"
-        );
-        assert!(
-            std::fs::metadata(&dropped).unwrap().len() > 0,
-            "rebuilt shard should be non-empty"
-        );
-    }
-
     #[test]
     fn test_reed_solomon_basic() {
         let data_shards = 10;

seaweed-volume/src/storage/erasure_coding/ec_volume.rs

@@ -44,23 +44,10 @@ pub struct EcVolume {
     /// Directory where .ecx/.ecj were actually found (may differ from dir_idx after fallback).
     ecx_actual_dir: String,
     /// Maps shard ID -> list of server addresses where that shard exists.
-    /// Used for distributed EC reads across the cluster. Wrapped in
-    /// `RwLock` so the read path can refresh the map (under master
-    /// lookup) without holding the Store write lock — mirrors Go's
-    /// `ShardLocationsLock sync.RWMutex` in `weed/storage/erasure_coding/ec_volume.go`.
-    pub shard_locations: std::sync::RwLock<HashMap<ShardId, Vec<String>>>,
-    /// Wall-clock timestamp of the most recent successful
-    /// `LookupEcVolume` refresh of `shard_locations`. `None` until the
-    /// first refresh. Drives the staleness heuristic in
-    /// `cached_lookup_ec_shard_locations` (mirrors Go's
-    /// `ShardLocationsRefreshTime`).
-    pub shard_locations_refresh_time: std::sync::Mutex<Option<std::time::Instant>>,
+    /// Used for distributed EC reads across the cluster.
+    pub shard_locations: HashMap<ShardId, Vec<String>>,
     /// EC volume expiration time (unix epoch seconds), set during EC encode from TTL.
     pub expire_at_sec: u64,
-    /// Encode-run identity (unix nanos) loaded from the .vif EcShardConfig. A read
-    /// served from a shard of a different encode run is rejected (server- and
-    /// client-side); 0 for a pre-feature volume, which is treated leniently.
-    pub encode_ts_ns: i64,
 }
 
 /// Locate the `.vif` for a (collection, vid) by preferring the data dir
@@ -133,15 +120,10 @@ impl EcVolume {
             shards.push(None);
         }
 
-        // Read expire_at_sec, version, and dat_file_size from .vif if
-        // present (matches Go's MaybeLoadVolumeInfo). Prefer the data
-        // dir; fall back to the idx dir for the cross-disk reconcile
-        // case (#9212 / #9244). `dat_file_size` is the source .dat
-        // size at encode time, used both by `locate_ec_shard_needle`
-        // for shard-size math and by the Store-level prune in
-        // `store_ec_reconcile.rs` to verify a sibling-disk .dat is
-        // plausibly the encoding source (#9478).
-        let (expire_at_sec, vif_version, vif_dat_file_size, encode_ts_ns) = {
+        // Read expire_at_sec and version from .vif if present (matches Go's MaybeLoadVolumeInfo).
+        // Prefer the data dir; fall back to the idx dir for the
+        // cross-disk reconcile case (#9212 / #9244).
+        let (expire_at_sec, vif_version) = {
             let vif_path = locate_vif_path(dir, dir_idx, collection, volume_id);
             if let Ok(vif_content) = std::fs::read_to_string(&vif_path) {
                 if let Ok(vif_info) =
@@ -152,21 +134,12 @@ impl EcVolume {
                     } else {
                         Version::current()
                     };
-                    let cfg_encode_ts_ns = vif_info
-                        .ec_shard_config
-                        .as_ref()
-                        .map_or(0, |c| c.encode_ts_ns);
-                    (
-                        vif_info.expire_at_sec,
-                        ver,
-                        vif_info.dat_file_size,
-                        cfg_encode_ts_ns,
-                    )
+                    (vif_info.expire_at_sec, ver)
                 } else {
-                    (0, Version::current(), 0, 0)
+                    (0, Version::current())
                 }
             } else {
-                (0, Version::current(), 0, 0)
+                (0, Version::current())
             }
         };
 
@@ -177,7 +150,7 @@ impl EcVolume {
             dir_idx: dir_idx.to_string(),
             version: vif_version,
             shards,
-            dat_file_size: vif_dat_file_size,
+            dat_file_size: 0,
             data_shards,
             parity_shards,
             ecx_file: None,
@@ -187,10 +160,8 @@ impl EcVolume {
             deleted_needles: RwLock::new(HashSet::new()),
             disk_type: DiskType::default(),
             ecx_actual_dir: dir_idx.to_string(),
-            shard_locations: std::sync::RwLock::new(HashMap::new()),
-            shard_locations_refresh_time: std::sync::Mutex::new(None),
+            shard_locations: HashMap::new(),
             expire_at_sec,
-            encode_ts_ns,
         };
 
         // Open .ecx file (sorted index) in read/write mode for in-place deletion marking.
@@ -356,20 +327,6 @@ impl EcVolume {
         Ok(())
     }
 
-    /// Override the disk type the EC volume (and its already-mounted
-    /// shards) reports under. Used by the `VolumeEcShardsMount` handler
-    /// so the source volume's disk type is preserved across encoding
-    /// (#9423). Not persisted across restarts — disk-scan reload paths
-    /// default to the physical location's disk type.
-    pub fn set_disk_type(&mut self, d: DiskType) {
-        self.disk_type = d.clone();
-        for slot in self.shards.iter_mut() {
-            if let Some(shard) = slot {
-                shard.disk_type = d.clone();
-            }
-        }
-    }
-
     /// Remove and close a shard.
     pub fn remove_shard(&mut self, shard_id: ShardId) {
         if let Some(ref mut shard) = self.shards[shard_id as usize] {
@@ -448,52 +405,23 @@ impl EcVolume {
             disk_id,
             file_count,
             delete_count,
-            encode_ts_ns: self.encode_ts_ns,
             ..Default::default()
         }]
     }
 
     // ---- Shard locations (distributed tracking) ----
 
-    /// Set the list of server addresses for a single shard ID. Does
-    /// NOT touch `shard_locations_refresh_time` — a per-shard write
-    /// from inside a multi-shard population (e.g. iterating the
-    /// `LookupEcVolume` response shard-by-shard) would otherwise
-    /// flip the staleness flag while the map is still incomplete,
-    /// letting a concurrent reader observe `needs_refresh == false`
-    /// against a half-populated cache and return NotFound for the
-    /// not-yet-inserted shards.
-    ///
-    /// Callers populating the whole cache atomically should use
-    /// [`Self::replace_shard_locations`] instead — it swaps the
-    /// entire map under the write lock and advances the refresh
-    /// timestamp in one step.
-    pub fn set_shard_locations(&self, shard_id: ShardId, locations: Vec<String>) {
-        self.shard_locations
-            .write()
-            .unwrap()
-            .insert(shard_id, locations);
+    /// Set the list of server addresses for a given shard ID.
+    pub fn set_shard_locations(&mut self, shard_id: ShardId, locations: Vec<String>) {
+        self.shard_locations.insert(shard_id, locations);
     }
 
-    /// Atomically replace the entire shard-locations map and stamp
-    /// the refresh time. Used by the distributed-read path's
-    /// post-`LookupEcVolume` write-back so the cache transitions
-    /// from old → fresh in a single observable step — concurrent
-    /// readers either see the full prior map or the full new map,
-    /// never an intermediate state with the freshness flag flipped.
-    pub fn replace_shard_locations(&self, locations: HashMap<ShardId, Vec<String>>) {
-        *self.shard_locations.write().unwrap() = locations;
-        *self.shard_locations_refresh_time.lock().unwrap() = Some(std::time::Instant::now());
-    }
-
-    /// Get a cloned list of server addresses for a given shard ID.
-    pub fn get_shard_locations(&self, shard_id: ShardId) -> Vec<String> {
+    /// Get the list of server addresses for a given shard ID.
+    pub fn get_shard_locations(&self, shard_id: ShardId) -> &[String] {
         self.shard_locations
-            .read()
-            .unwrap()
             .get(&shard_id)
-            .cloned()
-            .unwrap_or_default()
+            .map(|v| v.as_slice())
+            .unwrap_or(&[])
     }
 
     // ---- Index operations ----
@@ -620,19 +548,7 @@ impl EcVolume {
                 })?;
 
             let mut buf = vec![0u8; interval.size as usize];
-            let n = shard.read_at(&mut buf, shard_offset as u64)?;
-            if n != buf.len() {
-                return Err(io::Error::new(
-                    io::ErrorKind::UnexpectedEof,
-                    format!(
-                        "short read on ec shard {}: read {} of {} bytes for needle {}",
-                        shard_id,
-                        n,
-                        buf.len(),
-                        needle_id
-                    ),
-                ));
-            }
+            shard.read_at(&mut buf, shard_offset as u64)?;
             bytes.extend_from_slice(&buf);
         }
 
@@ -1270,7 +1186,6 @@ mod tests {
             ec_shard_config: Some(crate::storage::volume::VifEcShardConfig {
                 data_shards: 6,
                 parity_shards: 3,
-                ..Default::default()
             }),
             ..Default::default()
         };
@@ -1296,7 +1211,6 @@ mod tests {
             ec_shard_config: Some(crate::storage::volume::VifEcShardConfig {
                 data_shards: 10,
                 parity_shards: 10,
-                ..Default::default()
             }),
             ..Default::default()
         };

seaweed-volume/src/storage/mod.rs

@@ -4,7 +4,6 @@ pub mod idx;
 pub mod needle;
 pub mod needle_map;
 pub mod store;
-pub mod store_ec_mirror;
 pub mod store_ec_reconcile;
 pub mod super_block;
 pub mod types;

seaweed-volume/src/storage/needle_map.rs

@@ -212,13 +212,6 @@ impl CompactNeedleMap {
         self.idx_file_offset = offset;
     }
 
-    /// True when an .idx file writer is attached. A read-only load leaves
-    /// this `false` — set_writable() must reattach a writer or subsequent
-    /// puts silently skip the disk append.
-    pub fn has_idx_writer(&self) -> bool {
-        self.idx_file.is_some()
-    }
-
     // ---- Map operations ----
 
     /// Insert or update an entry. Appends to .idx file if present.
@@ -712,11 +705,6 @@ impl RedbNeedleMap {
         self.idx_file_offset = offset;
     }
 
-    /// True when an .idx file writer is attached. See CompactNeedleMap.
-    pub fn has_idx_writer(&self) -> bool {
-        self.idx_file.is_some()
-    }
-
     // ---- Map operations ----
 
     /// Insert or update an entry. Writes to idx file first, then redb.
@@ -1012,14 +1000,6 @@ impl NeedleMap {
         }
     }
 
-    /// True when an .idx file writer is attached.
-    pub fn has_idx_writer(&self) -> bool {
-        match self {
-            NeedleMap::InMemory(nm) => nm.has_idx_writer(),
-            NeedleMap::Redb(nm) => nm.has_idx_writer(),
-        }
-    }
-
     /// Content byte count.
     pub fn content_size(&self) -> u64 {
         match self {

seaweed-volume/src/storage/store.rs

@@ -85,27 +85,14 @@ impl Store {
 
         self.locations.push(loc);
 
-        // First scrub partial EC artefacts left on one disk by an
-        // interrupted encode while the source .dat still lives on a
-        // sibling disk of the same store. The per-disk loader cannot
-        // see the sibling .dat and so loads the partial shards as if
-        // they were a distributed-EC layout, which makes the volume
-        // server heartbeat both a regular replica and an EC shard set
-        // for the same vid (seaweedfs/seaweedfs#9478). Running before
-        // the cross-disk reconcile keeps that pass from later
-        // re-loading shards we just cleaned up.
-        self.prune_incomplete_ec_with_sibling_dat();
-
-        // Physically mirror EC sidecars onto every shard-bearing disk
-        // so each disk mounts self-contained. Must run before the
-        // cross-disk reconciler so the orphan pass can prefer the
-        // local idx_directory.
-        self.mirror_ec_metadata_to_shard_disks();
-
-        // Cross-disk fallback for orphan shards — ec.balance can land
-        // shards on one disk while leaving the index on another. Still
-        // needed after the mirror pass for volumes whose mirror failed
-        // (read-only target, partial copy).
+        // After every disk has finished its per-disk EC scan, sweep
+        // the store for shards that live on a disk without local index
+        // files and load them by reaching across to a sibling disk's
+        // .ecx / .ecj / .vif (seaweedfs/seaweedfs#9212 / #9244).
+        // ec.balance / ec.rebuild can move shards onto a destination
+        // node's second disk while leaving the index on the disk that
+        // already held the volume; without this pass those orphan
+        // shards stay invisible to the master.
         self.reconcile_ec_shards_across_disks();
 
         Ok(())
@@ -119,8 +106,6 @@ impl Store {
                 tracing::error!("load_new_volumes error in {}: {}", loc.directory, e);
             }
         }
-        self.prune_incomplete_ec_with_sibling_dat();
-        self.mirror_ec_metadata_to_shard_disks();
         self.reconcile_ec_shards_across_disks();
     }
 
@@ -322,18 +307,11 @@ impl Store {
         )
     }
 
-    /// Delete a volume from any location. When keep_remote_data is true the
-    /// cloud-tier object backing the volume is left intact — used by moves
-    /// where another server is taking over the same .vif.
-    pub fn delete_volume(
-        &mut self,
-        vid: VolumeId,
-        only_empty: bool,
-        keep_remote_data: bool,
-    ) -> Result<(), VolumeError> {
+    /// Delete a volume from any location.
+    pub fn delete_volume(&mut self, vid: VolumeId, only_empty: bool) -> Result<(), VolumeError> {
         for loc in &mut self.locations {
             if loc.find_volume(vid).is_some() {
-                return loc.delete_volume(vid, only_empty, keep_remote_data);
+                return loc.delete_volume(vid, only_empty);
             }
         }
         Err(VolumeError::NotFound)
@@ -369,16 +347,6 @@ impl Store {
             let vif_path = format!("{}.vif", base);
             if std::path::Path::new(&dat_path).exists() || std::path::Path::new(&vif_path).exists()
             {
-                // A persisting .note means the copy that produced these files
-                // never completed; mounting it would expose a truncated volume.
-                // Fail the mount so the caller (VolumeCopy) treats it as an error.
-                let note_path = format!("{}.note", base);
-                if std::path::Path::new(&note_path).exists() {
-                    return Err(VolumeError::Io(io::Error::new(
-                        io::ErrorKind::Other,
-                        format!("volume {} copy incomplete: .note still present", vid),
-                    )));
-                }
                 return loc.create_volume(
                     vid,
                     collection,
@@ -608,16 +576,8 @@ impl Store {
                     as i32;
                 let mut max_count = vol_count + ec_equivalent;
 
-                // One slot per full volume that fits in the unclaimed space.
-                // A "- 1" here used to zero the count when the disk had room for
-                // exactly one volume (free between 1x and 2x the limit), stranding
-                // auto-sized disks at max_volume_count 0 with no writable volume.
-                if unclaimed > 0 {
-                    max_count += (unclaimed as u64 / volume_size_limit) as i32;
-                }
-                // An auto-sized disk with free space always hosts at least one volume.
-                if max_count < 1 {
-                    max_count = 1;
+                if unclaimed > volume_size_limit as i64 {
+                    max_count += (unclaimed as u64 / volume_size_limit) as i32 - 1;
                 }
 
                 loc.max_volume_count.store(max_count, Ordering::Relaxed);
@@ -669,25 +629,22 @@ impl Store {
             ))
         })?;
 
-        self.locations[loc_idx].mount_ec_shards(vid, collection, shard_ids, "")
+        self.locations[loc_idx].mount_ec_shards(vid, collection, shard_ids)
     }
 
     /// Mount a single EC shard, searching all locations for the shard file.
     /// Matches Go's Store.MountEcShards which mounts one shard at a time.
-    /// `source_disk_type` is the source volume's disk type from the
-    /// `VolumeEcShardsMount` RPC (#9423); pass `""` for non-RPC paths.
     pub fn mount_ec_shard(
         &mut self,
         vid: VolumeId,
         collection: &str,
         shard_id: u32,
-        source_disk_type: &str,
     ) -> Result<(), VolumeError> {
         for loc in &mut self.locations {
             // Check if the shard file exists on this location
             let shard = EcVolumeShard::new(&loc.directory, collection, vid, shard_id as u8);
             if std::path::Path::new(&shard.file_name()).exists() {
-                loc.mount_ec_shards(vid, collection, &[shard_id], source_disk_type)?;
+                loc.mount_ec_shards(vid, collection, &[shard_id])?;
                 return Ok(());
             }
         }
@@ -716,44 +673,14 @@ impl Store {
 
     /// Unmount a single EC shard, searching all locations.
     /// Matches Go's Store.UnmountEcShards which unmounts one shard at a time.
-    pub fn unmount_ec_shard(
-        &mut self,
-        vid: VolumeId,
-        shard_id: u32,
-        req_encode_ts_ns: i64,
-    ) -> Result<(), VolumeError> {
+    pub fn unmount_ec_shard(&mut self, vid: VolumeId, shard_id: u32) -> Result<(), VolumeError> {
         // Walk all locations rather than stopping at the first with the
         // vid — split-disk reconciled volumes can have the same vid on
         // multiple disks, with the target shard on any of them.
-        for disk_id in 0..self.locations.len() {
-            let ec_vol = self.locations[disk_id].find_ec_volume(vid);
-            let has_shard = ec_vol.is_some_and(|ec_vol| ec_vol.has_shard(shard_id as u8));
-            if !has_shard {
-                continue;
+        for loc in &mut self.locations {
+            if loc.has_ec_volume(vid) {
+                loc.unmount_ec_shards(vid, &[shard_id]);
             }
-            // Generation fence: when the caller carries a generation (stale-worker
-            // cleanup), only unmount a strictly-older generation; preserve a disk
-            // whose generation is same-or-newer, 0, or unknown, so a stale run cannot
-            // unmount a newer run's live shards. req 0 (legacy/shell) unmounts all.
-            let disk_gen = ec_vol.map_or(0, |v| v.encode_ts_ns);
-            if req_encode_ts_ns > 0 && !(disk_gen > 0 && disk_gen < req_encode_ts_ns) {
-                tracing::info!(
-                    volume_id = vid.0,
-                    shard_id,
-                    disk_id,
-                    disk_gen,
-                    req = req_encode_ts_ns,
-                    "UnmountEcShards skipped: generation not older than request"
-                );
-                continue;
-            }
-            tracing::info!(
-                volume_id = vid.0,
-                shard_id,
-                disk_id,
-                "UnmountEcShards"
-            );
-            self.locations[disk_id].unmount_ec_shards(vid, &[shard_id]);
         }
         // Go returns nil if shard not found (no error)
         Ok(())
@@ -784,21 +711,6 @@ impl Store {
         self.locations.iter().any(|loc| loc.has_ec_volume(vid))
     }
 
-    /// Returns every disk_id on this store that has an EcVolume entry
-    /// for `vid`. Useful for diagnostic logging when a single
-    /// `has_ec_volume` hit hides which disk is actually holding the
-    /// mount (e.g., the ReceiveFile mounted-volume guard).
-    /// Mirrors Go's `Store.FindEcVolumeDiskIds`.
-    pub fn find_ec_volume_disk_ids(&self, vid: VolumeId) -> Vec<u32> {
-        let mut ids = Vec::new();
-        for (idx, loc) in self.locations.iter().enumerate() {
-            if loc.has_ec_volume(vid) {
-                ids.push(idx as u32);
-            }
-        }
-        ids
-    }
-
     /// Returns the index of the disk location that has `(vid, shard_id)`
     /// mounted, if any. Mirrors Go's `Store.findEcShard` and is the
     /// right primitive for read/unmount/delete operations on a single
@@ -1500,47 +1412,6 @@ mod tests {
         assert!(with_preallocate > without_preallocate);
     }
 
-    #[test]
-    fn test_maybe_adjust_volume_max_no_dead_zone() {
-        // With auto max (original_max_volume_count == 0) and a large volume size
-        // limit, a disk with room for at least one volume must not report 0
-        // slots. It once did so for disks sized between 1x and 2x the limit,
-        // leaving no writable volume and timing out every assign.
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-
-        let (_, free) = crate::storage::disk_location::get_disk_stats(dir);
-        if free < 4 {
-            return; // cannot determine free disk space
-        }
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        store
-            .add_location(
-                dir,
-                dir,
-                0, // auto
-                DiskType::HardDrive,
-                MinFreeSpace::Percent(1.0),
-                Vec::new(),
-            )
-            .unwrap();
-
-        // free disk is 1.5x the limit: room for one full volume, less than two.
-        let volume_size_limit = free * 2 / 3;
-        store
-            .volume_size_limit
-            .store(volume_size_limit, Ordering::Relaxed);
-
-        store.maybe_adjust_volume_max();
-
-        let max = store.locations[0].max_volume_count.load(Ordering::Relaxed);
-        assert!(
-            max >= 1,
-            "auto-sized disk with room for one volume reported max_volume_count={max}; want >= 1"
-        );
-    }
-
     #[test]
     fn test_find_free_location_predicate_prefers_more_capacity_and_skips_low_disk() {
         let tmp1 = TempDir::new().unwrap();
@@ -1603,7 +1474,7 @@ mod tests {
 
         std::fs::write(format!("{}/expired_ec_case_9.ec00", dir), b"expired").unwrap();
         store.locations[0]
-            .mount_ec_shards(VolumeId(9), "expired_ec_case", &[0], "")
+            .mount_ec_shards(VolumeId(9), "expired_ec_case", &[0])
             .unwrap();
         store.find_ec_volume_mut(VolumeId(9)).unwrap().expire_at_sec = 1;
 
@@ -1698,7 +1569,7 @@ mod tests {
         )
         .unwrap();
         store.locations[1]
-            .mount_ec_shards(vid, collection, &[0], "")
+            .mount_ec_shards(vid, collection, &[0])
             .unwrap();
 
         // Stray .ecx on disk 2 must not win.
@@ -1765,7 +1636,7 @@ mod tests {
         )
         .unwrap();
         store.locations[1]
-            .mount_ec_shards(vid, collection, &[0], "")
+            .mount_ec_shards(vid, collection, &[0])
             .unwrap();
 
         let got = store.find_ec_shard_target_location(collection, vid, 10);

seaweed-volume/src/storage/store_ec_mirror.rs

@@ -1,422 +0,0 @@
-//! Physical EC sidecar mirroring across disks of the same volume
-//! server. Mirrors `weed/storage/store_ec_mirror.go`.
-
-use std::collections::HashMap;
-use std::fs;
-use std::io::{self, Read, Write};
-use std::path::Path;
-
-use tracing::{info, warn};
-
-use crate::storage::disk_location::{parse_collection_volume_id_pub, DiskLocation};
-use crate::storage::store::Store;
-use crate::storage::types::VolumeId;
-
-// Listed in `EcVolume::new`'s open order.
-const EC_MIRRORED_SIDECARS: &[&str] = &[".ecx", ".ecj", ".vif"];
-
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-struct EcKey {
-    collection: String,
-    vid: VolumeId,
-}
-
-#[derive(Clone, Debug)]
-struct EcxOwner {
-    location: usize,
-    idx_dir: String,
-    data_dir: String,
-}
-
-impl Store {
-    /// Mirror EC sidecars onto every shard-bearing disk that lacks
-    /// them, so each disk mounts self-contained. Runs before
-    /// `reconcile_ec_shards_across_disks` so the orphan pass can
-    /// prefer the local idx_directory.
-    pub fn mirror_ec_metadata_to_shard_disks(&mut self) {
-        if self.locations.len() < 2 {
-            return;
-        }
-        let owners = self.index_ecx_owners_for_mirror();
-        if owners.is_empty() {
-            return;
-        }
-
-        // Two-pass: gather work under an immutable borrow, then apply
-        // copies under independent mutable borrows.
-        struct Mirror<'a> {
-            target_idx: usize,
-            owner: &'a EcxOwner,
-            collection: String,
-            vid: VolumeId,
-        }
-        let mut mirrors: Vec<Mirror> = Vec::new();
-        for (loc_idx, loc) in self.locations.iter().enumerate() {
-            let orphans = collect_shard_disk_volumes(loc);
-            for (key, _shards) in orphans {
-                let Some(owner) = owners.get(&key) else {
-                    continue;
-                };
-                if owner.location == loc_idx {
-                    continue;
-                }
-                if disk_has_all_sidecars(loc, &key.collection, key.vid) {
-                    continue;
-                }
-                mirrors.push(Mirror {
-                    target_idx: loc_idx,
-                    owner,
-                    collection: key.collection,
-                    vid: key.vid,
-                });
-            }
-        }
-
-        for m in mirrors {
-            let loc_dir = self.locations[m.target_idx].directory.clone();
-            let loc_idx_dir = self.locations[m.target_idx].idx_directory.clone();
-            match mirror_sidecars_for_volume(
-                &m.owner.idx_dir,
-                &m.owner.data_dir,
-                &loc_dir,
-                &loc_idx_dir,
-                &m.collection,
-                m.vid,
-            ) {
-                Ok(0) => {}
-                Ok(copied) => {
-                    info!(
-                        volume_id = m.vid.0,
-                        collection = %m.collection,
-                        from = %m.owner.data_dir,
-                        to = %loc_dir,
-                        copied,
-                        "mirrored EC sidecar(s) for same-disk invariant",
-                    );
-                }
-                Err(e) => {
-                    warn!(
-                        volume_id = m.vid.0,
-                        collection = %m.collection,
-                        from = %m.owner.data_dir,
-                        to = %loc_dir,
-                        error = %e,
-                        "mirror EC sidecars failed; cross-disk fallback will handle this volume",
-                    );
-                }
-            }
-        }
-    }
-
-    // Records both idx_dir (where .ecx was found) and data_dir, so
-    // the mirror can resolve .vif from data_dir even when .ecx lives
-    // in idx_directory.
-    fn index_ecx_owners_for_mirror(&self) -> HashMap<EcKey, EcxOwner> {
-        let mut owners: HashMap<EcKey, EcxOwner> = HashMap::new();
-        for (loc_idx, loc) in self.locations.iter().enumerate() {
-            let mut seen: Vec<&str> = Vec::with_capacity(2);
-            for scan in [loc.idx_directory.as_str(), loc.directory.as_str()] {
-                if scan.is_empty() || seen.contains(&scan) {
-                    continue;
-                }
-                seen.push(scan);
-                let Ok(read) = fs::read_dir(scan) else {
-                    continue;
-                };
-                for ent in read.flatten() {
-                    if ent.file_type().map(|ft| ft.is_dir()).unwrap_or(false) {
-                        continue;
-                    }
-                    let name = ent.file_name().to_string_lossy().into_owned();
-                    let Some(base) = name.strip_suffix(".ecx") else {
-                        continue;
-                    };
-                    let Some((collection, vid)) = parse_collection_volume_id_pub(base) else {
-                        continue;
-                    };
-                    owners
-                        .entry(EcKey { collection, vid })
-                        .or_insert_with(|| EcxOwner {
-                            location: loc_idx,
-                            idx_dir: scan.to_string(),
-                            data_dir: loc.directory.clone(),
-                        });
-                }
-            }
-        }
-        owners
-    }
-}
-
-// Checks the modern routing and the opposite directory — without
-// that fallback, a destination with a legacy pre-`-dir.idx` .ecx in
-// its data dir would be re-mirrored into idx_directory.
-fn disk_has_all_sidecars(loc: &DiskLocation, collection: &str, vid: VolumeId) -> bool {
-    for ext in EC_MIRRORED_SIDECARS {
-        let primary = sidecar_dest_path(&loc.directory, &loc.idx_directory, collection, vid, ext);
-        if path_is_regular_file(&primary) {
-            continue;
-        }
-        if loc.idx_directory != loc.directory {
-            let (fallback_data, fallback_idx) = if *ext == ".vif" {
-                (loc.idx_directory.as_str(), loc.directory.as_str())
-            } else {
-                (loc.directory.as_str(), loc.directory.as_str())
-            };
-            let fallback = sidecar_dest_path(fallback_data, fallback_idx, collection, vid, ext);
-            if path_is_regular_file(&fallback) {
-                continue;
-            }
-        }
-        return false;
-    }
-    true
-}
-
-fn path_is_regular_file(path: &str) -> bool {
-    fs::metadata(path).map(|m| !m.is_dir()).unwrap_or(false)
-}
-
-// `.ecx`/`.ecj` route to idx_directory, `.vif` to directory.
-fn sidecar_dest_path(
-    data_dir: &str,
-    idx_dir: &str,
-    collection: &str,
-    vid: VolumeId,
-    ext: &str,
-) -> String {
-    let dir = if ext == ".vif" { data_dir } else { idx_dir };
-    if collection.is_empty() {
-        format!("{}/{}{}", dir, vid.0, ext)
-    } else {
-        format!("{}/{}_{}{}", dir, collection, vid.0, ext)
-    }
-}
-
-fn mirror_sidecars_for_volume(
-    src_idx_dir: &str,
-    src_data_dir: &str,
-    dst_data_dir: &str,
-    dst_idx_dir: &str,
-    collection: &str,
-    vid: VolumeId,
-) -> io::Result<usize> {
-    let mut copied = 0usize;
-    for ext in EC_MIRRORED_SIDECARS {
-        let dst = sidecar_dest_path(dst_data_dir, dst_idx_dir, collection, vid, ext);
-        // An existing local copy is authoritative — it may be newer
-        // than the owner's after a delete journal append.
-        if fs::metadata(&dst).is_ok() {
-            continue;
-        }
-
-        let candidates = [
-            sidecar_dest_path(src_data_dir, src_idx_dir, collection, vid, ext),
-            sidecar_dest_path(src_idx_dir, src_data_dir, collection, vid, ext),
-        ];
-        let mut src_path: Option<String> = None;
-        for c in candidates.iter() {
-            if fs::metadata(c).map(|m| !m.is_dir()).unwrap_or(false) {
-                src_path = Some(c.clone());
-                break;
-            }
-        }
-        let Some(src) = src_path else {
-            continue;
-        };
-        copy_sidecar_atomic(Path::new(&src), Path::new(&dst))?;
-        copied += 1;
-    }
-    Ok(copied)
-}
-
-fn copy_sidecar_atomic(src: &Path, dst: &Path) -> io::Result<()> {
-    if let Some(parent) = dst.parent() {
-        fs::create_dir_all(parent)?;
-    }
-    let mut src_file = fs::File::open(src)?;
-    let tmp = {
-        let mut s = dst.as_os_str().to_owned();
-        s.push(".mirror.tmp");
-        std::path::PathBuf::from(s)
-    };
-    let _ = fs::remove_file(&tmp);
-    let mut dst_file = fs::OpenOptions::new()
-        .write(true)
-        .create_new(true)
-        .open(&tmp)?;
-    let mut buf = [0u8; 64 * 1024];
-    loop {
-        let n = src_file.read(&mut buf)?;
-        if n == 0 {
-            break;
-        }
-        dst_file.write_all(&buf[..n])?;
-    }
-    dst_file.sync_all()?;
-    drop(dst_file);
-    if let Err(e) = fs::rename(&tmp, dst) {
-        let _ = fs::remove_file(&tmp);
-        return Err(e);
-    }
-    Ok(())
-}
-
-fn collect_shard_disk_volumes(loc: &DiskLocation) -> HashMap<EcKey, Vec<String>> {
-    let mut out: HashMap<EcKey, Vec<String>> = HashMap::new();
-    let Ok(read) = fs::read_dir(&loc.directory) else {
-        return out;
-    };
-    for ent in read.flatten() {
-        if ent.file_type().map(|ft| ft.is_dir()).unwrap_or(false) {
-            continue;
-        }
-        let name = ent.file_name().to_string_lossy().into_owned();
-        let Some(dot) = name.rfind('.') else {
-            continue;
-        };
-        let (base, ext) = name.split_at(dot);
-        if crate::storage::disk_location::is_ec_shard_extension(ext).is_none() {
-            continue;
-        }
-        match ent.metadata() {
-            Ok(meta) if meta.len() > 0 => {}
-            _ => continue,
-        }
-        let Some((collection, vid)) = parse_collection_volume_id_pub(base) else {
-            continue;
-        };
-        out.entry(EcKey { collection, vid })
-            .or_default()
-            .push(name);
-    }
-    out
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::config::MinFreeSpace;
-    use crate::storage::needle_map::NeedleMapKind;
-    use crate::storage::types::DiskType;
-    use crate::storage::volume::{VifEcShardConfig, VifVolumeInfo};
-    use tempfile::TempDir;
-
-    fn plant_shard(dir: &Path, collection: &str, vid: u32, shard_id: u8) {
-        let path = if collection.is_empty() {
-            dir.join(format!("{}.ec{:02}", vid, shard_id))
-        } else {
-            dir.join(format!("{}_{}.ec{:02}", collection, vid, shard_id))
-        };
-        fs::write(&path, b"shard data nonempty").unwrap();
-    }
-
-    fn plant_ecx(dir: &Path, collection: &str, vid: u32, bytes: &[u8]) {
-        let path = dir.join(format!("{}_{}.ecx", collection, vid));
-        fs::write(&path, bytes).unwrap();
-    }
-
-    fn plant_ecj(dir: &Path, collection: &str, vid: u32, bytes: &[u8]) {
-        let path = dir.join(format!("{}_{}.ecj", collection, vid));
-        fs::write(&path, bytes).unwrap();
-    }
-
-    fn plant_vif(dir: &Path, collection: &str, vid: u32, data_shards: u32, parity_shards: u32) {
-        let vif = VifVolumeInfo {
-            version: 3,
-            ec_shard_config: Some(VifEcShardConfig {
-                data_shards,
-                parity_shards,
-                ..Default::default()
-            }),
-            ..Default::default()
-        };
-        let path = dir.join(format!("{}_{}.vif", collection, vid));
-        fs::write(&path, serde_json::to_string(&vif).unwrap()).unwrap();
-    }
-
-    fn add_loc(store: &mut Store, dir: &Path) {
-        store
-            .add_location(
-                dir.to_str().unwrap(),
-                dir.to_str().unwrap(),
-                100,
-                DiskType::HardDrive,
-                MinFreeSpace::Percent(0.0),
-                Vec::new(),
-            )
-            .unwrap();
-    }
-
-    #[test]
-    fn mirror_copies_sidecars_to_shard_only_disk() {
-        let tmp = TempDir::new().unwrap();
-        let dir0 = tmp.path().join("data0");
-        let dir1 = tmp.path().join("data1");
-        fs::create_dir_all(&dir0).unwrap();
-        fs::create_dir_all(&dir1).unwrap();
-
-        let collection = "video-recordings";
-        let vid = 4121u32;
-
-        plant_shard(&dir0, collection, vid, 0);
-        plant_shard(&dir0, collection, vid, 12);
-        plant_shard(&dir1, collection, vid, 1);
-
-        let ecx = vec![0xA1u8; 20];
-        let ecj = vec![0xB2u8; 16];
-        plant_ecx(&dir1, collection, vid, &ecx);
-        plant_ecj(&dir1, collection, vid, &ecj);
-        plant_vif(&dir1, collection, vid, 10, 4);
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        add_loc(&mut store, &dir0);
-        add_loc(&mut store, &dir1);
-
-        for ext in [".ecx", ".ecj", ".vif"] {
-            let dst = dir0.join(format!("{}_{}{}", collection, vid, ext));
-            assert!(
-                dst.exists(),
-                "mirror did not install sidecar {} on dir0",
-                ext
-            );
-        }
-        let ecx_dst = fs::read(dir0.join(format!("{}_{}.ecx", collection, vid))).unwrap();
-        assert_eq!(ecx_dst, ecx, ".ecx mirrored bytes differ from source");
-        let ecj_dst = fs::read(dir0.join(format!("{}_{}.ecj", collection, vid))).unwrap();
-        assert_eq!(ecj_dst, ecj, ".ecj mirrored bytes differ from source");
-    }
-
-    #[test]
-    fn mirror_preserves_existing_destination_sidecars() {
-        let tmp = TempDir::new().unwrap();
-        let dir0 = tmp.path().join("data0");
-        let dir1 = tmp.path().join("data1");
-        fs::create_dir_all(&dir0).unwrap();
-        fs::create_dir_all(&dir1).unwrap();
-
-        let collection = "video-recordings";
-        let vid = 7777u32;
-
-        plant_shard(&dir0, collection, vid, 0);
-        plant_shard(&dir0, collection, vid, 12);
-        plant_shard(&dir1, collection, vid, 1);
-
-        let ecx_owner = vec![0xC3u8; 20];
-        let ecx_local = vec![0x5Au8; 20];
-        let ecj_bytes = vec![0xD4u8; 16];
-        plant_ecx(&dir1, collection, vid, &ecx_owner);
-        plant_ecj(&dir1, collection, vid, &ecj_bytes);
-        plant_vif(&dir1, collection, vid, 10, 4);
-        plant_ecx(&dir0, collection, vid, &ecx_local);
-        plant_ecj(&dir0, collection, vid, &ecj_bytes);
-        plant_vif(&dir0, collection, vid, 10, 4);
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        add_loc(&mut store, &dir0);
-        add_loc(&mut store, &dir1);
-
-        let post = fs::read(dir0.join(format!("{}_{}.ecx", collection, vid))).unwrap();
-        assert_eq!(post, ecx_local, "mirror overwrote dir0's existing .ecx");
-    }
-}

seaweed-volume/src/storage/store_ec_reconcile.rs

@@ -21,29 +21,9 @@ use std::fs;
 use tracing::{info, warn};
 
 use crate::storage::disk_location::{is_ec_shard_extension, parse_collection_volume_id_pub};
-use crate::storage::erasure_coding::ec_shard::DATA_SHARDS_COUNT;
 use crate::storage::store::Store;
 use crate::storage::types::VolumeId;
 
-pub(crate) fn ec_local_ecx_path(dir: &str, collection: &str, vid: VolumeId) -> String {
-    if collection.is_empty() {
-        format!("{}/{}.ecx", dir, vid.0)
-    } else {
-        format!("{}/{}_{}.ecx", dir, collection, vid.0)
-    }
-}
-
-/// Sibling-disk `.dat` candidate for `prune_incomplete_ec_with_sibling_dat`.
-/// We record both the disk index and the file's size: the size is
-/// consulted before deleting any EC artefacts. A zero-byte or truncated
-/// `.dat` is not a credible fallback, and we'd rather leave the partial
-/// EC in place than wipe it based on garbage.
-#[derive(Clone, Copy, Debug)]
-struct DatOwnerInfo {
-    location: usize,
-    size: u64,
-}
-
 /// Key for orphan-shard reconciliation: collection + volume id. Two
 /// collections can re-use the same volume id, and we must only pair
 /// shards with their own `.ecx`.
@@ -83,10 +63,10 @@ impl Store {
             return;
         }
 
-        // `use_local_idx` is the post-mirror fast path: when the
-        // mirror already installed sidecars locally, mount against
-        // loc.idx_directory instead of the owner disk.
-        let mut to_load: Vec<(usize, EcKey, Vec<(String, u32)>, EcxOwnerInfo, bool)> = Vec::new();
+        // Snapshot of orphan shards, keyed by (loc_idx, ec_key) so we
+        // can release the immutable borrow on self.locations before
+        // calling mount_ec_shards_with_idx_dir (which needs &mut).
+        let mut to_load: Vec<(usize, EcKey, Vec<(String, u32)>, EcxOwnerInfo)> = Vec::new();
         for (loc_idx, loc) in self.locations.iter().enumerate() {
             let orphans = collect_orphan_ec_shards(loc, loc_idx);
             for (key, shards) in orphans {
@@ -100,57 +80,34 @@ impl Store {
                     );
                     continue;
                 };
-                let local_ecx = ec_local_ecx_path(&loc.idx_directory, &key.collection, key.vid);
-                let local_ecx_in_data = ec_local_ecx_path(&loc.directory, &key.collection, key.vid);
-                let use_local_idx = std::path::Path::new(&local_ecx).exists()
-                    || std::path::Path::new(&local_ecx_in_data).exists();
-
-                if !use_local_idx
-                    && owner.location == loc_idx
-                    && owner.idx_dir == loc.idx_directory
-                {
-                    // Same-disk no-op: load_all_ec_shards already
-                    // tried and logged the failure.
+                if owner.location == loc_idx && owner.idx_dir == loc.idx_directory {
+                    // Normal same-disk case: load_all_ec_shards already
+                    // attempted the mount via `loc.idx_directory` and
+                    // logged the underlying failure. No point retrying
+                    // the same call.
                     continue;
                 }
-                to_load.push((loc_idx, key, shards, owner.clone(), use_local_idx));
+                // Either a cross-disk owner OR a same-disk owner whose
+                // `.ecx` actually lives in `loc.directory` (the legacy
+                // pre-`-dir.idx` layout). The latter wasn't tried by
+                // load_all_ec_shards, which only looked in
+                // `self.idx_directory`, so we still need to retry it
+                // here with the owner's discovered idx_dir.
+                to_load.push((loc_idx, key, shards, owner.clone()));
             }
         }
 
-        for (loc_idx, key, shards, owner, use_local_idx) in to_load {
+        for (loc_idx, key, shards, owner) in to_load {
             let shard_names: Vec<&str> = shards.iter().map(|(n, _)| n.as_str()).collect();
-            let loc_dir = self.locations[loc_idx].directory.clone();
-            let shard_ids: Vec<u32> = shards.iter().map(|(_, sid)| *sid).collect();
-
-            if use_local_idx {
-                info!(
-                    volume_id = key.vid.0,
-                    collection = %key.collection,
-                    directory = %loc_dir,
-                    "loading orphan EC shards against locally-mirrored sidecars: {:?}",
-                    shard_names,
-                );
-                let loc = &mut self.locations[loc_idx];
-                if let Err(e) = loc.mount_ec_shards(key.vid, &key.collection, &shard_ids, "") {
-                    loc.unmount_ec_shards(key.vid, &shard_ids);
-                    warn!(
-                        volume_id = key.vid.0,
-                        directory = %loc_dir,
-                        "local-mirror shard load failed: {}",
-                        e,
-                    );
-                }
-                continue;
-            }
-
             info!(
                 volume_id = key.vid.0,
                 collection = %key.collection,
                 from = %self.locations[owner.location].directory,
-                to = %loc_dir,
+                to = %self.locations[loc_idx].directory,
                 "loading orphan EC shards using index files from sibling disk (issue #9212): {:?}",
                 shard_names,
             );
+            let shard_ids: Vec<u32> = shards.iter().map(|(_, sid)| *sid).collect();
             let owner_idx_dir = owner.idx_dir.clone();
             let loc = &mut self.locations[loc_idx];
             if let Err(e) = loc.mount_ec_shards_with_idx_dir(
@@ -158,7 +115,6 @@ impl Store {
                 &key.collection,
                 &shard_ids,
                 &owner_idx_dir,
-                "",
             ) {
                 // mount_ec_shards_with_idx_dir adds shards one at a
                 // time and increments the `ec_shards` gauge per shard
@@ -171,7 +127,7 @@ impl Store {
                 loc.unmount_ec_shards(key.vid, &shard_ids);
                 warn!(
                     volume_id = key.vid.0,
-                    directory = %loc_dir,
+                    directory = %loc.directory,
                     "cross-disk shard load failed: {}",
                     e,
                 );
@@ -179,207 +135,6 @@ impl Store {
         }
     }
 
-    /// Remove leftover EC artefacts on one disk when a healthy `.dat`
-    /// for the same `(collection, vid)` lives on a sibling disk of the
-    /// same store. Mirrors `Store.pruneIncompleteEcWithSiblingDat` in
-    /// `weed/storage/store_ec_reconcile.go` (seaweedfs/seaweedfs#9478).
-    ///
-    /// `DiskLocation::handle_found_ecx_file` only looks for `.dat` in
-    /// the same disk as the EC shards. In a multi-disk volume server an
-    /// interrupted EC encode can leave `.ec??` + `.ecx` on disk B while
-    /// the source `.dat` still lives on disk A. The per-disk loader
-    /// sees no local `.dat`, classifies the layout as distributed EC,
-    /// and mounts the partial shards. The volume server then heartbeats
-    /// both a regular replica and an EC shard for the same vid, and
-    /// master ends up with a contradictory view.
-    ///
-    /// Cleanup is gated on `shard_count < DATA_SHARDS_COUNT` so that a
-    /// deliberate "full local EC, `.dat` retained" layout split across
-    /// two disks (`.dat` on disk A, all 10+ shards on disk B) is left
-    /// alone — the per-disk loader already keeps that configuration on
-    /// a single disk, and pruning it here would be a behaviour
-    /// regression. Distributed EC volumes (no `.dat` on any disk of
-    /// this server) also fall through unchanged because the `.dat`
-    /// index never matches.
-    ///
-    /// The sibling `.dat` must be a credible encoding source before we
-    /// delete anything: at least the size `.vif` recorded at encode time,
-    /// or — when unknown (0) — more than a bare superblock so an empty
-    /// 8-byte stub can't pass. A truncated `.dat` leaves the partial EC
-    /// alone; those shards may still reconstruct from other servers.
-    ///
-    /// We don't have to push anything to a deleted-shards channel
-    /// here: the Rust heartbeat path in `server/heartbeat.rs` diffs
-    /// the current `ec_volumes` snapshot against the previous one each
-    /// tick, so the first heartbeat after the prune naturally emits a
-    /// delete delta for whatever the per-disk pass had already
-    /// reported.
-    pub fn prune_incomplete_ec_with_sibling_dat(&mut self) {
-        if self.locations.len() < 2 {
-            return;
-        }
-
-        let dat_owners = self.index_dat_owners();
-        if dat_owners.is_empty() {
-            return;
-        }
-
-        // Snapshot under an immutable borrow so we can release it
-        // before taking the mutable borrow needed for cleanup.
-        struct Victim {
-            loc_idx: usize,
-            collection: String,
-            vid: VolumeId,
-            dat_dir: String,
-            shard_count: usize,
-        }
-        let mut victims: Vec<Victim> = Vec::new();
-        for (loc_idx, loc) in self.locations.iter().enumerate() {
-            for (vid, ev) in loc.ec_volumes() {
-                // Use the volume's own ratio, not the OSS default, so a full
-                // custom-ratio data set (e.g. 9 of a 9+3) is not mistaken for a leftover.
-                let data_shards = if ev.data_shards > 0 {
-                    ev.data_shards as usize
-                } else {
-                    DATA_SHARDS_COUNT
-                };
-                let shard_count = ev.shard_count();
-                if shard_count >= data_shards {
-                    continue;
-                }
-                let key = EcKey {
-                    collection: ev.collection.clone(),
-                    vid: *vid,
-                };
-                let Some(owner) = dat_owners.get(&key) else {
-                    continue;
-                };
-                if owner.location == loc_idx {
-                    // Same-disk .dat is the job of
-                    // DiskLocation::validate_ec_volume during the
-                    // per-disk pass; don't second-guess it here.
-                    continue;
-                }
-                // Delete only against a byte-exact committed source: the sibling
-                // .dat must equal the size .vif recorded at encode time. An
-                // unknown (0) or mismatched size cannot prove the .dat holds this data.
-                if ev.dat_file_size <= 0 || owner.size != ev.dat_file_size as u64 {
-                    warn!(
-                        volume_id = vid.0,
-                        collection = %ev.collection,
-                        directory = %loc.directory,
-                        shard_count,
-                        sibling_dir = %self.locations[owner.location].directory,
-                        sibling_dat_size = owner.size,
-                        recorded = ev.dat_file_size,
-                        "sibling .dat does not byte-exactly match the recorded EC source size; leaving partial EC in place",
-                    );
-                    continue;
-                }
-                // Never prune when the shards are recoverable node-wide (a set
-                // split across sibling disks summing to >= data_shards); they
-                // may be sole copies of a distributed volume.
-                let mut node_wide_bits = ev.shard_bits().0;
-                for other in &self.locations {
-                    if let Some(other_ev) = other.find_ec_volume(*vid) {
-                        if other_ev.collection == ev.collection {
-                            node_wide_bits |= other_ev.shard_bits().0;
-                        }
-                    }
-                }
-                let node_wide = node_wide_bits.count_ones() as usize;
-                if node_wide >= data_shards {
-                    warn!(
-                        volume_id = vid.0,
-                        collection = %ev.collection,
-                        node_wide,
-                        data_shards,
-                        "shards present node-wide are independently recoverable; leaving EC in place despite a sibling .dat",
-                    );
-                    continue;
-                }
-                victims.push(Victim {
-                    loc_idx,
-                    collection: ev.collection.clone(),
-                    vid: *vid,
-                    dat_dir: self.locations[owner.location].directory.clone(),
-                    shard_count,
-                });
-            }
-        }
-
-        for v in victims {
-            warn!(
-                volume_id = v.vid.0,
-                collection = %v.collection,
-                directory = %self.locations[v.loc_idx].directory,
-                shard_count = v.shard_count,
-                required = DATA_SHARDS_COUNT,
-                dat_dir = %v.dat_dir,
-                "partial EC shards on this disk while a healthy .dat exists on a sibling disk; cleaning up leftover EC files (issue 9478)",
-            );
-            let loc = &mut self.locations[v.loc_idx];
-            if let Some(mut ec_vol) = loc.remove_ec_volume(v.vid) {
-                for _ in 0..ec_vol.shard_count() {
-                    crate::metrics::VOLUME_GAUGE
-                        .with_label_values(&[&ec_vol.collection, "ec_shards"])
-                        .dec();
-                }
-                // destroy() closes shard file handles before unlinking
-                // (matters on Windows) and removes .ecx / .ecj / .vif.
-                ec_vol.destroy();
-            }
-            // Also sweep any unmounted shard files (.ec00 .. .ec31)
-            // that the per-disk loader skipped — destroy() only walks
-            // the in-memory shards, but the disk may still hold others.
-            let _ = loc.remove_ec_volume_files(&v.collection, v.vid);
-        }
-    }
-
-    /// Returns, for every `(collection, vid)`, the index of the first
-    /// disk on this store that holds a `.dat` for it plus the file's
-    /// size. Used by `prune_incomplete_ec_with_sibling_dat` so it can
-    /// decide whether partial EC artefacts on another disk are
-    /// leftovers of an interrupted encode AND whether the sibling
-    /// `.dat` is large enough to be a credible fallback.
-    ///
-    /// Any `.dat` `read_dir` can see is recorded — including zero-byte
-    /// shells. Their mere presence means this volume was a regular
-    /// volume on this server at some point, which rules out the
-    /// "distributed EC, no .dat anywhere" reading. Whether the file is
-    /// actually usable is the caller's call, made by comparing this
-    /// size to the EC's recorded source size in `.vif`.
-    fn index_dat_owners(&self) -> HashMap<EcKey, DatOwnerInfo> {
-        let mut owners: HashMap<EcKey, DatOwnerInfo> = HashMap::new();
-        for (loc_idx, loc) in self.locations.iter().enumerate() {
-            let Ok(read) = fs::read_dir(&loc.directory) else {
-                continue;
-            };
-            for ent in read.flatten() {
-                if ent.file_type().map(|ft| ft.is_dir()).unwrap_or(false) {
-                    continue;
-                }
-                let name = ent.file_name().to_string_lossy().into_owned();
-                let Some(base) = name.strip_suffix(".dat") else {
-                    continue;
-                };
-                let Some((collection, vid)) = parse_collection_volume_id_pub(base) else {
-                    continue;
-                };
-                let Ok(meta) = ent.metadata() else {
-                    continue;
-                };
-                owners
-                    .entry(EcKey { collection, vid })
-                    .or_insert(DatOwnerInfo {
-                        location: loc_idx,
-                        size: meta.len(),
-                    });
-            }
-        }
-        owners
-    }
-
     /// Build a `(collection, vid) -> EcxOwnerInfo` map of which disk
     /// owns the `.ecx` file. `.ecx` normally lives in `IdxDirectory`
     /// but may have been written into the data directory before
@@ -478,7 +233,6 @@ mod tests {
             ec_shard_config: Some(VifEcShardConfig {
                 data_shards,
                 parity_shards,
-                ..Default::default()
             }),
             ..Default::default()
         };
@@ -489,287 +243,6 @@ mod tests {
         .unwrap();
     }
 
-    fn write_ec_vif(dir: &str, collection: &str, vid: u32) {
-        let vif = VifVolumeInfo {
-            version: 3,
-            ec_shard_config: Some(VifEcShardConfig {
-                data_shards: 10,
-                parity_shards: 4,
-                ..Default::default()
-            }),
-            ..Default::default()
-        };
-        std::fs::write(
-            format!("{}/{}_{}.vif", dir, collection, vid),
-            serde_json::to_string(&vif).unwrap(),
-        )
-        .unwrap();
-    }
-
-    /// An empty `.dat` (<= a superblock, i.e. zero needles) for an EC volume
-    /// is a leftover stub from the pre-fix loader. It must be swept on startup,
-    /// not loaded as a phantom empty volume. With the same vid's stub on two
-    /// disks this also unblocks startup, which previously failed the
-    /// duplicate-vid check (the volume6 incident).
-    #[test]
-    fn test_empty_ec_dat_stub_removed_and_unblocks_startup() {
-        let tmp = TempDir::new().unwrap();
-        let d0 = tmp.path().join("data0");
-        let d1 = tmp.path().join("data1");
-        std::fs::create_dir_all(&d0).unwrap();
-        std::fs::create_dir_all(&d1).unwrap();
-        let coll = "warp-cal";
-        let vid = 41u32;
-
-        // A real (loadable) but empty superblock: without the sweep both disks
-        // load it as vid 41 and add_location fails the duplicate-vid check.
-        let stub = crate::storage::super_block::SuperBlock {
-            version: crate::storage::types::Version::current(),
-            ..Default::default()
-        }
-        .to_bytes();
-        for d in [&d0, &d1] {
-            let dir = d.to_str().unwrap();
-            std::fs::write(format!("{}/{}_{}.dat", dir, coll, vid), &stub).unwrap();
-            write_ec_vif(dir, coll, vid);
-        }
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        for d in [&d0, &d1] {
-            store
-                .add_location(
-                    d.to_str().unwrap(),
-                    d.to_str().unwrap(),
-                    100,
-                    DiskType::HardDrive,
-                    MinFreeSpace::Percent(0.0),
-                    Vec::new(),
-                )
-                .expect("a same-vid empty stub on two disks must not block startup");
-        }
-
-        let loaded: usize = store.locations.iter().map(|l| l.volume_ids().len()).sum();
-        assert_eq!(loaded, 0, "empty EC stub was loaded as a phantom volume");
-        for d in [&d0, &d1] {
-            assert!(
-                !std::path::Path::new(&format!("{}/{}_{}.dat", d.to_str().unwrap(), coll, vid))
-                    .exists(),
-                "empty .dat stub was not removed",
-            );
-        }
-    }
-
-    /// Safety: an empty `.dat` for a NON-EC volume (no EC `.vif`) is left
-    /// alone — only EC stubs are swept, so freshly-allocated empty volumes
-    /// survive.
-    #[test]
-    fn test_keeps_empty_dat_for_non_ec_volume() {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().join("data0");
-        std::fs::create_dir_all(&dir).unwrap();
-        let dat = format!("{}/7.dat", dir.to_str().unwrap());
-        std::fs::write(&dat, vec![0u8; 8]).unwrap();
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        store
-            .add_location(
-                dir.to_str().unwrap(),
-                dir.to_str().unwrap(),
-                100,
-                DiskType::HardDrive,
-                MinFreeSpace::Percent(0.0),
-                Vec::new(),
-            )
-            .unwrap();
-
-        assert!(
-            std::path::Path::new(&dat).exists(),
-            "a non-EC empty .dat must not be swept",
-        );
-    }
-
-    /// Regression: a lone `.vif` whose `.ecx` is on a sibling disk must not
-    /// make the loader create a phantom `.dat`, nor the sibling-.dat prune
-    /// delete the real shards on the sibling.
-    #[test]
-    fn test_lone_vif_does_not_create_phantom_dat_or_delete_shards() {
-        let tmp = TempDir::new().unwrap();
-        let d0 = tmp.path().join("data0");
-        let d1 = tmp.path().join("data1");
-        std::fs::create_dir_all(&d0).unwrap();
-        std::fs::create_dir_all(&d1).unwrap();
-        let coll = "warp-loadtest";
-        let vid = 57u32;
-
-        // d0: a self-contained but partial (2 < 10) EC volume.
-        write_shard(d0.to_str().unwrap(), coll, vid, 2);
-        write_shard(d0.to_str().unwrap(), coll, vid, 4);
-        write_index_files(d0.to_str().unwrap(), coll, vid, 10, 4);
-
-        // d1: ONLY the mirrored `.vif` — no `.ecx`, no shard, no `.dat`.
-        std::fs::copy(
-            d0.join(format!("{}_{}.vif", coll, vid)),
-            d1.join(format!("{}_{}.vif", coll, vid)),
-        )
-        .unwrap();
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        for d in [&d0, &d1] {
-            store
-                .add_location(
-                    d.to_str().unwrap(),
-                    d.to_str().unwrap(),
-                    100,
-                    DiskType::HardDrive,
-                    MinFreeSpace::Percent(0.0),
-                    Vec::new(),
-                )
-                .unwrap();
-        }
-
-        let phantom = d1.join(format!("{}_{}.dat", coll, vid));
-        assert!(
-            !phantom.exists(),
-            "loader created a phantom .dat from a lone .vif"
-        );
-        let total: usize = store.locations.iter().map(|l| l.ec_shard_count()).sum();
-        assert_eq!(total, 2, "real EC shards were deleted (total={})", total);
-    }
-
-    /// A disk holding a few local shards of a healthy distributed EC volume
-    /// plus a leftover empty `.dat` stub: the stub must be swept before EC
-    /// validation can mistake the volume for an interrupted local encode
-    /// (fewer than data_shards local shards) and delete the only copies of
-    /// those shards.
-    #[test]
-    fn test_empty_dat_stub_next_to_ecx_does_not_delete_shards() {
-        let tmp = TempDir::new().unwrap();
-        let d0 = tmp.path().join("data0");
-        std::fs::create_dir_all(&d0).unwrap();
-        let dir = d0.to_str().unwrap();
-        let coll = "warp-rec";
-        let vid = 87u32;
-
-        write_shard(dir, coll, vid, 0);
-        write_shard(dir, coll, vid, 5);
-        write_index_files(dir, coll, vid, 10, 4);
-        // Zero-byte stub .dat: the phantom left by the pre-fix loader.
-        std::fs::write(d0.join(format!("{}_{}.dat", coll, vid)), b"").unwrap();
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        store
-            .add_location(
-                dir,
-                dir,
-                100,
-                DiskType::HardDrive,
-                MinFreeSpace::Percent(0.0),
-                Vec::new(),
-            )
-            .unwrap();
-
-        assert!(
-            !d0.join(format!("{}_{}.dat", coll, vid)).exists(),
-            "empty .dat stub was not swept"
-        );
-        assert_eq!(
-            store.locations[0].ec_shard_count(),
-            2,
-            "EC shards were deleted on the stub's account"
-        );
-        assert_eq!(
-            store.locations[0].volume_ids().len(),
-            0,
-            "stub was loaded as a phantom volume"
-        );
-    }
-
-    /// Same shard-holding disk but the stub has no `.vif` at all, so the
-    /// sweep has no EC evidence and must leave it. The empty `.dat` still
-    /// must not count as an encode source: the shards survive and load as
-    /// a distributed EC volume.
-    #[test]
-    fn test_empty_dat_without_vif_does_not_delete_shards() {
-        let tmp = TempDir::new().unwrap();
-        let d0 = tmp.path().join("data0");
-        std::fs::create_dir_all(&d0).unwrap();
-        let dir = d0.to_str().unwrap();
-        let coll = "warp-rec";
-        let vid = 88u32;
-
-        write_shard(dir, coll, vid, 1);
-        write_shard(dir, coll, vid, 7);
-        write_index_files(dir, coll, vid, 10, 4);
-        std::fs::remove_file(d0.join(format!("{}_{}.vif", coll, vid))).unwrap();
-        std::fs::write(d0.join(format!("{}_{}.dat", coll, vid)), b"").unwrap();
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        store
-            .add_location(
-                dir,
-                dir,
-                100,
-                DiskType::HardDrive,
-                MinFreeSpace::Percent(0.0),
-                Vec::new(),
-            )
-            .unwrap();
-
-        assert_eq!(
-            store.locations[0].ec_shard_count(),
-            2,
-            "EC shards were deleted on the empty .dat's account"
-        );
-        assert_eq!(
-            store.locations[0].volume_ids().len(),
-            0,
-            "empty .dat was loaded as a phantom volume"
-        );
-    }
-
-    /// Regression for the prune credibility gate: when the EC `.vif`
-    /// records no source size (`dat_file_size == 0`), an empty 8-byte
-    /// sibling `.dat` stub must NOT justify deleting partial EC shards.
-    #[test]
-    fn test_prune_refuses_unverifiable_8byte_dat() {
-        let tmp = TempDir::new().unwrap();
-        let d0 = tmp.path().join("data0");
-        let d1 = tmp.path().join("data1");
-        std::fs::create_dir_all(&d0).unwrap();
-        std::fs::create_dir_all(&d1).unwrap();
-        let coll = "warp-loadtest";
-        let vid = 99u32;
-
-        // d0: partial EC (2 shards); its `.vif` records no source size.
-        write_shard(d0.to_str().unwrap(), coll, vid, 0);
-        write_shard(d0.to_str().unwrap(), coll, vid, 1);
-        write_index_files(d0.to_str().unwrap(), coll, vid, 10, 4);
-
-        // d1: a real but empty 8-byte (superblock-sized) `.dat` stub.
-        std::fs::write(d1.join(format!("{}_{}.dat", coll, vid)), vec![0u8; 8]).unwrap();
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        for d in [&d0, &d1] {
-            store
-                .add_location(
-                    d.to_str().unwrap(),
-                    d.to_str().unwrap(),
-                    100,
-                    DiskType::HardDrive,
-                    MinFreeSpace::Percent(0.0),
-                    Vec::new(),
-                )
-                .unwrap();
-        }
-
-        let total: usize = store.locations.iter().map(|l| l.ec_shard_count()).sum();
-        assert_eq!(
-            total, 2,
-            "prune deleted shards against an unverifiable 8-byte .dat (total={})",
-            total
-        );
-    }
-
     /// Reproduces the orphan-shard layout from issue #9212. Shards live
     /// on dir0; the .ecx / .ecj / .vif live on dir1. Without
     /// reconciliation, dir0's shards are silently dropped at startup.
@@ -1044,7 +517,7 @@ mod tests {
         let (mut store, _tmp) = build_split_disk_store(7003);
         let vid = VolumeId(7003);
 
-        store.unmount_ec_shard(vid, 1, 0).unwrap();
+        store.unmount_ec_shard(vid, 1).unwrap();
         assert_eq!(store.find_ec_shard_location(vid, 1), None);
         // Other shards untouched.
         assert_eq!(store.find_ec_shard_location(vid, 0), Some(0));
@@ -1251,269 +724,6 @@ mod tests {
         assert!(ev.has_shard(0));
         assert!(ev.has_shard(1));
     }
-
-    /// Reproduces the issue 9478 layout for a single volume server:
-    /// disk A holds a healthy `.dat` for vid 122; disk B holds a single
-    /// `.ec01` plus `.ecx` / `.ecj` / `.vif` and no `.dat`. The per-disk
-    /// loader mounts the partial shard on disk B as if it were a
-    /// distributed-EC layout. The Store-level prune must unmount and
-    /// delete the leftover EC files on disk B while leaving disk A's
-    /// `.dat` untouched.
-    #[test]
-    fn test_prune_drops_partial_ec_when_sibling_disk_has_dat() {
-        let tmp = TempDir::new().unwrap();
-        let dat_dir = tmp.path().join("sdd");
-        let ec_dir = tmp.path().join("sdf");
-        std::fs::create_dir_all(&dat_dir).unwrap();
-        std::fs::create_dir_all(&ec_dir).unwrap();
-
-        // Real collection so the loader's volume_file_name-based `.ecx`
-        // lookup matches the helpers (empty collection emits `_122.*` vs the
-        // expected `122.*`).
-        let collection = "pics";
-        let vid = 122u32;
-
-        // Disk A (sdd): a .dat whose size must byte-exactly match the EC
-        // source size recorded in the sibling .vif for the prune to treat it
-        // as the committed source.
-        let dat_path = dat_dir.join(format!("{}_{}.dat", collection, vid));
-        std::fs::write(&dat_path, vec![0u8; 1024]).unwrap();
-
-        // Disk B (sdf): partial EC — one shard, plus .ecx / .ecj / .vif.
-        write_shard(ec_dir.to_str().unwrap(), collection, vid, 1);
-        write_index_files(ec_dir.to_str().unwrap(), collection, vid, 10, 4);
-        // Record the encode-time source size in the EC .vif so the prune's
-        // byte-exact credibility gate recognizes the 1024-byte sibling .dat as
-        // the source (a real encoded volume records this).
-        std::fs::write(
-            ec_dir.join(format!("{}_{}.vif", collection, vid)),
-            serde_json::to_string(&VifVolumeInfo {
-                version: 3,
-                dat_file_size: 1024,
-                ec_shard_config: Some(VifEcShardConfig {
-                    data_shards: 10,
-                    parity_shards: 4,
-                    ..Default::default()
-                }),
-                ..Default::default()
-            })
-            .unwrap(),
-        )
-        .unwrap();
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        store
-            .add_location(
-                dat_dir.to_str().unwrap(),
-                dat_dir.to_str().unwrap(),
-                100,
-                DiskType::HardDrive,
-                MinFreeSpace::Percent(0.0),
-                Vec::new(),
-            )
-            .unwrap();
-        store
-            .add_location(
-                ec_dir.to_str().unwrap(),
-                ec_dir.to_str().unwrap(),
-                100,
-                DiskType::HardDrive,
-                MinFreeSpace::Percent(0.0),
-                Vec::new(),
-            )
-            .unwrap();
-
-        // After add_location for sdf, the per-disk loader has mounted
-        // the partial shard AND the prune has run as part of
-        // add_location's epilogue. Confirm the prune removed it.
-        let ec_loc = &store.locations[1];
-        assert!(
-            ec_loc.find_ec_volume(VolumeId(vid)).is_none(),
-            "partial EC volume should have been unmounted by the prune",
-        );
-
-        let ec_base = ec_dir
-            .join(format!("{}_{}", collection, vid).trim_start_matches('_'))
-            .to_string_lossy()
-            .into_owned();
-        assert!(
-            !std::path::Path::new(&format!("{}.ec01", ec_base)).exists(),
-            "partial shard file should have been removed",
-        );
-        assert!(
-            !std::path::Path::new(&format!("{}.ecx", ec_base)).exists(),
-            ".ecx should have been removed",
-        );
-        assert!(
-            !std::path::Path::new(&format!("{}.ecj", ec_base)).exists(),
-            ".ecj should have been removed",
-        );
-
-        // The .dat on the sibling disk must survive — pruning the
-        // partial EC must never touch the healthy replica.
-        assert!(
-            dat_path.exists(),
-            "healthy .dat on sibling disk should be left alone",
-        );
-    }
-
-    /// Safety guard for `prune_incomplete_ec_with_sibling_dat`: when
-    /// the sibling `.dat` is smaller than the source size recorded in
-    /// the EC's `.vif`, the `.dat` is clearly truncated and is not a
-    /// credible fallback. The partial shard may still combine with
-    /// shards on other servers in a recoverable distributed-EC layout,
-    /// so we leave the EC files in place.
-    #[test]
-    fn test_prune_keeps_partial_ec_when_sibling_dat_is_smaller_than_vif_source_size() {
-        let tmp = TempDir::new().unwrap();
-        let dat_dir = tmp.path().join("sdd");
-        let ec_dir = tmp.path().join("sdf");
-        std::fs::create_dir_all(&dat_dir).unwrap();
-        std::fs::create_dir_all(&ec_dir).unwrap();
-
-        let collection = "logs";
-        let vid = 122u32;
-
-        // Tiny but loadable .dat on sdd: a valid 8-byte version-3
-        // superblock so Volume::new succeeds, padded out to a few
-        // hundred bytes so we have something well below the .vif-
-        // recorded source size below. Anything smaller would let
-        // Volume::new's auto-write extend the file to SUPER_BLOCK_SIZE
-        // and obscure the truncation we're trying to model.
-        let dat_path = dat_dir.join(format!("{}_{}.dat", collection, vid));
-        let mut dat_bytes = crate::storage::super_block::SuperBlock::default().to_bytes();
-        dat_bytes.resize(256, 0u8);
-        std::fs::write(&dat_path, &dat_bytes).unwrap();
-        let sibling_dat_size = dat_bytes.len() as u64;
-        let source_size = 10 * 1024 * 1024u64; // 10 MiB recorded in .vif
-        assert!(sibling_dat_size < source_size);
-
-        // Partial EC: one shard plus .ecx / .ecj / .vif. The .vif
-        // records the source .dat size at encode time; the safety
-        // check compares the sibling .dat against this value.
-        write_shard(ec_dir.to_str().unwrap(), collection, vid, 1);
-        let vif = VifVolumeInfo {
-            version: 3,
-            dat_file_size: source_size as i64,
-            ec_shard_config: Some(VifEcShardConfig {
-                data_shards: 10,
-                parity_shards: 4,
-                ..Default::default()
-            }),
-            ..Default::default()
-        };
-        std::fs::write(
-            ec_dir.join(format!("{}_{}.vif", collection, vid)),
-            serde_json::to_string(&vif).unwrap(),
-        )
-        .unwrap();
-        std::fs::write(
-            ec_dir.join(format!("{}_{}.ecx", collection, vid)),
-            vec![0u8; 20],
-        )
-        .unwrap();
-        std::fs::write(
-            ec_dir.join(format!("{}_{}.ecj", collection, vid)),
-            b"",
-        )
-        .unwrap();
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        store
-            .add_location(
-                dat_dir.to_str().unwrap(),
-                dat_dir.to_str().unwrap(),
-                100,
-                DiskType::HardDrive,
-                MinFreeSpace::Percent(0.0),
-                Vec::new(),
-            )
-            .unwrap();
-        store
-            .add_location(
-                ec_dir.to_str().unwrap(),
-                ec_dir.to_str().unwrap(),
-                100,
-                DiskType::HardDrive,
-                MinFreeSpace::Percent(0.0),
-                Vec::new(),
-            )
-            .unwrap();
-
-        // Prune ran as part of add_location's epilogue. Confirm the
-        // partial EC was left alone because the sibling .dat is too
-        // small to be the encoding source.
-        let ec_loc = &store.locations[1];
-        let ev = ec_loc
-            .find_ec_volume(VolumeId(vid))
-            .expect("partial EC volume must remain mounted when the sibling .dat is smaller than the .vif source size");
-        assert_eq!(ev.shard_count(), 1);
-
-        let ec_base = ec_dir
-            .join(format!("{}_{}", collection, vid))
-            .to_string_lossy()
-            .into_owned();
-        assert!(
-            std::path::Path::new(&format!("{}.ec01", ec_base)).exists(),
-            "partial shard file must survive when the sibling .dat is truncated",
-        );
-        assert!(
-            std::path::Path::new(&format!("{}.ecx", ec_base)).exists(),
-            ".ecx must survive when the sibling .dat is truncated",
-        );
-    }
-
-    /// A distributed EC volume — no `.dat` on any disk of this store —
-    /// must not be touched by the prune even when shard count is below
-    /// `DATA_SHARDS_COUNT`. Partial shard layouts are normal for
-    /// distributed EC.
-    #[test]
-    fn test_prune_leaves_distributed_ec_alone() {
-        let tmp = TempDir::new().unwrap();
-        let dir0 = tmp.path().join("data0");
-        let dir1 = tmp.path().join("data1");
-        std::fs::create_dir_all(&dir0).unwrap();
-        std::fs::create_dir_all(&dir1).unwrap();
-
-        let collection = "logs";
-        let vid = 7u32;
-
-        // Two shards on dir0 with .ecx, no .dat anywhere.
-        write_shard(dir0.to_str().unwrap(), collection, vid, 1);
-        write_shard(dir0.to_str().unwrap(), collection, vid, 2);
-        write_index_files(dir0.to_str().unwrap(), collection, vid, 10, 4);
-
-        let mut store = Store::new(NeedleMapKind::InMemory);
-        for dir in [&dir0, &dir1] {
-            store
-                .add_location(
-                    dir.to_str().unwrap(),
-                    dir.to_str().unwrap(),
-                    100,
-                    DiskType::HardDrive,
-                    MinFreeSpace::Percent(0.0),
-                    Vec::new(),
-                )
-                .unwrap();
-        }
-
-        let ev = store.locations[0]
-            .find_ec_volume(VolumeId(vid))
-            .expect("distributed EC volume should still be mounted on dir0");
-        assert_eq!(
-            ev.shard_count(),
-            2,
-            "no .dat anywhere on this store means the partial shards must be kept as distributed EC",
-        );
-
-        let ec_base = dir0
-            .join(format!("{}_{}", collection, vid))
-            .to_string_lossy()
-            .into_owned();
-        assert!(std::path::Path::new(&format!("{}.ec01", ec_base)).exists());
-        assert!(std::path::Path::new(&format!("{}.ec02", ec_base)).exists());
-        assert!(std::path::Path::new(&format!("{}.ecx", ec_base)).exists());
-    }
 }
 
 /// Walk a disk's data directory and return the `.ec??` shard files

seaweed-volume/src/storage/volume.rs

@@ -189,10 +189,6 @@ pub struct VifEcShardConfig {
     pub data_shards: u32,
     #[serde(default, rename = "parityShards")]
     pub parity_shards: u32,
-    /// Encode time (unix nanos). Shards and .ecx of one encode run share it,
-    /// so a read served from a different run's shard is rejected.
-    #[serde(default, rename = "encodeTsNs", with = "string_or_i64")]
-    pub encode_ts_ns: i64,
 }
 
 /// Serde-compatible representation of OldVersionVolumeInfo for legacy .vif JSON deserialization.
@@ -283,7 +279,6 @@ impl VifVolumeInfo {
             ec_shard_config: pb.ec_shard_config.as_ref().map(|c| VifEcShardConfig {
                 data_shards: c.data_shards,
                 parity_shards: c.parity_shards,
-                encode_ts_ns: c.encode_ts_ns,
             }),
         }
     }
@@ -314,7 +309,6 @@ impl VifVolumeInfo {
                 crate::pb::volume_server_pb::EcShardConfig {
                     data_shards: c.data_shards,
                     parity_shards: c.parity_shards,
-                    encode_ts_ns: c.encode_ts_ns,
                 }
             }),
         }
@@ -588,36 +582,6 @@ impl Volume {
         Ok(v)
     }
 
-    /// Build a minimal, unloaded Volume holding only the identity/path fields
-    /// reconcile_compact_state needs. Used by the disk-location load pre-pass to
-    /// recover an interrupted commit before the volume itself is loaded.
-    pub fn new_unloaded(dirname: &str, dir_idx: &str, collection: &str, id: VolumeId) -> Self {
-        Volume {
-            id,
-            dir: dirname.to_string(),
-            dir_idx: dir_idx.to_string(),
-            collection: collection.to_string(),
-            dat_file: None,
-            remote_dat_file: None,
-            nm: None,
-            needle_map_kind: NeedleMapKind::InMemory,
-            data_file_access_control: Arc::new(DataFileAccessControl::default()),
-            super_block: SuperBlock::default(),
-            no_write_or_delete: false,
-            no_write_can_delete: false,
-            location_disk_space_low: Arc::new(AtomicBool::new(false)),
-            last_modified_ts_seconds: 0,
-            last_append_at_ns: 0,
-            last_compact_index_offset: 0,
-            last_compact_revision: 0,
-            is_compacting: false,
-            compaction_byte_per_second: 0,
-            last_io_error: Mutex::new(None),
-            volume_info: PbVolumeInfo::default(),
-            has_remote_file: false,
-        }
-    }
-
     /// Returns true if the volume is currently being compacted.
     pub fn is_compacting(&self) -> bool {
         self.is_compacting
@@ -809,13 +773,6 @@ impl Volume {
         Ok(())
     }
 
-    fn nm_or_not_found(&self) -> Result<&NeedleMap, VolumeError> {
-        self.nm.as_ref().ok_or_else(|| {
-            tracing::warn!(volume_id = self.id.0, "needle map not loaded");
-            VolumeError::NotFound
-        })
-    }
-
     fn load_index(&mut self) -> Result<(), VolumeError> {
         let use_redb = matches!(
             self.needle_map_kind,
@@ -1101,7 +1058,7 @@ impl Volume {
         read_option: &mut ReadOption,
     ) -> Result<i32, VolumeError> {
         let _guard = self.data_file_access_control.read_lock();
-        let nm = self.nm_or_not_found()?;
+        let nm = self.nm.as_ref().ok_or(VolumeError::NotFound)?;
         let nv = nm.get(n.id).ok_or(VolumeError::NotFound)?;
 
         if nv.offset.is_zero() {
@@ -1343,7 +1300,7 @@ impl Volume {
         read_deleted: bool,
     ) -> Result<NeedleStreamInfo, VolumeError> {
         let _guard = self.data_file_access_control.read_lock();
-        let nm = self.nm_or_not_found()?;
+        let nm = self.nm.as_ref().ok_or(VolumeError::NotFound)?;
         let nv = nm.get(n.id).ok_or(VolumeError::NotFound)?;
 
         if nv.offset.is_zero() {
@@ -1445,7 +1402,7 @@ impl Volume {
         &self,
         needle_id: NeedleId,
     ) -> Result<(u64, u16), VolumeError> {
-        let nm = self.nm_or_not_found()?;
+        let nm = self.nm.as_ref().ok_or(VolumeError::NotFound)?;
         let nv = nm.get(needle_id).ok_or(VolumeError::NotFound)?;
         if nv.offset.is_zero() {
             return Err(VolumeError::NotFound);
@@ -1762,7 +1719,7 @@ impl Volume {
     /// Read all live needles from the volume (for ReadAllNeedles streaming RPC).
     pub fn read_all_needles(&self) -> Result<Vec<Needle>, VolumeError> {
         let _guard = self.data_file_access_control.read_lock();
-        let nm = self.nm_or_not_found()?;
+        let nm = self.nm.as_ref().ok_or(VolumeError::NotFound)?;
         let version = self.version();
         let dat_size = self.current_dat_file_size()? as i64;
         let mut needles = Vec::new();
@@ -1951,7 +1908,7 @@ impl Volume {
         if self.dat_file.is_none() && self.remote_dat_file.is_none() {
             return Err(VolumeError::NotFound);
         }
-        let nm = self.nm_or_not_found()?;
+        let nm = self.nm.as_ref().ok_or(VolumeError::NotFound)?;
         let dat_size = self.dat_file_size().map_err(VolumeError::Io)?;
 
         let mut files_checked: u64 = 0;
@@ -2011,7 +1968,7 @@ impl Volume {
         if self.dat_file.is_none() && self.remote_dat_file.is_none() {
             return Err(VolumeError::NotFound);
         }
-        let nm = self.nm_or_not_found()?;
+        let nm = self.nm.as_ref().ok_or(VolumeError::NotFound)?;
 
         let dat_size = self.dat_file_size().map_err(|e| VolumeError::Io(e))?;
         let version = self.version();
@@ -2158,34 +2115,7 @@ impl Volume {
     }
 
     /// Mark this volume as writable (allow writes and deletes).
-    ///
-    /// If the volume booted with .vif ReadOnly=true, `load_index` built the
-    /// needle map without an .idx writer attached, so subsequent puts would
-    /// silently skip the on-disk append and only mutate in-memory state —
-    /// surviving until the next restart, then vanishing. Re-attach a writer
-    /// here so writes persist again.
     pub fn set_writable(&mut self) -> Result<(), VolumeError> {
-        // Attach the writer (if missing) before flipping the flag — otherwise
-        // a transient open/metadata failure would leave the volume marked
-        // writable with no .idx writer, and subsequent puts would silently
-        // skip the on-disk append and vanish on the next restart.
-        let needs_idx_writer = self
-            .nm
-            .as_ref()
-            .map(|nm| !nm.has_idx_writer())
-            .unwrap_or(false);
-        if needs_idx_writer {
-            let idx_path = self.file_name(".idx");
-            let write_file = OpenOptions::new()
-                .write(true)
-                .append(true)
-                .create(true)
-                .open(&idx_path)?;
-            let idx_size = write_file.metadata()?.len();
-            if let Some(ref mut nm) = self.nm {
-                nm.set_idx_file(Box::new(write_file), idx_size);
-            }
-        }
         self.no_write_or_delete = false;
         self.save_vif()
     }
@@ -2927,14 +2857,28 @@ impl Volume {
         self.dat_file = None;
         self.remote_dat_file = None;
 
-        // makeup_diff has fsynced the .cpd/.cpx contents. Persist a durable .cpc
-        // commit marker BEFORE the renames so the two-rename swap is atomic
-        // across a crash: a marker on disk means the swap is decided and
-        // reconcile rolls forward; no marker means roll back. Without it, a
-        // crash between the two renames leaves a stale .idx that a later vacuum
-        // compacts to empty.
-        self.write_compact_commit_marker()?;
-        self.apply_compact_swap()?;
+        let cpd_path = self.file_name(".cpd");
+        let cpx_path = self.file_name(".cpx");
+        let dat_path = self.file_name(".dat");
+        let idx_path = self.file_name(".idx");
+
+        // Check that compact files exist
+        if !Path::new(&cpd_path).exists() || !Path::new(&cpx_path).exists() {
+            return Err(VolumeError::Io(io::Error::new(
+                io::ErrorKind::NotFound,
+                "compact files (.cpd/.cpx) not found",
+            )));
+        }
+
+        // Swap files: .cpd → .dat, .cpx → .idx
+        fs::rename(&cpd_path, &dat_path)?;
+        fs::rename(&cpx_path, &idx_path)?;
+
+        // Remove any leveldb/redb index files (rebuilt from .idx on reload)
+        let ldb_path = self.file_name(".ldb");
+        let _ = fs::remove_dir_all(&ldb_path);
+        let rdb_path = self.file_name(".rdb");
+        let _ = fs::remove_file(&rdb_path);
 
         // Reload
         self.load(true, false, 0, self.version())?;
@@ -2942,165 +2886,30 @@ impl Volume {
         Ok(())
     }
 
-    /// Write and fsync the .cpc marker, then fsync the directory so the marker
-    /// survives a crash before apply_compact_swap.
-    fn write_compact_commit_marker(&self) -> Result<(), VolumeError> {
-        let marker_path = self.file_name(".cpc");
-        let f = OpenOptions::new()
-            .write(true)
-            .create(true)
-            .truncate(true)
-            .open(&marker_path)?;
-        f.sync_all()?;
-        drop(f);
-        fsync_dir(&marker_path)?;
-        Ok(())
-    }
-
-    /// Perform the durable two-rename compaction commit. Idempotent: run both at
-    /// the tail of commit and by reconcile rolling forward after a crash. It
-    /// requires BOTH .cpd/.cpx to be present, so a stale or duplicate commit
-    /// returns an error without deleting the live .dat/.idx.
-    fn apply_compact_swap(&self) -> Result<(), VolumeError> {
-        // Normal commit: both temp files must be present, or a stale/duplicate
-        // commit could clobber the live .dat/.idx.
-        if !Path::new(&self.file_name(".cpd")).exists()
-            || !Path::new(&self.file_name(".cpx")).exists()
-        {
-            return Err(VolumeError::Io(io::Error::new(
-                io::ErrorKind::NotFound,
-                "compact files (.cpd/.cpx) not found",
-            )));
-        }
-        self.finish_compact_swap()
-    }
-
-    /// Renames whichever compaction temp file is still present (.cpd->.dat,
-    /// .cpx->.idx), fsyncs, drops the stale .ldb/.rdb, then clears the .cpc
-    /// marker. Tolerates a partial state: a crash after the .dat rename but
-    /// before the .idx rename leaves only .cpx, which must still be applied --
-    /// not abandoned, which would pair a fresh .dat with a stale .idx. Existence
-    /// is checked robustly so a transient error never silently skips the swap.
-    fn finish_compact_swap(&self) -> Result<(), VolumeError> {
-        let exists = |p: String| match fs::metadata(&p) {
-            Ok(_) => true,
-            Err(e) if e.kind() == io::ErrorKind::NotFound => false,
-            Err(_) => true,
-        };
-        let dat_path = self.file_name(".dat");
-        let idx_path = self.file_name(".idx");
-        let cpd_exists = exists(self.file_name(".cpd"));
-        let cpx_exists = exists(self.file_name(".cpx"));
-
-        if cpd_exists {
-            #[cfg(windows)]
-            {
-                let _ = fs::remove_file(&dat_path);
-            }
-            fs::rename(self.file_name(".cpd"), &dat_path)?;
-        }
-        if cpx_exists {
-            #[cfg(windows)]
-            {
-                let _ = fs::remove_file(&idx_path);
-            }
-            fs::rename(self.file_name(".cpx"), &idx_path)?;
-        }
-        if cpd_exists || cpx_exists {
-            fsync_dir(&dat_path)?;
-            if self.dir != self.dir_idx {
-                fsync_dir(&idx_path)?;
-            }
-            let _ = fs::remove_dir_all(self.file_name(".ldb"));
-            let _ = fs::remove_file(self.file_name(".rdb"));
-        }
-
-        // Clear the marker last and fsync the dir so a restart does not re-run a
-        // completed swap.
-        let marker_path = self.file_name(".cpc");
-        match fs::remove_file(&marker_path) {
-            Ok(()) => {}
-            Err(e) if e.kind() == io::ErrorKind::NotFound => {}
-            Err(e) => return Err(e.into()),
-        }
-        fsync_dir(&marker_path)?;
-        Ok(())
-    }
-
-    /// Recover an interrupted compaction commit on load. When the .cpc marker is
-    /// present the swap was decided, so roll FORWARD by finishing the renames;
-    /// when it is absent any leftover .cpd/.cpx are an abandoned generation, so
-    /// roll BACK by deleting them (and any stale .ldb beside a healthy .idx).
-    pub fn reconcile_compact_state(&self) -> Result<(), VolumeError> {
-        let cpc_path = self.file_name(".cpc");
-        if Path::new(&cpc_path).exists() {
-            // Marker present: the swap was decided. Finish whichever rename is
-            // still pending -- a crash may have completed only the .dat rename,
-            // so the lone remaining .cpx must still be applied, not abandoned.
-            // If neither temp file remains, finish_compact_swap clears the marker.
-            tracing::info!(
-                volume_id = self.id.0,
-                "rolling forward interrupted compaction commit"
-            );
-            return self.finish_compact_swap();
-        }
-
-        // No marker: roll back any orphan compaction temp files.
-        let mut rolled_back = false;
-        for ext in &[".cpd", ".cpx"] {
-            let p = self.file_name(ext);
-            if Path::new(&p).exists() {
-                tracing::info!(
-                    volume_id = self.id.0,
-                    "rolling back orphan compaction file {}",
-                    ext
-                );
-                match fs::remove_file(&p) {
-                    Ok(()) => {}
-                    Err(e) if e.kind() == io::ErrorKind::NotFound => {}
-                    Err(e) => return Err(e.into()),
-                }
-                rolled_back = true;
-            }
-        }
-        if rolled_back {
-            let _ = fs::remove_dir_all(self.file_name(".ldb"));
-            let _ = fs::remove_file(self.file_name(".rdb"));
-        }
-        Ok(())
-    }
-
     /// Clean up leftover compaction files (.cpd, .cpx).
     pub fn cleanup_compact(&self) -> Result<(), VolumeError> {
-        // Refuse to unlink .cpd/.cpx while a .cpc marker exists: those temp files
-        // are the only inputs reconcile can roll forward to, so removing them
-        // mid-commit would strand a decided swap.
-        if Path::new(&self.file_name(".cpc")).exists() {
-            return Err(VolumeError::Io(io::Error::new(
-                io::ErrorKind::Other,
-                format!(
-                    "volume {}: refusing cleanup while commit marker present",
-                    self.id
-                ),
-            )));
-        }
-
         let cpd_path = self.file_name(".cpd");
         let cpx_path = self.file_name(".cpx");
         let cpldb_path = self.file_name(".cpldb");
-        let cpc_path = self.file_name(".cpc");
 
         let e1 = fs::remove_file(&cpd_path);
         let e2 = fs::remove_file(&cpx_path);
         let e3 = fs::remove_dir_all(&cpldb_path);
-        let e4 = fs::remove_file(&cpc_path);
 
         // Ignore NotFound errors
-        for e in [e1, e2, e3, e4] {
-            if let Err(e) = e {
-                if e.kind() != io::ErrorKind::NotFound {
-                    return Err(e.into());
-                }
+        if let Err(e) = e1 {
+            if e.kind() != io::ErrorKind::NotFound {
+                return Err(e.into());
+            }
+        }
+        if let Err(e) = e2 {
+            if e.kind() != io::ErrorKind::NotFound {
+                return Err(e.into());
+            }
+        }
+        if let Err(e) = e3 {
+            if e.kind() != io::ErrorKind::NotFound {
+                return Err(e.into());
             }
         }
 
@@ -3228,15 +3037,11 @@ impl Volume {
                 let bytes = fake_del_needle.write_bytes(version);
                 dst_dat.write_all(&bytes)?;
 
-                // Record the tombstone's real .dat offset, like the normal delete path,
-                // so a deletion left at the .dat tail stays visible to the integrity
-                // check on reload. Offset 0 hid the trailing tombstone and falsely
-                // flipped the volume read-only.
                 let mut idx_entry_buf = [0u8; NEEDLE_MAP_ENTRY_SIZE];
                 crate::storage::types::idx_entry_to_bytes(
                     &mut idx_entry_buf,
                     key,
-                    Offset::from_actual_offset(dat_offset as i64),
+                    Offset::from_actual_offset(0),
                     Size(crate::storage::types::TOMBSTONE_FILE_SIZE.into()),
                 );
                 dst_idx.write_all(&idx_entry_buf)?;
@@ -3276,10 +3081,7 @@ impl Volume {
     }
 
     /// Remove all volume files from disk.
-    /// Destroy removes everything related to this volume. When keep_remote_data
-    /// is true the cloud-tier object backing the volume is left intact — used
-    /// by moves where another server is taking over the same .vif.
-    pub fn destroy(&mut self, only_empty: bool, keep_remote_data: bool) -> Result<(), VolumeError> {
+    pub fn destroy(&mut self, only_empty: bool) -> Result<(), VolumeError> {
         if only_empty && self.file_count() > 0 {
             return Err(VolumeError::NotEmpty);
         }
@@ -3291,11 +3093,7 @@ impl Volume {
         }
 
         let (storage_name, storage_key) = self.remote_storage_name_key();
-        if !keep_remote_data
-            && self.has_remote_file
-            && !storage_name.is_empty()
-            && !storage_key.is_empty()
-        {
+        if self.has_remote_file && !storage_name.is_empty() && !storage_key.is_empty() {
             let backend = crate::remote_storage::s3_tier::global_s3_tier_registry()
                 .read()
                 .unwrap()
@@ -3318,34 +3116,12 @@ impl Volume {
             }
         }
 
-        // A regular volume and an EC volume for the same id share <base>.vif.
-        // When EC artefacts coexist on this disk (e.g. shards distributed onto
-        // a source replica before it is deleted), keep the .vif so removing the
-        // regular volume does not strip the EC volume's info file.
-        let keep_vif = self.shares_vif_with_ec_volume();
         self.close();
-        remove_volume_files(&self.data_file_name(), keep_vif);
-        remove_volume_files(&self.index_file_name(), keep_vif);
+        remove_volume_files(&self.data_file_name());
+        remove_volume_files(&self.index_file_name());
         Ok(())
     }
 
-    /// Reports whether an EC volume for this id has a sealed .ecx on the same
-    /// disk, in which case its .vif is the same file as the regular volume's
-    /// and must outlive the regular volume's deletion. Mirrors the on-disk
-    /// portion of Go's Volume.sharesVifWithEcVolume / HasEcxFileOnDisk.
-    fn shares_vif_with_ec_volume(&self) -> bool {
-        let has_ecx = |base: &str| -> bool {
-            fs::metadata(format!("{}.ecx", base))
-                .map(|m| !m.is_dir() && m.len() > 0)
-                .unwrap_or(false)
-        };
-        if has_ecx(&volume_file_name(&self.dir_idx, &self.collection, self.id)) {
-            return true;
-        }
-        self.dir != self.dir_idx
-            && has_ecx(&volume_file_name(&self.dir, &self.collection, self.id))
-    }
-
     /// Check if an I/O error is EIO (errno 5) and record it for health monitoring.
     /// On success (None), clears any previously recorded EIO error.
     /// Matches Go's `checkReadWriteError` in volume_write.go.
@@ -3413,42 +3189,11 @@ fn get_append_at_ns(last: u64) -> u64 {
 }
 
 /// Remove all files associated with a volume.
-/// .dat/.idx removals log at info level so destructive calls are traceable.
-/// fsync the parent directory of `path` so a rename/create/unlink inside it is
-/// durable, propagating a sync failure so the commit path can abort rather than
-/// proceed with an undurable rename or marker. A path with no openable parent is
-/// tolerated; directory fsync is unsupported on Windows, so it is a no-op there
-/// (matching the Go fsyncDir helper, which ignores that error).
-pub(crate) fn fsync_dir(path: &str) -> io::Result<()> {
-    #[cfg(windows)]
-    {
-        let _ = path;
-        Ok(())
-    }
-    #[cfg(not(windows))]
-    {
-        if let Some(parent) = Path::new(path).parent() {
-            if let Ok(d) = File::open(parent) {
-                return d.sync_all();
-            }
-        }
-        Ok(())
-    }
-}
-
-pub(crate) fn remove_volume_files(base: &str, keep_vif: bool) {
+pub(crate) fn remove_volume_files(base: &str) {
     for ext in &[
-        ".dat", ".idx", ".vif", ".sdx", ".cpd", ".cpx", ".cpc", ".note", ".rdb",
+        ".dat", ".idx", ".vif", ".sdx", ".cpd", ".cpx", ".note", ".rdb",
     ] {
-        if *ext == ".vif" && keep_vif {
-            continue;
-        }
-        let path = format!("{}{}", base, ext);
-        let size = fs::metadata(&path).map(|m| m.len()).unwrap_or(0);
-        let existed = fs::remove_file(&path).is_ok();
-        if existed && (*ext == ".dat" || *ext == ".idx") {
-            tracing::info!("removed volume file {} (size={})", path, size);
-        }
+        let _ = fs::remove_file(format!("{}{}", base, ext));
     }
     // leveldb uses a directory
     let _ = fs::remove_dir_all(format!("{}.ldb", base));
@@ -3800,118 +3545,6 @@ mod tests {
         assert!(matches!(err, VolumeError::Deleted));
     }
 
-    // Guard the Rust integrity-check tombstone path against the Go regression
-    // where verifyDeletedNeedleIntegrity forwarded TombstoneFileSize into the
-    // needle-size check, mismatched against the on-disk Size=0 header, and
-    // sent every volume with a trailing deletion read-only on load. The Rust
-    // check guards its size comparison with !size.is_deleted(); this test
-    // keeps that guarantee from silently regressing.
-    #[test]
-    fn test_check_volume_data_integrity_with_deletion_tombstone() {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-
-        {
-            let mut v = make_test_volume(dir);
-            for i in 1..=3 {
-                let data = format!("data {}", i);
-                let mut n = Needle {
-                    id: NeedleId(i),
-                    cookie: Cookie(i as u32),
-                    data: data.as_bytes().to_vec(),
-                    data_size: data.len() as u32,
-                    ..Needle::default()
-                };
-                v.write_needle(&mut n, true).unwrap();
-            }
-            v.delete_needle(&mut Needle {
-                id: NeedleId(2),
-                cookie: Cookie(2),
-                ..Needle::default()
-            })
-            .unwrap();
-            v.sync_to_disk().unwrap();
-        }
-
-        let v = Volume::new(
-            dir,
-            dir,
-            "",
-            VolumeId(1),
-            NeedleMapKind::InMemory,
-            None,
-            None,
-            0,
-            Version::current(),
-        )
-        .unwrap();
-        assert!(
-            !v.is_no_write_or_delete(),
-            "volume should not be read-only after reload with trailing deletion tombstone"
-        );
-    }
-
-    #[test]
-    fn test_scrub_empty_volume() {
-        // Mirror of Go's TestScrubVolumeData "zero-size volume without index"
-        // case (weed/storage/volume_checking_test.go): a freshly created /
-        // pre-allocated volume has a superblock-only .dat and a zero-size .idx,
-        // and must scrub clean instead of being flagged as corrupt.
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-        let v = make_test_volume(dir);
-
-        // .dat holds only the superblock; .idx is empty.
-        assert_eq!(v.dat_file_size().unwrap(), SUPER_BLOCK_SIZE as u64);
-
-        let (files_checked, broken) = v.scrub().unwrap();
-        assert_eq!(files_checked, 0);
-        assert!(
-            broken.is_empty(),
-            "empty volume should scrub clean, got {:?}",
-            broken
-        );
-
-        // The index-only mode must agree.
-        let (idx_checked, idx_broken) = v.scrub_index().unwrap();
-        assert_eq!(idx_checked, 0);
-        assert!(
-            idx_broken.is_empty(),
-            "empty volume should scrub_index clean, got {:?}",
-            idx_broken
-        );
-    }
-
-    #[test]
-    fn test_scrub_healthy_volume() {
-        // Mirror of Go's TestScrubVolumeData "healthy volume" case: a volume
-        // with live needles scrubs clean and the .dat size accounting matches.
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-        let mut v = make_test_volume(dir);
-
-        for i in 1..=5 {
-            let data = format!("needle data {}", i);
-            let mut n = Needle {
-                id: NeedleId(i),
-                cookie: Cookie(i as u32),
-                data: data.as_bytes().to_vec(),
-                data_size: data.len() as u32,
-                ..Needle::default()
-            };
-            v.write_needle(&mut n, true).unwrap();
-        }
-        v.sync_to_disk().unwrap();
-
-        let (files_checked, broken) = v.scrub().unwrap();
-        assert_eq!(files_checked, 5);
-        assert!(
-            broken.is_empty(),
-            "healthy volume should scrub clean, got {:?}",
-            broken
-        );
-    }
-
     #[test]
     fn test_volume_multiple_needles() {
         let tmp = TempDir::new().unwrap();
@@ -4026,7 +3659,7 @@ mod tests {
             dat_path = v.file_name(".dat");
             idx_path = v.file_name(".idx");
             assert!(Path::new(&dat_path).exists());
-            v.destroy(false, false).unwrap();
+            v.destroy(false).unwrap();
         }
 
         assert!(!Path::new(&dat_path).exists());
@@ -4538,91 +4171,6 @@ mod tests {
         assert!(v.no_write_can_delete);
     }
 
-    // A volume booted with .vif ReadOnly=true used to come back stuck —
-    // load_index_inmemory built the CompactNeedleMap without an .idx writer
-    // attached, and set_writable only flipped the flag and rewrote .vif.
-    // The next put silently skipped the .idx append, so the write landed in
-    // memory only and was lost on the next restart.
-    #[test]
-    fn test_set_writable_reattaches_idx_writer_after_persisted_readonly() {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-
-        {
-            let mut v = make_test_volume(dir);
-            let mut n = Needle {
-                id: NeedleId(1),
-                cookie: Cookie(1),
-                data: b"initial".to_vec(),
-                data_size: 7,
-                ..Needle::default()
-            };
-            v.write_needle(&mut n, true).unwrap();
-            v.set_read_only_persist(true).unwrap();
-            v.sync_to_disk().unwrap();
-        }
-
-        let mut v = Volume::new(
-            dir,
-            dir,
-            "",
-            VolumeId(1),
-            NeedleMapKind::InMemory,
-            None,
-            None,
-            0,
-            Version::current(),
-        )
-        .unwrap();
-        assert!(
-            v.no_write_or_delete,
-            "reloaded volume should be read-only from .vif"
-        );
-        assert!(
-            !v.nm.as_ref().unwrap().has_idx_writer(),
-            "read-only load should not attach an .idx writer"
-        );
-
-        v.set_writable().unwrap();
-        assert!(!v.is_read_only());
-        assert!(
-            v.nm.as_ref().unwrap().has_idx_writer(),
-            "set_writable must reattach the .idx writer or post-restart writes vanish"
-        );
-
-        let mut n = Needle {
-            id: NeedleId(2),
-            cookie: Cookie(2),
-            data: b"after-mark-writable".to_vec(),
-            data_size: 19,
-            ..Needle::default()
-        };
-        v.write_needle(&mut n, true).unwrap();
-        v.sync_to_disk().unwrap();
-
-        // Reload one more time — the .idx must contain the post-mark-writable
-        // entry, not just have it in memory.
-        drop(v);
-        let v = Volume::new(
-            dir,
-            dir,
-            "",
-            VolumeId(1),
-            NeedleMapKind::InMemory,
-            None,
-            None,
-            0,
-            Version::current(),
-        )
-        .unwrap();
-        let mut probe = Needle {
-            id: NeedleId(2),
-            ..Needle::default()
-        };
-        v.read_needle(&mut probe).unwrap();
-        assert_eq!(std::str::from_utf8(&probe.data).unwrap(), "after-mark-writable");
-    }
-
     #[test]
     fn test_load_vif_defaults_local_version_and_bytes_offset() {
         let tmp = TempDir::new().unwrap();
@@ -4876,7 +4424,7 @@ mod tests {
         assert!(std::path::Path::new(&idx_path).exists());
 
         // Destroy the volume
-        v.destroy(false, false).unwrap();
+        v.destroy(false).unwrap();
 
         // .dat and .idx should be gone
         assert!(
@@ -4933,7 +4481,7 @@ mod tests {
         assert!(std::path::Path::new(&dat_path).exists());
         assert!(std::path::Path::new(&idx_path).exists());
 
-        v.destroy(false, false).unwrap();
+        v.destroy(false).unwrap();
 
         assert!(
             !std::path::Path::new(&dat_path).exists(),
@@ -4948,184 +4496,4 @@ mod tests {
             ".vif removed from data dir"
         );
     }
-
-    /// When an EC volume for the same id has a sealed .ecx on the same disk, the
-    /// .vif is shared with it and must survive the regular volume's deletion.
-    #[test]
-    fn test_destroy_keeps_vif_when_ec_coexists() {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-
-        let mut v = make_test_volume(dir);
-        let mut n = Needle {
-            id: NeedleId(1),
-            cookie: Cookie(1),
-            data: b"test".to_vec(),
-            data_size: 4,
-            ..Needle::default()
-        };
-        v.write_needle(&mut n, true).unwrap();
-
-        let vif_path = format!("{}/1.vif", dir);
-        std::fs::write(&vif_path, r#"{"version":3}"#).unwrap();
-        // A sealed .ecx marks a coexisting EC volume for the same id.
-        let ecx_path = format!("{}/1.ecx", dir);
-        std::fs::write(&ecx_path, b"ec-index").unwrap();
-
-        v.destroy(false, false).unwrap();
-
-        let dat_path = format!("{}/1.dat", dir);
-        let idx_path = format!("{}/1.idx", dir);
-        assert!(!std::path::Path::new(&dat_path).exists(), ".dat removed");
-        assert!(!std::path::Path::new(&idx_path).exists(), ".idx removed");
-        assert!(
-            std::path::Path::new(&vif_path).exists(),
-            ".vif kept: shared with the coexisting EC volume"
-        );
-        assert!(
-            std::path::Path::new(&ecx_path).exists(),
-            ".ecx is an EC sidecar, never touched here"
-        );
-    }
-
-    /// A crash after the .idx/.dat were consumed but before the .cpx->.idx
-    /// rename committed leaves only .cpd + .cpx + .cpc. reconcile_compact_state
-    /// must roll the swap FORWARD and produce a loadable, writable volume
-    /// holding the compacted needle count.
-    #[test]
-    fn test_reconcile_roll_forward_marker_only() {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-        let mut v = make_test_volume(dir);
-
-        for i in 1..=6u64 {
-            let mut n = Needle {
-                id: NeedleId(i),
-                cookie: Cookie(i as u32),
-                data: format!("data-{}", i).into_bytes(),
-                data_size: format!("data-{}", i).len() as u32,
-                ..Needle::default()
-            };
-            v.write_needle(&mut n, true).unwrap();
-        }
-        for id in [2u64, 5u64] {
-            let mut del = Needle {
-                id: NeedleId(id),
-                cookie: Cookie(id as u32),
-                ..Needle::default()
-            };
-            v.delete_needle(&mut del).unwrap();
-        }
-        let expected_live = v.file_count() - v.deleted_count();
-
-        v.compact_by_index(0, 0, |_| true).unwrap();
-        v.close();
-
-        let cpd = v.file_name(".cpd");
-        let cpx = v.file_name(".cpx");
-        let cpc = v.file_name(".cpc");
-        let dat = v.file_name(".dat");
-        let idx = v.file_name(".idx");
-        assert!(Path::new(&cpd).exists());
-        assert!(Path::new(&cpx).exists());
-
-        // Simulate the mid-commit crash: original .dat/.idx are gone and only
-        // the compacted temp files plus the commit marker survive.
-        fs::remove_file(&dat).unwrap();
-        fs::remove_file(&idx).unwrap();
-        let _ = fs::remove_dir_all(v.file_name(".ldb"));
-        fs::write(&cpc, b"").unwrap();
-
-        v.reconcile_compact_state().unwrap();
-
-        assert!(!Path::new(&cpd).exists(), ".cpd consumed by roll-forward");
-        assert!(!Path::new(&cpx).exists(), ".cpx consumed by roll-forward");
-        assert!(!Path::new(&cpc).exists(), ".cpc cleared after swap");
-        assert!(Path::new(&dat).exists(), ".dat restored by roll-forward");
-        assert!(Path::new(&idx).exists(), ".idx restored by roll-forward");
-
-        // The rolled-forward files must load as a writable volume with the
-        // compacted needle count.
-        let reloaded = make_test_volume(dir);
-        assert!(!reloaded.is_read_only(), "rolled-forward volume read-only");
-        assert_eq!(
-            reloaded.file_count(),
-            expected_live,
-            "rolled-forward volume needle count"
-        );
-    }
-
-    /// With no .cpc marker, leftover .cpd/.cpx are an abandoned generation;
-    /// reconcile must roll BACK by deleting them and leave the live .dat/.idx.
-    #[test]
-    fn test_reconcile_roll_back_no_marker() {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-        let mut v = make_test_volume(dir);
-
-        for i in 1..=4u64 {
-            let mut n = Needle {
-                id: NeedleId(i),
-                cookie: Cookie(i as u32),
-                data: format!("data-{}", i).into_bytes(),
-                data_size: format!("data-{}", i).len() as u32,
-                ..Needle::default()
-            };
-            v.write_needle(&mut n, true).unwrap();
-        }
-        v.compact_by_index(0, 0, |_| true).unwrap();
-
-        let cpd = v.file_name(".cpd");
-        let cpx = v.file_name(".cpx");
-        let dat = v.file_name(".dat");
-        let idx = v.file_name(".idx");
-        assert!(Path::new(&cpd).exists());
-        assert!(Path::new(&cpx).exists());
-        // No .cpc marker exists.
-
-        v.reconcile_compact_state().unwrap();
-
-        assert!(!Path::new(&cpd).exists(), ".cpd rolled back");
-        assert!(!Path::new(&cpx).exists(), ".cpx rolled back");
-        assert!(Path::new(&dat).exists(), "live .dat kept");
-        assert!(Path::new(&idx).exists(), "live .idx kept");
-    }
-
-    /// apply_compact_swap must abort without touching the live .dat/.idx when
-    /// the .cpd/.cpx temp files are missing (a stale or duplicate commit).
-    #[test]
-    fn test_apply_compact_swap_missing_temp_files_preserves_live() {
-        let tmp = TempDir::new().unwrap();
-        let dir = tmp.path().to_str().unwrap();
-        let mut v = make_test_volume(dir);
-
-        for i in 1..=3u64 {
-            let mut n = Needle {
-                id: NeedleId(i),
-                cookie: Cookie(i as u32),
-                data: format!("data-{}", i).into_bytes(),
-                data_size: format!("data-{}", i).len() as u32,
-                ..Needle::default()
-            };
-            v.write_needle(&mut n, true).unwrap();
-        }
-        v.sync_to_disk().unwrap();
-
-        let dat = v.file_name(".dat");
-        let idx = v.file_name(".idx");
-        let dat_len_before = fs::metadata(&dat).unwrap().len();
-
-        // No .cpd/.cpx present: the swap must refuse.
-        assert!(
-            v.apply_compact_swap().is_err(),
-            "swap should error when .cpd/.cpx are missing"
-        );
-        assert!(Path::new(&dat).exists(), "live .dat preserved");
-        assert!(Path::new(&idx).exists(), "live .idx preserved");
-        assert_eq!(
-            fs::metadata(&dat).unwrap().len(),
-            dat_len_before,
-            "live .dat unchanged"
-        );
-    }
 }

seaweed-volume/tests/http_integration.rs

@@ -101,8 +101,6 @@ fn test_state_with_guard(
         read_mode: seaweed_volume::config::ReadMode::Local,
         master_url: String::new(),
         master_urls: Vec::new(),
-        seed_master_set: std::collections::HashSet::new(),
-        current_master_url: tokio::sync::RwLock::new(String::new()),
         self_url: String::new(),
         http_client: reqwest::Client::new(),
         outgoing_http_scheme: "http".to_string(),

terraform/.gitignore

@@ -1,15 +0,0 @@
-# Terraform / OpenTofu working files
-.terraform/
-.terraform.lock.hcl
-*.tfstate
-*.tfstate.*
-crash.log
-crash.*.log
-*.tfvars
-!*.tfvars.example
-override.tf
-override.tf.json
-*_override.tf
-*_override.tf.json
-.terraformrc
-terraform.rc

terraform/README.md

@@ -1,128 +0,0 @@
-# SeaweedFS on Terraform
-
-> **Experimental.** This Terraform support is an early scaffold under active
-> development. Interfaces (variables, outputs, module layout) may change without
-> notice, and not every tier is implemented yet. Not recommended for production
-> without your own review and testing.
-
-Self-contained Terraform/OpenTofu modules to deploy SeaweedFS on cloud VMs
-running the `weed` binary directly under systemd. No Helm and no Kubernetes
-required.
-
-What works today is verified end-to-end against a real `weed` cluster (see
-"Test it locally" below).
-
-## Layout
-
-```text
-terraform/
-  modules/
-    core/        cloud-agnostic renderer (ZERO cloud resources): turns an
-                 address map + config into per-node weed argv, systemd units,
-                 config files, disk-mount + secret-fetch scripts, and cloud-init.
-                 Both the cloud wrappers and the local harnesses consume `nodes`.
-    security/    cloud-agnostic CA + per-component mTLS certs (distinct CNs) +
-                 JWT signing keys (tls/random providers). Emits a `core_security`
-                 object ready for the core, plus PEMs for secret-store delivery.
-    aws/         thin AWS wrapper: reserves stable ENIs (fixed private IPs)
-                 first, feeds them to core, creates instances + protected EBS
-                 data disks + SG; with enable_security it generates certs/JWT,
-                 stores them in SSM SecureString, grants an instance role, and
-                 renders a boot fetch-secrets.sh. Keyed for_each throughout.
-  examples/
-    aws-ha-distributed/   3 masters + 3 volumes (1/AZ) + 2 filers + 1 S3,
-                          secure-by-default (mTLS via SSM-delivered certs)
-    aws-all-in-one/       single `weed server` instance via core directly
-  test/
-    local/         render a cluster with core and run it as real weed processes
-                   on 127.0.0.1 (no cloud, no docker), then assert it works
-    local-secure/  generate certs/JWT with the security module, run a real
-                   mTLS cluster, and assert it forms + enforces JWT auth
-```
-
-## Design in one paragraph
-
-The chart is the structural reference, not a dependency. A cloud-agnostic
-**core** renders everything portable; thin per-cloud wrappers provision infra.
-Addressing is an **input** to the core (wrapper reserves static IPs first), so
-the wrapper -> core dependency is one-way with no apply-time cycle. Stateful
-tiers (master/volume/filer) are keyed `for_each` maps, never `count`, so a
-middle node can be replaced without reindexing its peers or reattaching the
-wrong disk. Flag names are verified against the real `weed` binary
-(notably: volume uses `-mserver` for the master list; gRPC is `-port.grpc`,
-auto = http+10000; `minFreeSpacePercent` is a string).
-
-## Test it locally
-
-Requires `tofu` (or `terraform`), `jq`, `curl`, and a `weed` binary. Renders a
-3-master + volume + filer + S3 cluster from the core module and runs it as real
-processes, asserting quorum, volume registration, and filer/S3 round-trips:
-
-```bash
-cd terraform/test/local
-WEED=/path/to/weed ./run_local_cluster.sh
-# => 7 passed, 0 failed
-```
-
-The harness uses a high port range (29333/28080/28888/28333) so it does not
-collide with a SeaweedFS cluster already running on the machine, and aborts if a
-required port is taken. `KEEP=1 ./run_local_cluster.sh` leaves the cluster up.
-
-### mTLS end-to-end
-
-```bash
-cd terraform/test/local-secure
-WEED=/path/to/weed ./run_local_secure.sh
-# => generates a CA + component certs + JWT, renders security.toml, runs a real
-#    mTLS cluster, asserts master/volume/filer form over mutual TLS and that the
-#    filer enforces JWT signing (unsigned writes get 401). 5 passed.
-```
-
-## Plan-level tests (no cloud)
-
-```bash
-cd terraform/modules/core && tofu test
-# => 11 passed: peers list, -mserver vs -master, metrics gating,
-#    security.toml conditions, all-in-one inheritance, ...
-```
-
-## Validate the cloud wrappers
-
-```bash
-cd terraform/examples/aws-ha-distributed && tofu init && tofu validate
-```
-
-`apply` needs AWS credentials, a VPC, subnets, and an AMI with `weed` installed
-(bake with Packer, or install at boot).
-
-## Status
-
-Implemented and verified:
-- Tiers: master / volume / filer / s3 / all-in-one rendered by the core.
-- Disk mount: cloud-init runs a `mount-disks.sh` that auto-discovers (or takes
-  explicit candidate devices), `blkid`-guards `mkfs`, mounts, and persists to
-  `/etc/fstab` by UUID. The AWS wrapper wires the protected EBS disk to `/data`.
-- mTLS + JWT: the `security` module generates the CA + per-component certs
-  (distinct CNs) + JWT keys; the AWS wrapper stores them in SSM SecureString,
-  grants an instance role, and the core renders a boot fetch script so secrets
-  stay OUT of user_data. Proven end-to-end by `test/local-secure`.
-
-Not yet implemented:
-- sftp / admin / worker tiers (core does not render them yet).
-- GCP/Azure wrappers, the data-plane provider, and the K8s-native module.
-- CA in Vault PKI (currently TF-generated, so the CA key lives in state). KMS
-  decrypt in the IAM policy is scoped by
-  `ViaService` but uses `Resource="*"`; tighten to the SSM CMK in production.
-
-## Gotchas
-
-- This `weed` build starts an Iceberg REST catalog on `:8181` by default; set
-  `s3.iceberg_port = 0` to disable, or a port to relocate it.
-- Disk auto-discovery assumes a single attached data disk per node. For multiple
-  data disks, pass explicit `devices` candidates in `disk_mounts`.
-
-## Security note
-
-`tofu output`/state can contain secrets. Generate secrets outside Terraform
-(cloud secret manager / Vault) and fetch them at boot; never commit secret
-material.

terraform/examples/aws-all-in-one/main.tf

@@ -1,133 +0,0 @@
-# SeaweedFS all-in-one on a single AWS instance.
-#
-# Demonstrates the layered design directly: call the cloud-agnostic core to
-# render cloud-init for a `weed server` node, then attach it to one instance
-# with a protected data disk. No wrapper module needed for the simple case.
-#
-#   tofu init && tofu validate
-#   tofu apply   # requires AWS credentials + a weed AMI
-
-terraform {
-  required_version = ">= 1.3.0"
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = ">= 5.40"
-    }
-  }
-}
-
-provider "aws" {
-  region = var.region
-}
-
-variable "region" {
-  type    = string
-  default = "us-east-1"
-}
-variable "vpc_id" {
-  type = string
-}
-variable "subnet_id" {
-  type = string
-}
-variable "availability_zone" {
-  type    = string
-  default = "us-east-1a"
-}
-variable "ami_id" {
-  type = string
-}
-variable "private_ip" {
-  type    = string
-  default = "10.0.1.50"
-}
-
-module "core" {
-  source      = "../../modules/core"
-  weed_binary = "/usr/bin/weed"
-
-  # disable the distributed tiers; run a single all-in-one process
-  master = { enabled = false }
-  volume = { enabled = false }
-  filer  = { enabled = false }
-
-  all_in_one = {
-    enabled = true
-    nodes   = { a0 = { address = var.private_ip, data_dir = "/data" } }
-    s3      = { enabled = true }
-  }
-
-  s3_identities = [{
-    name       = "anonymous"
-    access_key = ""
-    secret_key = ""
-    actions    = ["Read", "List"]
-  }]
-}
-
-resource "aws_network_interface" "aio" {
-  subnet_id       = var.subnet_id
-  private_ips     = [var.private_ip]
-  security_groups = [aws_security_group.aio.id]
-  tags            = { Name = "seaweedfs-all-in-one" }
-}
-
-resource "aws_security_group" "aio" {
-  name_prefix = "seaweedfs-aio-"
-  vpc_id      = var.vpc_id
-  lifecycle {
-    create_before_destroy = true
-  }
-}
-
-resource "aws_vpc_security_group_ingress_rule" "s3" {
-  security_group_id = aws_security_group.aio.id
-  cidr_ipv4         = "10.0.0.0/8"
-  ip_protocol       = "tcp"
-  from_port         = 8333
-  to_port           = 8333
-}
-
-resource "aws_vpc_security_group_egress_rule" "all" {
-  security_group_id = aws_security_group.aio.id
-  cidr_ipv4         = "0.0.0.0/0"
-  ip_protocol       = "-1"
-}
-
-resource "aws_instance" "aio" {
-  ami           = var.ami_id
-  instance_type = "m5.large"
-  user_data     = module.core.cloud_init_by_node["all-in-one-a0"]
-
-  network_interface {
-    network_interface_id = aws_network_interface.aio.id
-    device_index         = 0
-  }
-  metadata_options {
-    http_tokens = "required"
-  }
-  tags = { Name = "seaweedfs-all-in-one", Role = "all-in-one" }
-}
-
-resource "aws_ebs_volume" "data" {
-  availability_zone = var.availability_zone
-  size              = 200
-  type              = "gp3"
-  encrypted         = true
-  tags              = { Name = "seaweedfs-all-in-one-data" }
-  lifecycle {
-    prevent_destroy = true
-  }
-}
-
-resource "aws_volume_attachment" "data" {
-  device_name                    = "/dev/xvdf"
-  volume_id                      = aws_ebs_volume.data.id
-  instance_id                    = aws_instance.aio.id
-  stop_instance_before_detaching = true
-}
-
-output "instance_id" {
-  value = aws_instance.aio.id
-}

terraform/examples/aws-ha-distributed/main.tf

@@ -1,117 +0,0 @@
-# SeaweedFS HA on AWS: 3-master quorum + 3 volume servers (one per AZ) + 2
-# filers (leveldb2-replicated HA) + 1 standalone S3 gateway.
-#
-#   tofu init && tofu validate
-#   tofu apply   # requires AWS credentials, a VPC, subnets, and a weed AMI
-#
-# This is a scaffold: it provisions instances, protected EBS data disks, and the
-# security group. Mounting the EBS disk at /data and secret-store cert delivery
-# are documented follow-ups (see terraform/README.md).
-
-terraform {
-  required_version = ">= 1.3.0"
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = ">= 5.40"
-    }
-  }
-}
-
-provider "aws" {
-  region = var.region
-}
-
-variable "region" {
-  type    = string
-  default = "us-east-1"
-}
-
-variable "vpc_id" {
-  type = string
-}
-
-variable "ami_id" {
-  description = "AMI with the weed binary at /usr/bin/weed."
-  type        = string
-}
-
-# subnet per AZ
-variable "subnet_a" { type = string }
-variable "subnet_b" { type = string }
-variable "subnet_c" { type = string }
-
-# AZ defaults assume region us-east-1. When you change `region`, override az_a/az_b/az_c
-# (and the matching subnets) with AZs that belong to that region, or the volume/filer
-# EBS volumes will fail to create in a mismatched AZ.
-variable "az_a" {
-  type    = string
-  default = "us-east-1a"
-}
-variable "az_b" {
-  type    = string
-  default = "us-east-1b"
-}
-variable "az_c" {
-  type    = string
-  default = "us-east-1c"
-}
-
-variable "client_ingress_cidrs" {
-  type    = list(string)
-  default = ["10.0.0.0/8"]
-}
-
-variable "ssh_ingress_cidrs" {
-  type    = list(string)
-  default = []
-}
-
-module "seaweedfs" {
-  source = "../../modules/aws"
-
-  name   = "seaweedfs"
-  vpc_id = var.vpc_id
-  ami_id = var.ami_id
-
-  # secure-by-default flagship: mTLS (certs + JWT generated by the security
-  # submodule, delivered via SSM and fetched at boot) plus monitoring.
-  enable_security    = true
-  monitoring_enabled = true
-
-  masters = {
-    m0 = { subnet_id = var.subnet_a, private_ip = "10.0.1.10" }
-    m1 = { subnet_id = var.subnet_b, private_ip = "10.0.2.10" }
-    m2 = { subnet_id = var.subnet_c, private_ip = "10.0.3.10" }
-  }
-
-  volumes = {
-    v0 = { subnet_id = var.subnet_a, availability_zone = var.az_a, private_ip = "10.0.1.20", rack = var.az_a, data_center = var.region, data_volume_size_gb = 500 }
-    v1 = { subnet_id = var.subnet_b, availability_zone = var.az_b, private_ip = "10.0.2.20", rack = var.az_b, data_center = var.region, data_volume_size_gb = 500 }
-    v2 = { subnet_id = var.subnet_c, availability_zone = var.az_c, private_ip = "10.0.3.20", rack = var.az_c, data_center = var.region, data_volume_size_gb = 500 }
-  }
-
-  filers = {
-    f0 = { subnet_id = var.subnet_a, availability_zone = var.az_a, private_ip = "10.0.1.30" }
-    f1 = { subnet_id = var.subnet_b, availability_zone = var.az_b, private_ip = "10.0.2.30" }
-  }
-
-  s3_nodes = {
-    s0 = { subnet_id = var.subnet_a, private_ip = "10.0.1.40" }
-  }
-
-  client_ingress_cidrs = var.client_ingress_cidrs
-  ssh_ingress_cidrs    = var.ssh_ingress_cidrs
-}
-
-output "master_peers" {
-  value = module.seaweedfs.master_peers
-}
-
-output "instance_ids" {
-  value = module.seaweedfs.instance_ids
-}
-
-output "security_group_id" {
-  value = module.seaweedfs.security_group_id
-}

terraform/modules/aws/main.tf

@@ -1,205 +0,0 @@
-# ---- step 1: reserve stable addressing (ENIs with fixed private IPs) -------
-# These exist BEFORE the core renders config, so the address map is known and
-# the core <- wrapper dependency is one-way (no apply-time cycle).
-
-resource "aws_network_interface" "master" {
-  for_each        = var.masters
-  subnet_id       = each.value.subnet_id
-  private_ips     = [each.value.private_ip]
-  security_groups = [aws_security_group.cluster.id]
-  tags            = merge(var.tags, { Name = "${var.name}-master-${each.key}", Role = "master" })
-}
-
-resource "aws_network_interface" "volume" {
-  for_each        = var.volumes
-  subnet_id       = each.value.subnet_id
-  private_ips     = [each.value.private_ip]
-  security_groups = [aws_security_group.cluster.id]
-  tags            = merge(var.tags, { Name = "${var.name}-volume-${each.key}", Role = "volume" })
-}
-
-resource "aws_network_interface" "filer" {
-  for_each        = var.filers
-  subnet_id       = each.value.subnet_id
-  private_ips     = [each.value.private_ip]
-  security_groups = [aws_security_group.cluster.id]
-  tags            = merge(var.tags, { Name = "${var.name}-filer-${each.key}", Role = "filer" })
-}
-
-resource "aws_network_interface" "s3" {
-  for_each        = var.s3_nodes
-  subnet_id       = each.value.subnet_id
-  private_ips     = [each.value.private_ip]
-  security_groups = [aws_security_group.cluster.id]
-  tags            = merge(var.tags, { Name = "${var.name}-s3-${each.key}", Role = "s3" })
-}
-
-# ---- step 2: render config with the cloud-agnostic core --------------------
-module "core" {
-  source = "../core"
-
-  weed_binary        = var.weed_binary
-  monitoring_enabled = var.monitoring_enabled
-  enable_security    = var.enable_security
-  security           = local.core_security
-
-  # Keep secrets out of cloud-init user_data when security is on; deliver them
-  # from SSM via the boot fetch script instead.
-  render_secret_files = !var.enable_security
-  boot_fetch_script   = local.fetch_script
-
-  master = {
-    nodes = { for k, v in var.masters : k => { address = v.private_ip } }
-  }
-
-  volume = {
-    enabled = length(var.volumes) > 0
-    nodes = { for k, v in var.volumes : k => {
-      address     = v.private_ip
-      rack        = v.rack
-      data_center = v.data_center
-      data_dirs   = [{ path = "/data", max_volumes = 0 }]
-      # auto-discover the single attached data disk and mount it at /data
-      disk_mounts = [{ mountpoint = "/data", fstype = "xfs" }]
-    } }
-  }
-
-  filer = {
-    enabled = length(var.filers) > 0
-    nodes = { for k, v in var.filers : k => {
-      address     = v.private_ip
-      data_dir    = "/data/filerldb2"
-      disk_mounts = [{ mountpoint = "/data", fstype = "xfs" }]
-    } }
-    s3 = var.embedded_s3
-  }
-
-  s3 = {
-    enabled = length(var.s3_nodes) > 0
-    nodes   = { for k, v in var.s3_nodes : k => { address = v.private_ip } }
-  }
-
-  s3_identities = var.s3_identities
-}
-
-# ---- step 3: instances (keyed for_each; user_data = rendered cloud-init) ----
-resource "aws_instance" "master" {
-  for_each                = var.masters
-  ami                     = var.ami_id
-  instance_type           = each.value.instance_type
-  key_name                = var.key_name
-  user_data               = module.core.cloud_init_by_node["master-${each.key}"]
-  iam_instance_profile    = var.enable_security ? aws_iam_instance_profile.node[0].name : null
-  disable_api_termination = var.termination_protection
-
-  network_interface {
-    network_interface_id = aws_network_interface.master[each.key].id
-    device_index         = 0
-  }
-  metadata_options {
-    http_tokens = "required" # IMDSv2
-  }
-  tags = merge(var.tags, { Name = "${var.name}-master-${each.key}", Role = "master" })
-}
-
-resource "aws_instance" "volume" {
-  for_each                = var.volumes
-  ami                     = var.ami_id
-  instance_type           = each.value.instance_type
-  key_name                = var.key_name
-  user_data               = module.core.cloud_init_by_node["volume-${each.key}"]
-  iam_instance_profile    = var.enable_security ? aws_iam_instance_profile.node[0].name : null
-  disable_api_termination = var.termination_protection
-
-  network_interface {
-    network_interface_id = aws_network_interface.volume[each.key].id
-    device_index         = 0
-  }
-  metadata_options {
-    http_tokens = "required"
-  }
-  tags = merge(var.tags, { Name = "${var.name}-volume-${each.key}", Role = "volume" })
-}
-
-resource "aws_instance" "filer" {
-  for_each                = var.filers
-  ami                     = var.ami_id
-  instance_type           = each.value.instance_type
-  key_name                = var.key_name
-  user_data               = module.core.cloud_init_by_node["filer-${each.key}"]
-  iam_instance_profile    = var.enable_security ? aws_iam_instance_profile.node[0].name : null
-  disable_api_termination = var.termination_protection
-
-  network_interface {
-    network_interface_id = aws_network_interface.filer[each.key].id
-    device_index         = 0
-  }
-  metadata_options {
-    http_tokens = "required"
-  }
-  tags = merge(var.tags, { Name = "${var.name}-filer-${each.key}", Role = "filer" })
-}
-
-resource "aws_instance" "s3" {
-  for_each             = var.s3_nodes
-  ami                  = var.ami_id
-  instance_type        = each.value.instance_type
-  key_name             = var.key_name
-  user_data            = module.core.cloud_init_by_node["s3-${each.key}"]
-  iam_instance_profile = var.enable_security ? aws_iam_instance_profile.node[0].name : null
-
-  network_interface {
-    network_interface_id = aws_network_interface.s3[each.key].id
-    device_index         = 0
-  }
-  metadata_options {
-    http_tokens = "required"
-  }
-  tags = merge(var.tags, { Name = "${var.name}-s3-${each.key}", Role = "s3" })
-}
-
-# ---- step 4: protected data disks (decoupled; survive instance replacement) -
-# The core's mount-disks.sh (wired via disk_mounts above) mkfs+mounts these at
-# /data before the weed unit starts.
-resource "aws_ebs_volume" "volume_data" {
-  for_each          = var.volumes
-  availability_zone = each.value.availability_zone
-  size              = each.value.data_volume_size_gb
-  type              = each.value.data_volume_type
-  iops              = each.value.data_volume_iops
-  encrypted         = true
-  tags              = merge(var.tags, { Name = "${var.name}-volume-${each.key}-data", Role = "volume" })
-
-  lifecycle {
-    prevent_destroy = true # break-glass: remove to allow destroy
-  }
-}
-
-resource "aws_volume_attachment" "volume_data" {
-  for_each                       = var.volumes
-  device_name                    = "/dev/xvdf"
-  volume_id                      = aws_ebs_volume.volume_data[each.key].id
-  instance_id                    = aws_instance.volume[each.key].id
-  stop_instance_before_detaching = true
-}
-
-resource "aws_ebs_volume" "filer_data" {
-  for_each          = var.filers
-  availability_zone = each.value.availability_zone
-  size              = each.value.data_volume_size_gb
-  type              = "gp3"
-  encrypted         = true
-  tags              = merge(var.tags, { Name = "${var.name}-filer-${each.key}-data", Role = "filer" })
-
-  lifecycle {
-    prevent_destroy = true
-  }
-}
-
-resource "aws_volume_attachment" "filer_data" {
-  for_each                       = var.filers
-  device_name                    = "/dev/xvdf"
-  volume_id                      = aws_ebs_volume.filer_data[each.key].id
-  instance_id                    = aws_instance.filer[each.key].id
-  stop_instance_before_detaching = true
-}

terraform/modules/aws/outputs.tf

@@ -1,34 +0,0 @@
-output "security_group_id" {
-  description = "Cluster security group id."
-  value       = aws_security_group.cluster.id
-}
-
-output "master_private_ips" {
-  description = "Master private IPs keyed by node id."
-  value       = { for k, v in var.masters : k => v.private_ip }
-}
-
-output "master_peers" {
-  description = "Master peer list passed to the weed processes."
-  value       = module.core.master_peers
-}
-
-output "filer_private_ips" {
-  description = "Filer private IPs keyed by node id."
-  value       = { for k, v in var.filers : k => v.private_ip }
-}
-
-output "s3_private_ips" {
-  description = "Standalone S3 gateway private IPs keyed by node id."
-  value       = { for k, v in var.s3_nodes : k => v.private_ip }
-}
-
-output "instance_ids" {
-  description = "All instance ids keyed by role-node."
-  value = merge(
-    { for k, v in aws_instance.master : "master-${k}" => v.id },
-    { for k, v in aws_instance.volume : "volume-${k}" => v.id },
-    { for k, v in aws_instance.filer : "filer-${k}" => v.id },
-    { for k, v in aws_instance.s3 : "s3-${k}" => v.id },
-  )
-}

terraform/modules/aws/security.tf

@@ -1,136 +0,0 @@
-# =============================================================================
-# mTLS + JWT generation and secret delivery (active when enable_security=true).
-#
-# Generates the CA + per-component certs + JWT keys with the security submodule,
-# stores them (plus the rendered security.toml / S3 config) in SSM Parameter
-# Store as SecureString, and renders a boot fetch-secrets.sh that pulls them via
-# the instance role. This keeps secrets OUT of cloud-init user_data / IMDS.
-# Secrets still live in Terraform state (TF-generated); prefer Vault PKI for the
-# CA in production.
-# =============================================================================
-
-locals {
-  all_private_ips = concat(
-    [for k, v in var.masters : v.private_ip],
-    [for k, v in var.volumes : v.private_ip],
-    [for k, v in var.filers : v.private_ip],
-    [for k, v in var.s3_nodes : v.private_ip],
-  )
-
-  ssm_prefix        = "/seaweedfs/${var.name}"
-  deliver_s3_config = length(var.s3_nodes) > 0 || var.embedded_s3.enabled
-
-  # security.toml is identical across nodes; take it from the first master.
-  first_master       = var.enable_security ? sort(keys(var.masters))[0] : ""
-  security_toml_path = "/etc/seaweedfs/security.toml"
-  s3_config_path     = "/etc/seaweedfs/s3_config.json"
-
-  # Boot fetch entries: cert files + security.toml + (optional) S3 config.
-  fetch_entries = var.enable_security ? concat(
-    [for m in module.security[0].secret_manifest : { param = "${local.ssm_prefix}/certs/${m.key}", path = m.path, mode = m.mode }],
-    [{ param = "${local.ssm_prefix}/security.toml", path = local.security_toml_path, mode = "0600" }],
-    local.deliver_s3_config ? [{ param = "${local.ssm_prefix}/s3_config.json", path = local.s3_config_path, mode = "0600" }] : [],
-  ) : []
-
-  fetch_script = var.enable_security ? templatefile("${path.module}/templates/fetch-secrets.sh.tftpl", {
-    run_as_user = "seaweedfs"
-    entries     = local.fetch_entries
-  }) : ""
-
-  core_security = var.enable_security ? module.security[0].core_security : var.security
-}
-
-module "security" {
-  count           = var.enable_security ? 1 : 0
-  source          = "../security"
-  internal_domain = var.internal_domain
-  cert_dir        = var.cert_dir
-  ip_sans         = local.all_private_ips
-}
-
-# ---- SSM SecureString parameters -------------------------------------------
-resource "aws_ssm_parameter" "cert" {
-  for_each = var.enable_security ? { for m in module.security[0].secret_manifest : m.key => m } : {}
-  name     = "${local.ssm_prefix}/certs/${each.key}"
-  type     = "SecureString"
-  value    = module.security[0].secret_contents[each.key]
-  tags     = var.tags
-}
-
-resource "aws_ssm_parameter" "security_toml" {
-  count = var.enable_security ? 1 : 0
-  name  = "${local.ssm_prefix}/security.toml"
-  type  = "SecureString"
-  value = module.core.secret_files_by_node["master-${local.first_master}"][local.security_toml_path]
-  tags  = var.tags
-}
-
-resource "aws_ssm_parameter" "s3_config" {
-  count = var.enable_security && local.deliver_s3_config ? 1 : 0
-  name  = "${local.ssm_prefix}/s3_config.json"
-  type  = "SecureString"
-  # identical content across s3/filer nodes; render once via the security module's
-  # JSON is not available here, so read it back from any node that carries it.
-  value = local.s3_config_source
-  tags  = var.tags
-}
-
-locals {
-  # Pull the rendered S3 identity JSON from whichever node carries it.
-  s3_config_source = !local.deliver_s3_config ? "" : (
-    length(var.s3_nodes) > 0 ?
-    module.core.secret_files_by_node["s3-${sort(keys(var.s3_nodes))[0]}"][local.s3_config_path] :
-    (length(var.filers) > 0 ? module.core.secret_files_by_node["filer-${sort(keys(var.filers))[0]}"][local.s3_config_path] : "")
-  )
-}
-
-# ---- IAM: instance role allowed to read the SSM params ----------------------
-data "aws_iam_policy_document" "assume" {
-  count = var.enable_security ? 1 : 0
-  statement {
-    actions = ["sts:AssumeRole"]
-    principals {
-      type        = "Service"
-      identifiers = ["ec2.amazonaws.com"]
-    }
-  }
-}
-
-data "aws_iam_policy_document" "ssm_read" {
-  count = var.enable_security ? 1 : 0
-  statement {
-    sid       = "ReadSeaweedfsParams"
-    actions   = ["ssm:GetParameter", "ssm:GetParameters"]
-    resources = ["arn:aws:ssm:*:*:parameter${local.ssm_prefix}/*"]
-  }
-  statement {
-    sid       = "DecryptSecureStrings"
-    actions   = ["kms:Decrypt"]
-    resources = [var.kms_key_arn] # defaults to "*"; set a CMK ARN in production
-    condition {
-      test     = "StringEquals"
-      variable = "kms:ViaService"
-      values   = ["ssm.*.amazonaws.com"]
-    }
-  }
-}
-
-resource "aws_iam_role" "node" {
-  count              = var.enable_security ? 1 : 0
-  name_prefix        = "${var.name}-node-"
-  assume_role_policy = data.aws_iam_policy_document.assume[0].json
-  tags               = var.tags
-}
-
-resource "aws_iam_role_policy" "ssm_read" {
-  count  = var.enable_security ? 1 : 0
-  name   = "ssm-read"
-  role   = aws_iam_role.node[0].id
-  policy = data.aws_iam_policy_document.ssm_read[0].json
-}
-
-resource "aws_iam_instance_profile" "node" {
-  count       = var.enable_security ? 1 : 0
-  name_prefix = "${var.name}-node-"
-  role        = aws_iam_role.node[0].name
-}

terraform/modules/aws/security_group.tf

@@ -1,62 +0,0 @@
-# Cluster security group + the SeaweedFS port matrix.
-# Intra-cluster: all TCP allowed within the SG (master 9333/19333, volume
-# 8080/18080, filer 8888/18888, admin 33646, ...). Client-facing: only S3 (8333)
-# and filer (8888). Metrics ports (9327) are never opened to clients.
-
-resource "aws_security_group" "cluster" {
-  name_prefix = "${var.name}-cluster-"
-  description = "SeaweedFS cluster"
-  vpc_id      = var.vpc_id
-  tags        = merge(var.tags, { Name = "${var.name}-cluster" })
-
-  lifecycle {
-    create_before_destroy = true
-  }
-}
-
-# All intra-cluster TCP via SG self-reference.
-resource "aws_vpc_security_group_ingress_rule" "intra_cluster" {
-  security_group_id            = aws_security_group.cluster.id
-  referenced_security_group_id = aws_security_group.cluster.id
-  ip_protocol                  = "tcp"
-  from_port                    = 0
-  to_port                      = 65535
-  description                  = "intra-cluster (http + gRPC for all roles)"
-}
-
-resource "aws_vpc_security_group_ingress_rule" "s3" {
-  for_each          = toset(var.client_ingress_cidrs)
-  security_group_id = aws_security_group.cluster.id
-  cidr_ipv4         = each.value
-  ip_protocol       = "tcp"
-  from_port         = 8333
-  to_port           = 8333
-  description       = "S3 gateway"
-}
-
-resource "aws_vpc_security_group_ingress_rule" "filer" {
-  for_each          = toset(var.client_ingress_cidrs)
-  security_group_id = aws_security_group.cluster.id
-  cidr_ipv4         = each.value
-  ip_protocol       = "tcp"
-  from_port         = 8888
-  to_port           = 8888
-  description       = "filer HTTP"
-}
-
-resource "aws_vpc_security_group_ingress_rule" "ssh" {
-  for_each          = toset(var.ssh_ingress_cidrs)
-  security_group_id = aws_security_group.cluster.id
-  cidr_ipv4         = each.value
-  ip_protocol       = "tcp"
-  from_port         = 22
-  to_port           = 22
-  description       = "SSH"
-}
-
-resource "aws_vpc_security_group_egress_rule" "all" {
-  security_group_id = aws_security_group.cluster.id
-  cidr_ipv4         = "0.0.0.0/0"
-  ip_protocol       = "-1"
-  description       = "all egress"
-}

terraform/modules/aws/templates/fetch-secrets.sh.tftpl

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# Rendered by terraform-aws-seaweedfs. Pulls certs + secret config from SSM
-# Parameter Store (SecureString) at boot using the instance role. Region is
-# auto-resolved by the AWS CLI from IMDS, so no region is baked in. Requires
-# the AWS CLI and a working instance profile (see security.tf).
-set -euo pipefail
-
-run_as_user="${run_as_user}"
-
-fetch() {
-  local param="$1" dest="$2" mode="$3"
-  mkdir -p "$(dirname "$dest")"
-  aws ssm get-parameter --with-decryption --name "$param" \
-    --query 'Parameter.Value' --output text > "$dest"
-  chmod "$mode" "$dest"
-  chown "$run_as_user:$run_as_user" "$dest" 2>/dev/null || true
-}
-
-%{ for e in entries ~}
-fetch "${e.param}" "${e.path}" "${e.mode}"
-%{ endfor ~}

terraform/modules/aws/variables.tf

@@ -1,171 +0,0 @@
-# =============================================================================
-# terraform-aws-seaweedfs - thin AWS wrapper around the cloud-agnostic core.
-#
-# Reserves stable per-node addressing (ENIs with fixed private IPs) FIRST, feeds
-# that address map to the core to render cloud-init, then creates instances and
-# protected EBS data disks. All tiers are keyed for_each (never count), so a
-# middle node can be replaced without reindexing its peers/disks.
-# =============================================================================
-
-variable "name" {
-  description = "Name prefix for all resources."
-  type        = string
-  default     = "seaweedfs"
-}
-
-variable "vpc_id" {
-  description = "VPC to deploy into."
-  type        = string
-}
-
-variable "ami_id" {
-  description = "AMI with the weed binary installed (e.g. baked with Packer)."
-  type        = string
-}
-
-variable "weed_binary" {
-  description = "Path to weed on the AMI."
-  type        = string
-  default     = "/usr/bin/weed"
-}
-
-variable "key_name" {
-  description = "EC2 key pair for SSH (optional)."
-  type        = string
-  default     = null
-}
-
-variable "monitoring_enabled" {
-  description = "Bind metrics ports and pass them through to the core."
-  type        = bool
-  default     = false
-}
-
-variable "enable_security" {
-  description = "Enable mTLS (security.toml). Cert material must be supplied via the security variable / secret store."
-  type        = bool
-  default     = false
-}
-
-variable "security" {
-  description = "Passed through to the core security variable when enable_security=false. When enable_security=true this is ignored and certs/JWT are generated by the security submodule."
-  type        = any
-  default     = {}
-}
-
-variable "internal_domain" {
-  description = "Internal domain for generated component cert CNs / peer-auth wildcard (enable_security=true)."
-  type        = string
-  default     = "seaweedfs.internal"
-}
-
-variable "cert_dir" {
-  description = "On-host directory where certs are fetched/placed."
-  type        = string
-  default     = "/usr/local/share/ca-certificates"
-}
-
-variable "kms_key_arn" {
-  description = "KMS key ARN the instance role may use to decrypt SSM SecureStrings. Defaults to \"*\" (the SSM default key); set to a specific CMK ARN in production."
-  type        = string
-  default     = "*"
-}
-
-variable "termination_protection" {
-  description = "Set disable_api_termination on stateful instances (masters, volumes)."
-  type        = bool
-  default     = true
-}
-
-# ---- stateful tiers: keyed node maps ---------------------------------------
-variable "masters" {
-  description = "Master nodes keyed by stable id (m0/m1/m2). Quorum size must be odd."
-  type = map(object({
-    subnet_id     = string
-    private_ip    = string
-    instance_type = optional(string, "t3.medium")
-  }))
-  validation {
-    condition     = length(var.masters) % 2 == 1
-    error_message = "Master quorum must be an odd number of nodes (1, 3, 5)."
-  }
-}
-
-variable "volumes" {
-  description = "Volume nodes keyed by stable id. Each owns one protected EBS data disk."
-  type = map(object({
-    subnet_id           = string
-    availability_zone   = string
-    private_ip          = string
-    instance_type       = optional(string, "m5.large")
-    rack                = optional(string)
-    data_center         = optional(string)
-    data_volume_size_gb = optional(number, 100)
-    data_volume_type    = optional(string, "gp3")
-    data_volume_iops    = optional(number, null)
-  }))
-  default = {}
-}
-
-variable "filers" {
-  description = "Filer nodes keyed by stable id. Each owns a protected EBS disk for its leveldb2 store."
-  type = map(object({
-    subnet_id           = string
-    availability_zone   = string
-    private_ip          = string
-    instance_type       = optional(string, "t3.medium")
-    data_volume_size_gb = optional(number, 50)
-  }))
-  default = {}
-}
-
-variable "s3_nodes" {
-  description = "Standalone S3 gateway nodes keyed by stable id (stateless)."
-  type = map(object({
-    subnet_id     = string
-    private_ip    = string
-    instance_type = optional(string, "t3.medium")
-  }))
-  default = {}
-}
-
-variable "embedded_s3" {
-  description = "Embed the S3 gateway in the filer instead of standalone nodes."
-  type = object({
-    enabled     = optional(bool, false)
-    port        = optional(number, 8333)
-    domain_name = optional(string, "")
-  })
-  default = {}
-}
-
-variable "s3_identities" {
-  description = "Non-admin S3 identities for the gateway config (admin key goes via EnvironmentFile)."
-  type = list(object({
-    name       = string
-    access_key = string
-    secret_key = string
-    actions    = list(string)
-  }))
-  default   = []
-  sensitive = true
-}
-
-# ---- networking ------------------------------------------------------------
-variable "client_ingress_cidrs" {
-  description = "CIDRs allowed to reach the client-facing S3 (8333) and filer (8888) ports."
-  type        = list(string)
-  default     = []
-}
-
-variable "ssh_ingress_cidrs" {
-  description = "CIDRs allowed SSH (22)."
-  type        = list(string)
-  default     = []
-}
-
-variable "tags" {
-  description = "Extra tags applied to all resources."
-  type        = map(string)
-  default     = {}
-}

terraform/modules/aws/versions.tf

@@ -1,12 +0,0 @@
-terraform {
-  required_version = ">= 1.3.0"
-  required_providers {
-    aws = {
-      source = "hashicorp/aws"
-      # >= 5.40 for the modern aws_vpc_security_group_*_rule resources.
-      # Provider >= 6.0 is recommended for the EBS-attachment no-replace behavior;
-      # bump the floor here once you standardize on it.
-      version = ">= 5.40"
-    }
-  }
-}

terraform/modules/core/main.tf

@@ -1,373 +0,0 @@
-# =============================================================================
-# SeaweedFS Terraform core - pure renderer (zero cloud resources).
-#
-# Computes, per node: the verified `weed` argv, the full systemd ExecStart,
-# config files, environment, and rendered systemd unit + cloud-init.
-# =============================================================================
-
-locals {
-  # ---- shared security.toml (rendered when mTLS on OR any JWT key set) ----
-  jwt_any = anytrue([
-    var.security.jwt_signing_key != "",
-    var.security.jwt_signing_read_key != "",
-    var.security.jwt_filer_signing_key != "",
-    var.security.jwt_filer_signing_read_key != "",
-  ])
-  render_security = var.enable_security || local.jwt_any
-  security_toml = local.render_security ? templatefile("${path.module}/templates/security.toml.tftpl", {
-    enable_security            = var.enable_security
-    cert_dir                   = var.security.cert_dir
-    allowed_wildcard_domain    = var.security.allowed_wildcard_domain
-    allowed_common_names       = var.security.allowed_common_names
-    jwt_signing_key            = var.security.jwt_signing_key
-    jwt_signing_read_key       = var.security.jwt_signing_read_key
-    jwt_filer_signing_key      = var.security.jwt_filer_signing_key
-    jwt_filer_signing_read_key = var.security.jwt_filer_signing_read_key
-  }) : ""
-  security_files = local.render_security ? { "/etc/seaweedfs/security.toml" = local.security_toml } : {}
-
-  # ---- S3 identity JSON (non-admin identities only) ----
-  # Empty access_key => anonymous identity (no credentials block), per SeaweedFS
-  # convention where the identity literally named "anonymous" grants anon access.
-  s3_config_json = jsonencode({
-    identities = [for id in var.s3_identities : {
-      name        = id.name
-      credentials = id.access_key != "" ? [{ accessKey = id.access_key, secretKey = id.secret_key }] : []
-      actions     = id.actions
-    }]
-  })
-
-  # ---- global flags (before the subcommand) ----
-  global_flags = compact([
-    format("-v=%d", var.log_level),
-    var.log_to_stderr ? "-logtostderr=true" : "",
-  ])
-
-  # ---- master peers (sorted by key for determinism) ----
-  master_keys = sort(keys(var.master.nodes))
-  master_peer_list = [for k in local.master_keys :
-    format("%s:%d", var.master.nodes[k].address, coalesce(var.master.nodes[k].port, var.master.port))
-  ]
-  master_peers = join(",", local.master_peer_list)
-
-  # ---- first filer (default s3 target + cluster env) ----
-  filer_keys  = sort(keys(var.filer.nodes))
-  first_filer = length(local.filer_keys) > 0 ? format("%s:%d", var.filer.nodes[local.filer_keys[0]].address, coalesce(var.filer.nodes[local.filer_keys[0]].port, var.filer.port)) : ""
-
-  # ---- cluster discovery env (WEED_CLUSTER_*) ----
-  cluster_env = merge(
-    { WEED_CLUSTER_DEFAULT = var.cluster_name },
-    local.master_peers != "" ? { "WEED_CLUSTER_${replace(upper(var.cluster_name), "/[^A-Z0-9_]/", "_")}_MASTER" = local.master_peers } : {},
-    local.first_filer != "" ? { "WEED_CLUSTER_${replace(upper(var.cluster_name), "/[^A-Z0-9_]/", "_")}_FILER" = local.first_filer } : {},
-  )
-
-  metrics_flags_master = var.monitoring_enabled ? compact([
-    format("-metricsPort=%d", var.master.metrics_port),
-    var.master.metrics_ip != "" ? format("-metricsIp=%s", var.master.metrics_ip) : "",
-  ]) : []
-  metrics_flags_volume = var.monitoring_enabled ? compact([
-    format("-metricsPort=%d", var.volume.metrics_port),
-    var.volume.metrics_ip != "" ? format("-metricsIp=%s", var.volume.metrics_ip) : "",
-  ]) : []
-  metrics_flags_filer = var.monitoring_enabled ? compact([
-    format("-metricsPort=%d", var.filer.metrics_port),
-    var.filer.metrics_ip != "" ? format("-metricsIp=%s", var.filer.metrics_ip) : "",
-  ]) : []
-  metrics_flags_s3 = var.monitoring_enabled ? [format("-metricsPort=%d", var.s3.metrics_port)] : []
-
-  # ===========================================================================
-  # MASTER nodes
-  # ===========================================================================
-  master_nodes = var.master.enabled ? {
-    for k in local.master_keys : "master-${k}" => {
-      role        = "master"
-      name        = "master-${k}"
-      address     = var.master.nodes[k].address
-      disk_mounts = var.master.nodes[k].disk_mounts
-      data_dir    = coalesce(var.master.nodes[k].data_dir, var.master.data_dir)
-      data_dirs   = [coalesce(var.master.nodes[k].data_dir, var.master.data_dir)]
-      ports = {
-        http    = coalesce(var.master.nodes[k].port, var.master.port)
-        metrics = var.master.metrics_port
-      }
-      env          = local.cluster_env
-      config_files = local.security_files
-      argv = concat(
-        local.global_flags,
-        ["master"],
-        [
-          format("-port=%d", coalesce(var.master.nodes[k].port, var.master.port)),
-          format("-mdir=%s", coalesce(var.master.nodes[k].data_dir, var.master.data_dir)),
-          format("-ip=%s", var.master.nodes[k].address),
-          format("-ip.bind=%s", var.master.ip_bind),
-          format("-peers=%s", local.master_peers),
-          format("-defaultReplication=%s", var.master.default_replication),
-          format("-volumeSizeLimitMB=%d", var.master.volume_size_limit_mb),
-          format("-electionTimeout=%s", var.master.election_timeout),
-          format("-heartbeatInterval=%s", var.master.heartbeat_interval),
-        ],
-        var.master.nodes[k].grpc_port != null ? [format("-port.grpc=%d", var.master.nodes[k].grpc_port)] : (
-        var.master.grpc_port != null ? [format("-port.grpc=%d", var.master.grpc_port)] : []),
-        var.master.volume_preallocate ? ["-volumePreallocate"] : [],
-        var.master.garbage_threshold != null ? [format("-garbageThreshold=%s", tostring(var.master.garbage_threshold))] : [],
-        var.master.raft_hashicorp ? ["-raftHashicorp"] : [],
-        var.master.resume_state ? ["-resumeState"] : [],
-        var.master.disable_http ? ["-disableHttp"] : [],
-        var.master.white_list != "" ? [format("-whiteList=%s", var.master.white_list)] : [],
-        local.metrics_flags_master,
-        var.master.extra_args,
-      )
-    }
-  } : {}
-
-  # ===========================================================================
-  # VOLUME nodes
-  # ===========================================================================
-  volume_keys = sort(keys(var.volume.nodes))
-  volume_nodes = var.volume.enabled ? {
-    for k in local.volume_keys : "volume-${k}" => {
-      role        = "volume"
-      name        = "volume-${k}"
-      address     = var.volume.nodes[k].address
-      disk_mounts = var.volume.nodes[k].disk_mounts
-      data_dirs   = [for d in(var.volume.nodes[k].data_dirs != null ? var.volume.nodes[k].data_dirs : var.volume.data_dirs) : d.path]
-      data_dir    = (var.volume.nodes[k].data_dirs != null ? var.volume.nodes[k].data_dirs : var.volume.data_dirs)[0].path
-      ports = {
-        http    = coalesce(var.volume.nodes[k].port, var.volume.port)
-        metrics = var.volume.metrics_port
-      }
-      env          = local.cluster_env
-      config_files = local.security_files
-      argv = concat(
-        local.global_flags,
-        ["volume"],
-        [
-          format("-port=%d", coalesce(var.volume.nodes[k].port, var.volume.port)),
-          format("-dir=%s", join(",", [for d in(var.volume.nodes[k].data_dirs != null ? var.volume.nodes[k].data_dirs : var.volume.data_dirs) : d.path])),
-          format("-max=%s", join(",", [for d in(var.volume.nodes[k].data_dirs != null ? var.volume.nodes[k].data_dirs : var.volume.data_dirs) : tostring(d.max_volumes)])),
-          format("-ip=%s", var.volume.nodes[k].address),
-          format("-ip.bind=%s", var.volume.ip_bind),
-          format("-mserver=%s", local.master_peers),
-          format("-readMode=%s", var.volume.read_mode),
-          format("-compactionMBps=%d", var.volume.compaction_mbps),
-          format("-minFreeSpacePercent=%s", var.volume.min_free_space_percent),
-          format("-index=%s", var.volume.index),
-        ],
-        var.volume.nodes[k].grpc_port != null ? [format("-port.grpc=%d", var.volume.nodes[k].grpc_port)] : [],
-        (var.volume.nodes[k].idx_dir != null && var.volume.nodes[k].idx_dir != "") ? [format("-dir.idx=%s", var.volume.nodes[k].idx_dir)] : (var.volume.idx_dir != "" ? [format("-dir.idx=%s", var.volume.idx_dir)] : []),
-        var.volume.nodes[k].data_center != null ? [format("-dataCenter=%s", var.volume.nodes[k].data_center)] : [],
-        var.volume.nodes[k].rack != null ? [format("-rack=%s", var.volume.nodes[k].rack)] : [],
-        var.volume.nodes[k].public_url != null ? [format("-publicUrl=%s", var.volume.nodes[k].public_url)] : [],
-        var.volume.file_size_limit_mb != null ? [format("-fileSizeLimitMB=%d", var.volume.file_size_limit_mb)] : [],
-        var.volume.images_fix_orientation ? ["-images.fix.orientation"] : [],
-        var.volume.white_list != "" ? [format("-whiteList=%s", var.volume.white_list)] : [],
-        local.metrics_flags_volume,
-        var.volume.extra_args,
-      )
-    }
-  } : {}
-
-  # ===========================================================================
-  # FILER nodes (+ optional embedded S3)
-  # ===========================================================================
-  filer_s3_files = var.filer.s3.enabled ? { (var.filer.s3.config_path) = local.s3_config_json } : {}
-  filer_nodes = var.filer.enabled ? {
-    for k in local.filer_keys : "filer-${k}" => {
-      role        = "filer"
-      name        = "filer-${k}"
-      address     = var.filer.nodes[k].address
-      disk_mounts = var.filer.nodes[k].disk_mounts
-      data_dir    = coalesce(var.filer.nodes[k].data_dir, var.filer.data_dir)
-      data_dirs   = [coalesce(var.filer.nodes[k].data_dir, var.filer.data_dir)]
-      ports = {
-        http    = coalesce(var.filer.nodes[k].port, var.filer.port)
-        metrics = var.filer.metrics_port
-      }
-      env          = merge(local.cluster_env, var.filer.extra_env)
-      config_files = merge(local.security_files, local.filer_s3_files)
-      argv = concat(
-        local.global_flags,
-        ["filer"],
-        [
-          format("-port=%d", coalesce(var.filer.nodes[k].port, var.filer.port)),
-          format("-ip=%s", var.filer.nodes[k].address),
-          format("-ip.bind=%s", var.filer.ip_bind),
-          format("-master=%s", local.master_peers),
-          format("-defaultReplicaPlacement=%s", var.filer.default_replica_placement),
-          format("-dirListLimit=%d", var.filer.dir_list_limit),
-          format("-defaultStoreDir=%s", coalesce(var.filer.nodes[k].data_dir, var.filer.data_dir)),
-        ],
-        var.filer.nodes[k].grpc_port != null ? [format("-port.grpc=%d", var.filer.nodes[k].grpc_port)] : [],
-        var.filer.max_mb != null ? [format("-maxMB=%d", var.filer.max_mb)] : [],
-        var.filer.disable_dir_listing ? ["-disableDirListing"] : [],
-        var.filer.disable_http ? ["-disableHttp"] : [],
-        var.filer.encrypt_volume_data ? ["-encryptVolumeData"] : [],
-        var.filer.rack != "" ? [format("-rack=%s", var.filer.rack)] : [],
-        var.filer.data_center != "" ? [format("-dataCenter=%s", var.filer.data_center)] : [],
-        var.filer.filer_group != "" ? [format("-filerGroup=%s", var.filer.filer_group)] : [],
-        var.filer.s3.enabled ? [
-          "-s3",
-          format("-s3.port=%d", var.filer.s3.port),
-          format("-s3.config=%s", var.filer.s3.config_path),
-        ] : [],
-        (var.filer.s3.enabled && var.filer.s3.https_port > 0) ? [format("-s3.port.https=%d", var.filer.s3.https_port)] : [],
-        (var.filer.s3.enabled && var.filer.s3.domain_name != "") ? [format("-s3.domainName=%s", var.filer.s3.domain_name)] : [],
-        local.metrics_flags_filer,
-        var.filer.extra_args,
-      )
-    }
-  } : {}
-
-  # ===========================================================================
-  # S3 standalone nodes
-  # ===========================================================================
-  s3_keys      = sort(keys(var.s3.nodes))
-  s3_target    = var.s3.filer_address != "" ? var.s3.filer_address : local.first_filer
-  s3_std_files = merge(local.security_files, { (var.s3.config_path) = local.s3_config_json })
-  s3_nodes = var.s3.enabled ? {
-    for k in local.s3_keys : "s3-${k}" => {
-      role        = "s3"
-      name        = "s3-${k}"
-      address     = var.s3.nodes[k].address
-      disk_mounts = []
-      data_dir    = ""
-      data_dirs   = []
-      ports = {
-        http    = coalesce(var.s3.nodes[k].port, var.s3.port)
-        metrics = var.s3.metrics_port
-      }
-      env          = local.cluster_env
-      config_files = local.s3_std_files
-      argv = concat(
-        local.global_flags,
-        ["s3"],
-        [
-          format("-port=%d", coalesce(var.s3.nodes[k].port, var.s3.port)),
-          format("-ip.bind=%s", var.s3.ip_bind),
-          format("-filer=%s", local.s3_target),
-          format("-config=%s", var.s3.config_path),
-        ],
-        var.s3.https_port > 0 ? [format("-port.https=%d", var.s3.https_port)] : [],
-        var.s3.iceberg_port != null ? [format("-port.iceberg=%d", var.s3.iceberg_port)] : [],
-        var.s3.domain_name != "" ? [format("-domainName=%s", var.s3.domain_name)] : [],
-        var.s3.audit_log_config_path != "" ? [format("-auditLogConfig=%s", var.s3.audit_log_config_path)] : [],
-        var.s3.cert_file != "" ? [format("-cert.file=%s", var.s3.cert_file)] : [],
-        var.s3.key_file != "" ? [format("-key.file=%s", var.s3.key_file)] : [],
-        var.s3.cacert_file != "" ? [format("-cacert.file=%s", var.s3.cacert_file)] : [],
-        var.s3.verify_client_cert ? ["-tlsVerifyClientCert"] : [],
-        local.metrics_flags_s3,
-        var.s3.extra_args,
-      )
-    }
-  } : {}
-
-  # ===========================================================================
-  # ALL-IN-ONE nodes (weed server)
-  # ===========================================================================
-  aio_keys     = sort(keys(var.all_in_one.nodes))
-  aio_s3_files = var.all_in_one.s3.enabled ? { (var.all_in_one.s3.config_path) = local.s3_config_json } : {}
-  aio_nodes = var.all_in_one.enabled ? {
-    for k in local.aio_keys : "all-in-one-${k}" => {
-      role        = "server"
-      name        = "all-in-one-${k}"
-      address     = var.all_in_one.nodes[k].address
-      disk_mounts = var.all_in_one.nodes[k].disk_mounts
-      data_dir    = coalesce(var.all_in_one.nodes[k].data_dir, var.all_in_one.data_dir)
-      data_dirs   = [coalesce(var.all_in_one.nodes[k].data_dir, var.all_in_one.data_dir)]
-      ports = {
-        http    = var.all_in_one.master_port
-        metrics = var.all_in_one.metrics_port
-      }
-      env          = local.cluster_env
-      config_files = merge(local.security_files, local.aio_s3_files)
-      argv = concat(
-        local.global_flags,
-        ["server"],
-        [
-          format("-dir=%s", coalesce(var.all_in_one.nodes[k].data_dir, var.all_in_one.data_dir)),
-          format("-ip=%s", var.all_in_one.nodes[k].address),
-          format("-ip.bind=%s", var.all_in_one.ip_bind),
-          "-master",
-          format("-master.port=%d", var.all_in_one.master_port),
-          format("-master.peers=%s:%d", var.all_in_one.nodes[k].address, var.all_in_one.master_port),
-          format("-master.defaultReplication=%s", var.all_in_one.default_replication),
-          format("-master.volumeSizeLimitMB=%d", var.all_in_one.volume_size_limit_mb),
-          "-volume",
-          format("-volume.port=%d", var.all_in_one.volume_port),
-          "-filer",
-          format("-filer.port=%d", var.all_in_one.filer_port),
-          format("-idleTimeout=%d", var.all_in_one.idle_timeout),
-        ],
-        var.all_in_one.disable_http ? [format("-disableHttp=%t", var.all_in_one.disable_http)] : [],
-        var.all_in_one.s3.enabled ? [
-          "-s3",
-          format("-s3.port=%d", var.all_in_one.s3.port),
-          format("-s3.config=%s", var.all_in_one.s3.config_path),
-        ] : [],
-        (var.all_in_one.s3.enabled && var.all_in_one.s3.domain_name != "") ? [format("-s3.domainName=%s", var.all_in_one.s3.domain_name)] : [],
-        var.monitoring_enabled ? [format("-metricsPort=%d", var.all_in_one.metrics_port)] : [],
-        var.all_in_one.extra_args,
-      )
-    }
-  } : {}
-
-  # ===========================================================================
-  # Merge + render systemd unit and cloud-init per node
-  # ===========================================================================
-  nodes_base = merge(local.master_nodes, local.volume_nodes, local.filer_nodes, local.s3_nodes, local.aio_nodes)
-
-  # Disk-mount script per node (empty unless the node declares disk_mounts).
-  mount_scripts = {
-    for name, n in local.nodes_base : name => length(n.disk_mounts) > 0 ? templatefile("${path.module}/templates/mount-disks.sh.tftpl", {
-      run_as_user = var.hardening.run_as_user
-      mounts      = n.disk_mounts
-    }) : ""
-  }
-
-  nodes = {
-    for name, n in local.nodes_base : name => merge(n, {
-      exec_start = "${var.weed_binary} ${join(" ", n.argv)}"
-      # secret_files: the secret-bearing config a wrapper should deliver from a
-      # secret store when render_secret_files=false (else they go in cloud-init).
-      secret_files = n.config_files
-      mount_script = local.mount_scripts[name]
-      file_modes   = { for p in keys(n.config_files) : p => "0600" }
-      systemd_unit = templatefile("${path.module}/templates/weed.service.tftpl", {
-        role                = n.role
-        name                = n.name
-        run_as_user         = var.hardening.run_as_user
-        exec_start          = "${var.weed_binary} ${join(" ", n.argv)}"
-        no_new_privileges   = var.hardening.no_new_privileges
-        protect_system      = var.hardening.protect_system
-        cap_drop_all        = var.hardening.cap_drop_all
-        read_write_paths    = n.data_dirs
-        requires_mounts_for = n.data_dirs
-        env_file            = var.env_file
-        environment         = n.env
-      })
-      cloud_init = templatefile("${path.module}/templates/cloud-init.yaml.tftpl", {
-        role         = n.role
-        name         = n.name
-        run_as_user  = var.hardening.run_as_user
-        config_files = var.render_secret_files ? n.config_files : {}
-        file_modes   = { for p in keys(n.config_files) : p => "0600" }
-        pre_runcmd   = [for p in n.data_dirs : "install -d -o ${var.hardening.run_as_user} -g ${var.hardening.run_as_user} ${p}"]
-        mount_script = local.mount_scripts[name]
-        fetch_script = var.boot_fetch_script
-        systemd_unit = templatefile("${path.module}/templates/weed.service.tftpl", {
-          role                = n.role
-          name                = n.name
-          run_as_user         = var.hardening.run_as_user
-          exec_start          = "${var.weed_binary} ${join(" ", n.argv)}"
-          no_new_privileges   = var.hardening.no_new_privileges
-          protect_system      = var.hardening.protect_system
-          cap_drop_all        = var.hardening.cap_drop_all
-          read_write_paths    = n.data_dirs
-          requires_mounts_for = n.data_dirs
-          env_file            = var.env_file
-          environment         = n.env
-        })
-      })
-    })
-  }
-}

terraform/modules/core/outputs.tf

@@ -1,32 +0,0 @@
-output "nodes" {
-  description = "Per-node rendered artifacts keyed by node name. Each value: role, name, address, ports, data_dir(s), argv (list, after the weed binary), exec_start, env, config_files, systemd_unit, cloud_init."
-  value       = local.nodes
-  sensitive   = true # config_files/env may carry JWT keys or S3 identities
-}
-
-output "master_peers" {
-  description = "Comma-separated master peer list (address:port), as passed to -peers / -mserver / -master."
-  value       = local.master_peers
-}
-
-output "first_filer" {
-  description = "address:port of the lexically-first filer node (default S3 target)."
-  value       = local.first_filer
-}
-
-output "node_names" {
-  description = "List of rendered node names (non-sensitive)."
-  value       = sort(keys(local.nodes))
-}
-
-output "cloud_init_by_node" {
-  description = "Map of node name -> rendered cloud-init user_data (for the per-cloud wrappers)."
-  value       = { for name, n in local.nodes : name => n.cloud_init }
-  sensitive   = true
-}
-
-output "secret_files_by_node" {
-  description = "Map of node name -> {path => content} of secret-bearing files (security.toml, S3 identity JSON). Wrappers push these to a secret store and fetch them at boot when render_secret_files=false."
-  value       = { for name, n in local.nodes : name => n.secret_files }
-  sensitive   = true
-}

terraform/modules/core/templates/cloud-init.yaml.tftpl

@@ -1,44 +0,0 @@
-#cloud-config
-# Rendered by the SeaweedFS Terraform core module for node ${name} (role ${role}).
-# When render_secret_files=false, secret-bearing files are NOT here; they are
-# fetched at boot by fetch-secrets.sh from the cloud secret store.
-users:
-  - name: ${run_as_user}
-    system: true
-    shell: /usr/sbin/nologin
-write_files:
-%{ for path, content in config_files ~}
-  - path: ${path}
-    owner: "${run_as_user}:${run_as_user}"
-    permissions: '${lookup(file_modes, path, "0644")}'
-    content: |
-      ${indent(6, content)}
-%{ endfor ~}
-%{ if mount_script != "" ~}
-  - path: /opt/seaweedfs/mount-disks.sh
-    permissions: '0755'
-    content: |
-      ${indent(6, mount_script)}
-%{ endif ~}
-%{ if fetch_script != "" ~}
-  - path: /opt/seaweedfs/fetch-secrets.sh
-    permissions: '0755'
-    content: |
-      ${indent(6, fetch_script)}
-%{ endif ~}
-  - path: /etc/systemd/system/weed-${role}.service
-    permissions: '0644'
-    content: |
-      ${indent(6, systemd_unit)}
-runcmd:
-%{ if mount_script != "" ~}
-  - /opt/seaweedfs/mount-disks.sh
-%{ endif ~}
-%{ if fetch_script != "" ~}
-  - /opt/seaweedfs/fetch-secrets.sh
-%{ endif ~}
-%{ for cmd in pre_runcmd ~}
-  - ${cmd}
-%{ endfor ~}
-  - systemctl daemon-reload
-  - systemctl enable --now weed-${role}.service

terraform/modules/core/templates/mount-disks.sh.tftpl

@@ -1,73 +0,0 @@
-#!/usr/bin/env bash
-# Rendered by the SeaweedFS Terraform core module. Formats (only if blank) and
-# mounts each data disk, persisting by UUID to /etc/fstab. Safe to re-run.
-set -euo pipefail
-
-run_as_user="${run_as_user}"
-
-# Base block device backing "/" so auto-discovery never touches the root disk.
-root_src="$(findmnt -no SOURCE / 2>/dev/null || true)"
-root_base="$(lsblk -no pkname "$root_src" 2>/dev/null || true)"
-[ -n "$root_base" ] && root_base="/dev/$root_base"
-
-is_mounted() { findmnt -rno TARGET "$1" >/dev/null 2>&1; }
-
-# Pick the first unmounted, non-root whole disk (single-data-disk node).
-discover_dev() {
-  local d base
-  for d in /dev/nvme*n1 /dev/xvd[b-z] /dev/sd[b-z] /dev/vd[b-z]; do
-    [ -b "$d" ] || continue
-    [ "$d" = "$root_src" ] && continue
-    [ "$d" = "$root_base" ] && continue
-    base="/dev/$(lsblk -no pkname "$d" 2>/dev/null || true)"
-    [ "$base" = "$root_base" ] && continue
-    is_mounted "$d" && continue
-    echo "$d"; return 0
-  done
-  return 1
-}
-
-# Wait up to ~120s for one of the explicit candidate devices to appear.
-wait_dev() {
-  local i d
-  for i in $(seq 1 60); do
-    for d in "$@"; do [ -b "$d" ] && { echo "$d"; return 0; }; done
-    sleep 2
-  done
-  return 1
-}
-
-mount_one() {
-  local mountpoint="$1" fstype="$2"; shift 2
-  local dev=""
-  if [ "$#" -gt 0 ]; then
-    dev="$(wait_dev "$@" || true)"
-  fi
-  if [ -z "$dev" ]; then
-    dev="$(discover_dev || true)"
-  fi
-  if [ -z "$dev" ]; then
-    echo "mount-disks: no device found for $mountpoint" >&2
-    return 1
-  fi
-  if ! blkid "$dev" >/dev/null 2>&1; then
-    echo "mount-disks: formatting $dev as $fstype"
-    "mkfs.$fstype" -q "$dev"
-  fi
-  mkdir -p "$mountpoint"
-  local uuid; uuid="$(blkid -s UUID -o value "$dev")"
-  if [ -z "$uuid" ]; then
-    echo "mount-disks: failed to read a filesystem UUID for $dev" >&2
-    return 1
-  fi
-  if ! grep -q "$uuid" /etc/fstab; then
-    printf 'UUID=%s %s %s defaults,nofail 0 2\n' "$uuid" "$mountpoint" "$fstype" >> /etc/fstab
-  fi
-  is_mounted "$mountpoint" || mount "$mountpoint"
-  chown -R "$run_as_user:$run_as_user" "$mountpoint"
-  echo "mount-disks: $dev mounted at $mountpoint"
-}
-
-%{ for m in mounts ~}
-mount_one "${m.mountpoint}" "${m.fstype}"${length(m.devices) > 0 ? " ${join(" ", m.devices)}" : ""}
-%{ endfor ~}

terraform/modules/core/templates/security.toml.tftpl

@@ -1,53 +0,0 @@
-# SeaweedFS security.toml rendered by the Terraform core module.
-# Rendered when enable_security OR any non-default JWT signing option is set.
-# Presence of this file does NOT imply mTLS: the [grpc] TLS block is emitted
-# only under enable_security; a JWT-only config carries [jwt.*] and no TLS.
-
-%{ if enable_security ~}
-[grpc]
-ca = "${cert_dir}/ca/tls.crt"
-# Peer-identity authorization: without an allow-list, mTLS collapses to
-# "trusted the CA" with no authZ. Set allowed_wildcard_domain / commonNames.
-%{ if allowed_wildcard_domain != "" ~}
-allowed_wildcard_domain = "${allowed_wildcard_domain}"
-%{ endif ~}
-
-[grpc.master]
-cert = "${cert_dir}/master/tls.crt"
-key  = "${cert_dir}/master/tls.key"
-%{ if allowed_common_names != "" ~}
-allowed_commonNames = "${allowed_common_names}"
-%{ endif ~}
-
-[grpc.volume]
-cert = "${cert_dir}/volume/tls.crt"
-key  = "${cert_dir}/volume/tls.key"
-
-[grpc.filer]
-cert = "${cert_dir}/filer/tls.crt"
-key  = "${cert_dir}/filer/tls.key"
-
-[grpc.client]
-cert = "${cert_dir}/client/tls.crt"
-key  = "${cert_dir}/client/tls.key"
-%{ endif ~}
-%{ if jwt_signing_key != "" ~}
-
-[jwt.signing]
-key = "${jwt_signing_key}"
-%{ endif ~}
-%{ if jwt_signing_read_key != "" ~}
-
-[jwt.signing.read]
-key = "${jwt_signing_read_key}"
-%{ endif ~}
-%{ if jwt_filer_signing_key != "" ~}
-
-[jwt.filer_signing]
-key = "${jwt_filer_signing_key}"
-%{ endif ~}
-%{ if jwt_filer_signing_read_key != "" ~}
-
-[jwt.filer_signing.read]
-key = "${jwt_filer_signing_read_key}"
-%{ endif ~}

terraform/modules/core/templates/weed.service.tftpl

@@ -1,39 +0,0 @@
-[Unit]
-Description=SeaweedFS ${role} (${name})
-Documentation=https://github.com/seaweedfs/seaweedfs/wiki
-After=network-online.target
-Wants=network-online.target
-%{ for path in requires_mounts_for ~}
-RequiresMountsFor=${path}
-%{ endfor ~}
-
-[Service]
-Type=simple
-User=${run_as_user}
-Group=${run_as_user}
-ExecStart=${exec_start}
-Restart=always
-RestartSec=5
-LimitNOFILE=1048576
-TimeoutStopSec=60
-# Hardening (OpenShift SCC analogs; relax via the hardening variable)
-NoNewPrivileges=${no_new_privileges}
-%{ if protect_system ~}
-ProtectSystem=strict
-ProtectHome=true
-PrivateTmp=true
-%{ for path in read_write_paths ~}
-ReadWritePaths=${path}
-%{ endfor ~}
-%{ endif ~}
-%{ if cap_drop_all ~}
-CapabilityBoundingSet=
-AmbientCapabilities=
-%{ endif ~}
-EnvironmentFile=-${env_file}
-%{ for k, v in environment ~}
-Environment="${k}=${v}"
-%{ endfor ~}
-
-[Install]
-WantedBy=multi-user.target

terraform/modules/core/tests/render.tftest.hcl

@@ -1,234 +0,0 @@
-# Plan-level tests for the core renderer. No cloud credentials required.
-#   cd terraform/modules/core && tofu test
-
-variables {
-  weed_binary = "/usr/bin/weed"
-}
-
-# ---------------------------------------------------------------------------
-run "master_peers_and_count" {
-  command = plan
-  variables {
-    master = {
-      nodes = {
-        m0 = { address = "10.0.0.10" }
-        m1 = { address = "10.0.0.11" }
-        m2 = { address = "10.0.0.12" }
-      }
-    }
-    volume = { enabled = false }
-    filer  = { enabled = false }
-  }
-  assert {
-    condition     = output.master_peers == "10.0.0.10:9333,10.0.0.11:9333,10.0.0.12:9333"
-    error_message = "master -peers list is wrong"
-  }
-  assert {
-    condition     = length(output.node_names) == 3
-    error_message = "expected exactly 3 master nodes"
-  }
-}
-
-# ---------------------------------------------------------------------------
-run "volume_uses_mserver_not_master" {
-  command = plan
-  variables {
-    master = { nodes = { m0 = { address = "10.0.0.10" } } }
-    volume = { nodes = { v0 = { address = "10.0.0.20", rack = "rack-a", data_center = "dc1" } } }
-    filer  = { enabled = false }
-  }
-  assert {
-    condition     = contains(output.nodes["volume-v0"].argv, "-mserver=10.0.0.10:9333")
-    error_message = "volume must pass the master list via -mserver (verified flag), not -master"
-  }
-  assert {
-    condition     = !contains(output.nodes["volume-v0"].argv, "-master=10.0.0.10:9333")
-    error_message = "volume should not use -master for the master list"
-  }
-  assert {
-    condition     = contains(output.nodes["volume-v0"].argv, "-rack=rack-a") && contains(output.nodes["volume-v0"].argv, "-dataCenter=dc1")
-    error_message = "per-node rack/dataCenter must render"
-  }
-}
-
-# ---------------------------------------------------------------------------
-run "filer_uses_master_and_store_dir" {
-  command = plan
-  variables {
-    master = { nodes = { m0 = { address = "10.0.0.10" } } }
-    volume = { enabled = false }
-    filer  = { nodes = { f0 = { address = "10.0.0.30", data_dir = "/srv/filer" } } }
-  }
-  assert {
-    condition     = contains(output.nodes["filer-f0"].argv, "-master=10.0.0.10:9333")
-    error_message = "filer must use -master for the master list"
-  }
-  assert {
-    condition     = contains(output.nodes["filer-f0"].argv, "-defaultStoreDir=/srv/filer")
-    error_message = "filer leveldb2 store dir must render via -defaultStoreDir"
-  }
-}
-
-# ---------------------------------------------------------------------------
-run "metrics_gated_off_by_default" {
-  command = plan
-  variables {
-    master = { nodes = { m0 = { address = "10.0.0.10" } } }
-    volume = { enabled = false }
-    filer  = { enabled = false }
-  }
-  assert {
-    condition     = length([for a in output.nodes["master-m0"].argv : a if startswith(a, "-metricsPort")]) == 0
-    error_message = "metrics port must NOT be bound when monitoring is disabled"
-  }
-}
-
-run "metrics_on_when_enabled" {
-  command = plan
-  variables {
-    monitoring_enabled = true
-    master             = { nodes = { m0 = { address = "10.0.0.10" } }, metrics_port = 9327 }
-    volume             = { enabled = false }
-    filer              = { enabled = false }
-  }
-  assert {
-    condition     = contains(output.nodes["master-m0"].argv, "-metricsPort=9327")
-    error_message = "metrics port must bind when monitoring is enabled"
-  }
-}
-
-# ---------------------------------------------------------------------------
-run "security_toml_off_by_default" {
-  command = plan
-  variables {
-    master = { nodes = { m0 = { address = "10.0.0.10" } } }
-    volume = { enabled = false }
-    filer  = { enabled = false }
-  }
-  assert {
-    condition     = length(keys(output.nodes["master-m0"].config_files)) == 0
-    error_message = "security.toml must not render when security is off and no JWT keys set"
-  }
-}
-
-run "security_toml_on_with_mtls" {
-  command = plan
-  variables {
-    enable_security = true
-    security = {
-      allowed_wildcard_domain = ".seaweedfs.internal"
-      jwt_signing_key         = "test-signing-key-not-a-real-secret-0123456789"
-    }
-    master = { nodes = { m0 = { address = "10.0.0.10" } } }
-    volume = { enabled = false }
-    filer  = { enabled = false }
-  }
-  assert {
-    condition     = contains(keys(output.nodes["master-m0"].config_files), "/etc/seaweedfs/security.toml")
-    error_message = "security.toml must render when enable_security is true"
-  }
-}
-
-# ---------------------------------------------------------------------------
-run "all_in_one_renders_server" {
-  command = plan
-  variables {
-    master = { enabled = false }
-    volume = { enabled = false }
-    filer  = { enabled = false }
-    all_in_one = {
-      enabled = true
-      nodes   = { a0 = { address = "10.0.0.40" } }
-      s3      = { enabled = true }
-    }
-  }
-  assert {
-    condition     = contains(output.nodes["all-in-one-a0"].argv, "server")
-    error_message = "all-in-one must invoke the weed server subcommand"
-  }
-  assert {
-    condition     = contains(output.nodes["all-in-one-a0"].argv, "-s3") && contains(output.nodes["all-in-one-a0"].argv, "-s3.port=8333")
-    error_message = "all-in-one S3 must render when enabled"
-  }
-}
-
-# ---------------------------------------------------------------------------
-run "security_toml_mtls_only_no_jwt" {
-  command = plan
-  variables {
-    enable_security = true
-    master          = { nodes = { m0 = { address = "10.0.0.10" } } }
-    volume          = { enabled = false }
-    filer           = { enabled = false }
-  }
-  assert {
-    condition     = contains(keys(output.nodes["master-m0"].config_files), "/etc/seaweedfs/security.toml")
-    error_message = "security.toml must render for mTLS even without JWT keys"
-  }
-  assert {
-    condition     = !strcontains(output.nodes["master-m0"].config_files["/etc/seaweedfs/security.toml"], "[jwt.signing]")
-    error_message = "the jwt.signing block must be omitted when no signing key is set"
-  }
-}
-
-run "mount_fetch_and_secret_delivery" {
-  command = plan
-  variables {
-    enable_security     = true
-    render_secret_files = false
-    boot_fetch_script   = "#!/usr/bin/env bash\necho fetch\n"
-    security = {
-      jwt_signing_key = "test-signing-key-not-a-real-secret-0123456789"
-    }
-    master = { nodes = { m0 = { address = "10.0.0.10", disk_mounts = [{ mountpoint = "/data", fstype = "xfs" }] } } }
-    volume = { enabled = false }
-    filer  = { enabled = false }
-  }
-  assert {
-    condition     = strcontains(output.nodes["master-m0"].cloud_init, "/opt/seaweedfs/mount-disks.sh")
-    error_message = "cloud-init must write+run the mount script when disk_mounts is set"
-  }
-  assert {
-    condition     = strcontains(output.nodes["master-m0"].cloud_init, "/opt/seaweedfs/fetch-secrets.sh")
-    error_message = "cloud-init must write+run the fetch script when boot_fetch_script is set"
-  }
-  assert {
-    condition     = !strcontains(output.nodes["master-m0"].cloud_init, "[jwt.signing]")
-    error_message = "security.toml must NOT be inlined in cloud-init when render_secret_files=false"
-  }
-  assert {
-    condition     = contains(keys(output.nodes["master-m0"].secret_files), "/etc/seaweedfs/security.toml")
-    error_message = "secret_files must expose security.toml for secret-store delivery"
-  }
-}
-
-run "mount_script_absent_without_disks" {
-  command = plan
-  variables {
-    master = { nodes = { m0 = { address = "10.0.0.10" } } }
-    volume = { enabled = false }
-    filer  = { enabled = false }
-  }
-  assert {
-    condition     = !strcontains(output.nodes["master-m0"].cloud_init, "mount-disks.sh")
-    error_message = "no mount script should render when the node declares no disk_mounts"
-  }
-}
-
-run "s3_standalone_targets_filer" {
-  command = plan
-  variables {
-    master = { nodes = { m0 = { address = "10.0.0.10" } } }
-    volume = { enabled = false }
-    filer  = { nodes = { f0 = { address = "10.0.0.30" } } }
-    s3     = { enabled = true, nodes = { s0 = { address = "10.0.0.50" } } }
-  }
-  assert {
-    condition     = contains(output.nodes["s3-s0"].argv, "-filer=10.0.0.30:8888")
-    error_message = "standalone S3 must point -filer at the first filer node"
-  }
-  assert {
-    condition     = contains(output.nodes["s3-s0"].argv, "-config=/etc/seaweedfs/s3_config.json")
-    error_message = "standalone S3 must reference the rendered config path"
-  }
-}

terraform/modules/core/variables.tf

@@ -1,318 +0,0 @@
-# =============================================================================
-# SeaweedFS Terraform core module - input variables
-#
-# This module is a PURE RENDERER. It creates zero cloud resources. It takes a
-# per-node address map plus configuration and emits, per node, the rendered
-# `weed` argv, systemd unit, cloud-init, and config files. Both the per-cloud
-# infra wrappers (consume cloud_init/systemd_unit) and the local test harness
-# (consume argv/config_files) read its `nodes` output.
-#
-# Flag names below are verified against the real `weed` binary, not the chart.
-# Notably: volume uses -mserver for the master list; gRPC is -port.grpc
-# (auto = http+10000); minFreeSpacePercent is a string.
-# =============================================================================
-
-variable "weed_binary" {
-  description = "Path to the weed executable on the target host."
-  type        = string
-  default     = "/usr/bin/weed"
-}
-
-variable "cluster_name" {
-  description = "Logical cluster name (WEED_CLUSTER_DEFAULT)."
-  type        = string
-  default     = "sw"
-}
-
-variable "log_level" {
-  description = "Global glog verbosity (-v)."
-  type        = number
-  default     = 1
-}
-
-variable "log_to_stderr" {
-  description = "Log to stderr (journald) instead of -logdir. Recommended on systemd."
-  type        = bool
-  default     = true
-}
-
-variable "monitoring_enabled" {
-  description = "Gate the -metricsPort/-metrics.address flags. When false the metrics port is not bound, matching the chart."
-  type        = bool
-  default     = false
-}
-
-variable "enable_security" {
-  description = "Emit the security.toml [grpc] mTLS block and reference per-component certs. Independent of JWT."
-  type        = bool
-  default     = false
-}
-
-# ----------------------------------------------------------------------------
-# Security / secrets (the core only references paths + renders security.toml;
-# cert/secret material is generated by the wrapper, never defaulted here).
-# ----------------------------------------------------------------------------
-variable "security" {
-  description = "mTLS + JWT signing configuration. Secret values must be supplied (never defaulted in module code)."
-  type = object({
-    cert_dir                   = optional(string, "/usr/local/share/ca-certificates")
-    allowed_wildcard_domain    = optional(string, "")
-    allowed_common_names       = optional(string, "")
-    jwt_signing_key            = optional(string, "")
-    jwt_signing_read_key       = optional(string, "")
-    jwt_filer_signing_key      = optional(string, "")
-    jwt_filer_signing_read_key = optional(string, "")
-  })
-  default   = {}
-  sensitive = true
-}
-
-variable "hardening" {
-  description = "systemd hardening directives (OpenShift SCC analogs). Relax per field if needed."
-  type = object({
-    run_as_user       = optional(string, "seaweedfs")
-    no_new_privileges = optional(bool, true)
-    protect_system    = optional(bool, true)
-    cap_drop_all      = optional(bool, true)
-  })
-  default = {}
-}
-
-variable "env_file" {
-  description = "Path to the systemd EnvironmentFile holding secret env (DB creds, S3 admin key) fetched at boot. Optional (-prefixed in the unit, so a missing file is tolerated)."
-  type        = string
-  default     = "/etc/seaweedfs/weed.env"
-}
-
-variable "render_secret_files" {
-  description = <<-EOT
-    When true (default), secret-bearing config (security.toml, S3 identity JSON)
-    is written directly into cloud-init user_data. Convenient for the local test
-    harness and simple deployments. Set to false to keep secrets OUT of user_data
-    (and out of the cloud metadata service): the files are then exposed only via
-    the secret_files_by_node output, and the wrapper is expected to deliver them
-    from a secret store via boot_fetch_script.
-  EOT
-  type        = bool
-  default     = true
-}
-
-variable "boot_fetch_script" {
-  description = "Optional shell script written to /opt/seaweedfs/fetch-secrets.sh (root, 0755) and run before the weed unit starts. Used by wrappers to pull certs/secrets from a cloud secret store at boot."
-  type        = string
-  default     = ""
-}
-
-# ----------------------------------------------------------------------------
-# Master (Raft quorum). Keyed `nodes` map -> for_each, never count.
-# ----------------------------------------------------------------------------
-variable "master" {
-  description = "Master tier. nodes is a map keyed by stable node id (m0/m1/m2)."
-  type = object({
-    enabled = optional(bool, true)
-    nodes = optional(map(object({
-      address   = string
-      port      = optional(number)
-      grpc_port = optional(number)
-      data_dir  = optional(string)
-      disk_mounts = optional(list(object({
-        mountpoint = string
-        fstype     = optional(string, "ext4")
-        devices    = optional(list(string), [])
-      })), [])
-    })), {})
-    port                 = optional(number, 9333)
-    grpc_port            = optional(number, null) # null => weed auto = port+10000
-    metrics_port         = optional(number, 9327)
-    metrics_ip           = optional(string, "")
-    ip_bind              = optional(string, "0.0.0.0")
-    data_dir             = optional(string, "/var/lib/seaweedfs/master")
-    default_replication  = optional(string, "000")
-    volume_size_limit_mb = optional(number, 1000)
-    volume_preallocate   = optional(bool, false)
-    garbage_threshold    = optional(number, null)
-    disable_http         = optional(bool, false)
-    raft_hashicorp       = optional(bool, false)
-    resume_state         = optional(bool, true) # deliberate deviation: binary default false
-    election_timeout     = optional(string, "10s")
-    heartbeat_interval   = optional(string, "300ms")
-    white_list           = optional(string, "")
-    extra_args           = optional(list(string), [])
-  })
-  default = {}
-}
-
-# ----------------------------------------------------------------------------
-# Volume (stateful disk owners). Keyed `nodes` map.
-# ----------------------------------------------------------------------------
-variable "volume" {
-  description = "Volume tier. Each node owns one or more data dirs (-> -dir / -max)."
-  type = object({
-    enabled = optional(bool, true)
-    nodes = optional(map(object({
-      address     = string
-      port        = optional(number)
-      grpc_port   = optional(number)
-      public_url  = optional(string)
-      rack        = optional(string)
-      data_center = optional(string)
-      data_dirs = optional(list(object({
-        path        = string
-        max_volumes = optional(number, 0) # 0 => auto on non-windows
-      })))
-      idx_dir = optional(string)
-      disk_mounts = optional(list(object({
-        mountpoint = string
-        fstype     = optional(string, "ext4")
-        devices    = optional(list(string), [])
-      })), [])
-    })), {})
-    port         = optional(number, 8080)
-    metrics_port = optional(number, 9327)
-    metrics_ip   = optional(string, "")
-    ip_bind      = optional(string, "0.0.0.0")
-    data_dirs = optional(list(object({
-      path        = string
-      max_volumes = optional(number, 0)
-    })), [{ path = "/data", max_volumes = 0 }])
-    idx_dir                = optional(string, "")
-    read_mode              = optional(string, "proxy")
-    compaction_mbps        = optional(number, 50)
-    min_free_space_percent = optional(string, "1")
-    file_size_limit_mb     = optional(number, null)
-    index                  = optional(string, "memory")
-    images_fix_orientation = optional(bool, false)
-    white_list             = optional(string, "")
-    extra_args             = optional(list(string), [])
-  })
-  default = {}
-}
-
-# ----------------------------------------------------------------------------
-# Filer (+ optional embedded S3). Keyed `nodes` map.
-# ----------------------------------------------------------------------------
-variable "filer" {
-  description = "Filer tier. Default leveldb2-replicated HA (each filer has its own store)."
-  type = object({
-    enabled = optional(bool, true)
-    nodes = optional(map(object({
-      address   = string
-      port      = optional(number)
-      grpc_port = optional(number)
-      data_dir  = optional(string)
-      disk_mounts = optional(list(object({
-        mountpoint = string
-        fstype     = optional(string, "ext4")
-        devices    = optional(list(string), [])
-      })), [])
-    })), {})
-    port                      = optional(number, 8888)
-    metrics_port              = optional(number, 9327)
-    metrics_ip                = optional(string, "")
-    ip_bind                   = optional(string, "0.0.0.0")
-    data_dir                  = optional(string, "/var/lib/seaweedfs/filer") # -defaultStoreDir for leveldb2
-    default_replica_placement = optional(string, "000")
-    dir_list_limit            = optional(number, 100000)
-    max_mb                    = optional(number, null)
-    disable_dir_listing       = optional(bool, false)
-    disable_http              = optional(bool, false)
-    encrypt_volume_data       = optional(bool, false)
-    rack                      = optional(string, "")
-    data_center               = optional(string, "")
-    filer_group               = optional(string, "")
-    extra_env                 = optional(map(string), {})
-    extra_args                = optional(list(string), [])
-    s3 = optional(object({
-      enabled     = optional(bool, false)
-      port        = optional(number, 8333)
-      https_port  = optional(number, 0)
-      domain_name = optional(string, "")
-      config_path = optional(string, "/etc/seaweedfs/s3_config.json")
-    }), {})
-  })
-  default = {}
-}
-
-# ----------------------------------------------------------------------------
-# S3 gateway (standalone). Keyed `nodes` map (stateless, but kept keyed for
-# parity; wrappers may instead drive an ASG).
-# ----------------------------------------------------------------------------
-variable "s3" {
-  description = "Standalone S3 gateway tier."
-  type = object({
-    enabled = optional(bool, false)
-    nodes = optional(map(object({
-      address   = string
-      port      = optional(number)
-      grpc_port = optional(number)
-    })), {})
-    port                  = optional(number, 8333)
-    https_port            = optional(number, 0)
-    iceberg_port          = optional(number, null)
-    metrics_port          = optional(number, 9327)
-    ip_bind               = optional(string, "0.0.0.0")
-    domain_name           = optional(string, "")
-    filer_address         = optional(string, "") # override; else first filer node
-    config_path           = optional(string, "/etc/seaweedfs/s3_config.json")
-    audit_log_config_path = optional(string, "")
-    cert_file             = optional(string, "")
-    key_file              = optional(string, "")
-    cacert_file           = optional(string, "")
-    verify_client_cert    = optional(bool, false)
-    extra_args            = optional(list(string), [])
-  })
-  default = {}
-}
-
-# ----------------------------------------------------------------------------
-# S3 identities -> rendered into the s3 config JSON (non-admin only; the admin
-# credential is delivered via EnvironmentFile, never the JSON).
-# ----------------------------------------------------------------------------
-variable "s3_identities" {
-  description = "Non-admin S3 identities rendered into the config JSON. Admin key goes in the EnvironmentFile, not here."
-  type = list(object({
-    name       = string
-    access_key = string
-    secret_key = string
-    actions    = list(string)
-  }))
-  default   = []
-  sensitive = true
-}
-
-# ----------------------------------------------------------------------------
-# All-in-one (single `weed server` process).
-# ----------------------------------------------------------------------------
-variable "all_in_one" {
-  description = "All-in-one tier (weed server). Mutually exclusive with the distributed tiers."
-  type = object({
-    enabled = optional(bool, false)
-    nodes = optional(map(object({
-      address  = string
-      data_dir = optional(string)
-      disk_mounts = optional(list(object({
-        mountpoint = string
-        fstype     = optional(string, "ext4")
-        devices    = optional(list(string), [])
-      })), [])
-    })), {})
-    data_dir             = optional(string, "/data")
-    ip_bind              = optional(string, "0.0.0.0")
-    master_port          = optional(number, 9333)
-    volume_port          = optional(number, 8080)
-    filer_port           = optional(number, 8888)
-    default_replication  = optional(string, "000")
-    volume_size_limit_mb = optional(number, 1000)
-    idle_timeout         = optional(number, 30)
-    metrics_port         = optional(number, 9324)
-    disable_http         = optional(bool, false)
-    s3 = optional(object({
-      enabled     = optional(bool, false)
-      port        = optional(number, 8333)
-      config_path = optional(string, "/etc/seaweedfs/s3/s3_config.json")
-      domain_name = optional(string, "")
-    }), {})
-    extra_args = optional(list(string), [])
-  })
-  default = {}
-}

terraform/modules/core/versions.tf

@@ -1,6 +0,0 @@
-terraform {
-  # 1.3+ is required for optional() object attributes with defaults.
-  # The published wrappers pin a single honest floor;
-  # the core itself only needs language features available since 1.3.
-  required_version = ">= 1.3.0"
-}

terraform/modules/security/main.tf

@@ -1,68 +0,0 @@
-locals {
-  components = ["master", "volume", "filer", "client"]
-  ip_sans    = distinct(concat(["127.0.0.1"], var.ip_sans))
-}
-
-# ---- CA ---------------------------------------------------------------------
-resource "tls_private_key" "ca" {
-  algorithm   = var.key_algorithm
-  ecdsa_curve = var.ecdsa_curve
-  rsa_bits    = var.rsa_bits
-}
-
-resource "tls_self_signed_cert" "ca" {
-  private_key_pem   = tls_private_key.ca.private_key_pem
-  is_ca_certificate = true
-
-  subject {
-    common_name  = "SeaweedFS CA"
-    organization = "SeaweedFS"
-  }
-
-  validity_period_hours = var.ca_validity_hours
-  allowed_uses          = ["cert_signing", "crl_signing", "digital_signature"]
-}
-
-# ---- per-component leaf certs (distinct CN per component) --------------------
-resource "tls_private_key" "component" {
-  for_each    = toset(local.components)
-  algorithm   = var.key_algorithm
-  ecdsa_curve = var.ecdsa_curve
-  rsa_bits    = var.rsa_bits
-}
-
-resource "tls_cert_request" "component" {
-  for_each        = toset(local.components)
-  private_key_pem = tls_private_key.component[each.key].private_key_pem
-
-  subject {
-    # Distinct CN per component so peer-identity authZ (allowed_wildcard_domain
-    # / allowed_commonNames) is meaningful. Do NOT use one CN for all.
-    common_name  = "${each.key}.${var.internal_domain}"
-    organization = "SeaweedFS"
-  }
-
-  dns_names = distinct(concat(
-    ["${each.key}.${var.internal_domain}", "localhost"],
-    var.extra_dns_sans,
-  ))
-  ip_addresses = local.ip_sans
-}
-
-resource "tls_locally_signed_cert" "component" {
-  for_each           = toset(local.components)
-  cert_request_pem   = tls_cert_request.component[each.key].cert_request_pem
-  ca_private_key_pem = tls_private_key.ca.private_key_pem
-  ca_cert_pem        = tls_self_signed_cert.ca.cert_pem
-
-  validity_period_hours = var.cert_validity_hours
-  early_renewal_hours   = var.cert_early_renewal_hours
-  allowed_uses          = ["digital_signature", "key_agreement", "server_auth", "client_auth"]
-}
-
-# ---- JWT signing keys -------------------------------------------------------
-resource "random_password" "jwt" {
-  for_each = var.generate_jwt ? toset(["signing", "signing_read", "filer_signing", "filer_signing_read"]) : toset([])
-  length   = var.jwt_length
-  special  = false # TOML-safe
-}

terraform/modules/security/outputs.tf

@@ -1,65 +0,0 @@
-output "ca_cert_pem" {
-  description = "CA certificate PEM."
-  value       = tls_self_signed_cert.ca.cert_pem
-}
-
-output "certs" {
-  description = "Per-component { cert_pem, private_key_pem }."
-  value = {
-    for c in local.components : c => {
-      cert_pem        = tls_locally_signed_cert.component[c].cert_pem
-      private_key_pem = tls_private_key.component[c].private_key_pem
-    }
-  }
-  sensitive = true
-}
-
-output "jwt" {
-  description = "Generated JWT keys (empty strings when generate_jwt = false)."
-  value = {
-    signing            = var.generate_jwt ? random_password.jwt["signing"].result : ""
-    signing_read       = var.generate_jwt ? random_password.jwt["signing_read"].result : ""
-    filer_signing      = var.generate_jwt ? random_password.jwt["filer_signing"].result : ""
-    filer_signing_read = var.generate_jwt ? random_password.jwt["filer_signing_read"].result : ""
-  }
-  sensitive = true
-}
-
-# Ready to pass straight to the core module's `security` variable.
-output "core_security" {
-  description = "Object shaped for the core module's `security` input (cert_dir, allowed_wildcard_domain, JWT keys)."
-  value = {
-    cert_dir                   = var.cert_dir
-    allowed_wildcard_domain    = ".${var.internal_domain}"
-    allowed_common_names       = ""
-    jwt_signing_key            = var.generate_jwt ? random_password.jwt["signing"].result : ""
-    jwt_signing_read_key       = var.generate_jwt ? random_password.jwt["signing_read"].result : ""
-    jwt_filer_signing_key      = var.generate_jwt ? random_password.jwt["filer_signing"].result : ""
-    jwt_filer_signing_read_key = var.generate_jwt ? random_password.jwt["filer_signing_read"].result : ""
-  }
-  sensitive = true
-}
-
-# Non-sensitive manifest (key, on-host path, mode) so a wrapper can for_each
-# over SSM/secret-store resources without tripping the sensitive-for_each rule.
-output "secret_manifest" {
-  description = "List of { key, path, mode } for the CA + component cert/key files (no content)."
-  value = concat(
-    [{ key = "ca/tls.crt", path = "${var.cert_dir}/ca/tls.crt", mode = "0644" }],
-    flatten([for c in local.components : [
-      { key = "${c}/tls.crt", path = "${var.cert_dir}/${c}/tls.crt", mode = "0644" },
-      { key = "${c}/tls.key", path = "${var.cert_dir}/${c}/tls.key", mode = "0600" },
-    ]]),
-  )
-}
-
-# Sensitive map keyed by the manifest key -> file content.
-output "secret_contents" {
-  description = "Map of manifest key -> PEM content."
-  value = merge(
-    { "ca/tls.crt" = tls_self_signed_cert.ca.cert_pem },
-    { for c in local.components : "${c}/tls.crt" => tls_locally_signed_cert.component[c].cert_pem },
-    { for c in local.components : "${c}/tls.key" => tls_private_key.component[c].private_key_pem },
-  )
-  sensitive = true
-}

terraform/modules/security/variables.tf

@@ -1,89 +0,0 @@
-# =============================================================================
-# SeaweedFS security material generator (cloud-agnostic).
-#
-# Generates the CA, per-component mTLS certs with DISTINCT CommonNames, and JWT
-# signing keys. Outputs a `core_security` object ready to feed the core module's
-# `security` variable, plus the raw PEMs for a wrapper to deliver via a secret
-# store. NOTE: TF-generated secrets live in state; prefer Vault PKI for the CA
-# in production.
-# =============================================================================
-
-variable "internal_domain" {
-  description = "Internal domain for component CNs (e.g. master.<domain>). Drives the allowed_wildcard_domain peer-auth check."
-  type        = string
-  default     = "seaweedfs.internal"
-}
-
-variable "ip_sans" {
-  description = "IP addresses to include as SANs on every component cert (all node private IPs + 127.0.0.1 is added automatically)."
-  type        = list(string)
-  default     = []
-}
-
-variable "extra_dns_sans" {
-  description = "Additional DNS SANs to include on every component cert."
-  type        = list(string)
-  default     = []
-}
-
-variable "key_algorithm" {
-  description = "CA/leaf key algorithm: ECDSA (default, modern) or RSA."
-  type        = string
-  default     = "ECDSA"
-  validation {
-    condition     = contains(["ECDSA", "RSA"], var.key_algorithm)
-    error_message = "key_algorithm must be ECDSA or RSA."
-  }
-}
-
-variable "ecdsa_curve" {
-  description = "ECDSA curve when key_algorithm = ECDSA."
-  type        = string
-  default     = "P256"
-}
-
-variable "rsa_bits" {
-  description = "RSA key size when key_algorithm = RSA."
-  type        = number
-  default     = 3072
-}
-
-variable "ca_validity_hours" {
-  description = "CA certificate validity (default 10 years)."
-  type        = number
-  default     = 87600
-}
-
-variable "cert_validity_hours" {
-  description = "Component certificate validity. Short by default; certs hot-reload so reissue is cheap."
-  type        = number
-  default     = 72
-}
-
-variable "cert_early_renewal_hours" {
-  description = "Renew component certs this many hours before expiry."
-  type        = number
-  default     = 24
-}
-
-variable "cert_dir" {
-  description = "On-host directory where certs are placed; surfaced in core_security.cert_dir."
-  type        = string
-  default     = "/usr/local/share/ca-certificates"
-}
-
-variable "generate_jwt" {
-  description = "Generate JWT signing keys (signing, signing.read, filer_signing, filer_signing.read)."
-  type        = bool
-  default     = true
-}
-
-variable "jwt_length" {
-  description = "Length of generated JWT keys (>= 32 hardened)."
-  type        = number
-  default     = 40
-  validation {
-    condition     = var.jwt_length >= 32
-    error_message = "jwt_length must be >= 32 (hardened minimum)."
-  }
-}