mirror of
https://github.com/rustfs/rustfs.git
synced 2026-10-28 15:02:49 +00:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 overtrue
|
f5fdb25181 | ||
|
overtrue
|
3a3cd5bbdc | ||
|
overtrue
|
5608495e0e | ||
|
overtrue
|
906689b674 | ||
|
overtrue
|
543334128d | ||
|
overtrue
|
8cd556c272 | ||
|
overtrue
|
8605f3d3d1 | ||
|
overtrue
|
6e6777c6fd | ||
|
overtrue
|
839467a01b |
@@ -1,2 +1,2 @@
|
||||
sha256-darwin=67251cb7d9978d38e899268cac4d7898297ff7e5b5c48c9c1546dc760b93568d
|
||||
sha256-linux=673da76c2e5710c4622fe2fa32d2b297730895769487fcf1152ee1c2366f32f4
|
||||
sha256-darwin=a67a347f26be186c598b5beaf68e6bcbe1855350a35e1423dd5b8a81bcba06a5
|
||||
sha256-linux=ad4fabe811c6cca1aba89fad34ccd404b5832a6a955875c2826f6e0fa1ea4f1f
|
||||
|
||||
@@ -1 +1 @@
|
||||
sha256=e9dc896774122a304e2b8b90f28c82d4d4e0af8ded36a82b147b30945ec994e3
|
||||
sha256=f065e7071aac9d48a7c1b301f328fa7cc14f11c4e7dc46da3e55057c4ea29bd5
|
||||
|
||||
@@ -128,7 +128,7 @@ setup = 'ecstore-large-stack'
|
||||
# path on a real store; measured with RUST_MIN_STACK on 2026-10-15 they need
|
||||
# 2016-2040 KiB of the 2 MiB libtest default and overflowed on Linux CI.
|
||||
[[profile.default.scripts]]
|
||||
filter = '(package(rustfs) & test(/^(admin::handlers::replication::target_repair_tests::[a-z_]+|admin::handlers::plugin_attempt::v2_tests::delegation_v2_persists_and_vends_with_real_parent_intersection|admin::handlers::site_replication::tests::durable_iam_state_apply_iam_item_rejects_a_stale_recreate_after_a_replicated_delete|admin::service::federated_identity::tests::(binding_keeps_explicit_iam_mapping_strict|markerless_legacy_oidc_session_crosses_auth_and_iam_deletion_boundaries)|storage::scanner_dirty_journal::tests::(clear_callback_keeps_unknown_coverage_until_all_pending_work_is_confirmed|owned_journals_keep_peer_records_after_interleaved_writes_and_clear))$/)) | (package(rustfs-heal) & ((binary(heal_b5_versioned_regression_test) & test(/^serial_tests::(test_heal_unversioned_bucket_e2e|test_historical_null_recursive_heal_restores_physical_versions|test_recursive_deep_heal_reports_stale_delete_marker_repair)$/)) | (binary(usage_observation_read_repair_test) & test(=usage_observation_read_repair_survives_snapshot_cleanup)))) | (package(rustfs-test-utils) & test(=data_usage_snapshot_tests::data_usage_snapshot_recovery_wires_primary_backup_and_negative_cache))'
|
||||
filter = '(package(rustfs) & test(/^(admin::handlers::replication::target_repair_tests::[a-z_]+|admin::handlers::site_replication::tests::durable_iam_state_apply_iam_item_rejects_a_stale_recreate_after_a_replicated_delete|admin::service::federated_identity::tests::(binding_keeps_explicit_iam_mapping_strict|markerless_legacy_oidc_session_crosses_auth_and_iam_deletion_boundaries)|storage::scanner_dirty_journal::tests::(clear_callback_keeps_unknown_coverage_until_all_pending_work_is_confirmed|owned_journals_keep_peer_records_after_interleaved_writes_and_clear))$/)) | (package(rustfs-heal) & ((binary(heal_b5_versioned_regression_test) & test(/^serial_tests::(test_heal_unversioned_bucket_e2e|test_historical_null_recursive_heal_restores_physical_versions|test_recursive_deep_heal_reports_stale_delete_marker_repair)$/)) | (binary(usage_observation_read_repair_test) & test(=usage_observation_read_repair_survives_snapshot_cleanup)))) | (package(rustfs-test-utils) & test(=data_usage_snapshot_tests::data_usage_snapshot_recovery_wires_primary_backup_and_negative_cache))'
|
||||
setup = 'ecstore-base-stack'
|
||||
|
||||
[[profile.default.scripts]]
|
||||
@@ -419,7 +419,7 @@ setup = 'ecstore-large-stack'
|
||||
|
||||
# These cross-crate real-storage fixtures need the same bounded stack as ECStore tests.
|
||||
[[profile.ci.scripts]]
|
||||
filter = '(package(rustfs) & test(/^(admin::handlers::replication::target_repair_tests::[a-z_]+|admin::handlers::plugin_attempt::v2_tests::delegation_v2_persists_and_vends_with_real_parent_intersection|admin::handlers::site_replication::tests::durable_iam_state_apply_iam_item_rejects_a_stale_recreate_after_a_replicated_delete|admin::service::federated_identity::tests::(binding_keeps_explicit_iam_mapping_strict|markerless_legacy_oidc_session_crosses_auth_and_iam_deletion_boundaries)|storage::scanner_dirty_journal::tests::(clear_callback_keeps_unknown_coverage_until_all_pending_work_is_confirmed|owned_journals_keep_peer_records_after_interleaved_writes_and_clear))$/)) | (package(rustfs-heal) & ((binary(heal_b5_versioned_regression_test) & test(/^serial_tests::(test_heal_unversioned_bucket_e2e|test_historical_null_recursive_heal_restores_physical_versions|test_recursive_deep_heal_reports_stale_delete_marker_repair)$/)) | (binary(usage_observation_read_repair_test) & test(=usage_observation_read_repair_survives_snapshot_cleanup)))) | (package(rustfs-test-utils) & test(=data_usage_snapshot_tests::data_usage_snapshot_recovery_wires_primary_backup_and_negative_cache))'
|
||||
filter = '(package(rustfs) & test(/^(admin::handlers::replication::target_repair_tests::[a-z_]+|admin::handlers::site_replication::tests::durable_iam_state_apply_iam_item_rejects_a_stale_recreate_after_a_replicated_delete|admin::service::federated_identity::tests::(binding_keeps_explicit_iam_mapping_strict|markerless_legacy_oidc_session_crosses_auth_and_iam_deletion_boundaries)|storage::scanner_dirty_journal::tests::(clear_callback_keeps_unknown_coverage_until_all_pending_work_is_confirmed|owned_journals_keep_peer_records_after_interleaved_writes_and_clear))$/)) | (package(rustfs-heal) & ((binary(heal_b5_versioned_regression_test) & test(/^serial_tests::(test_heal_unversioned_bucket_e2e|test_historical_null_recursive_heal_restores_physical_versions|test_recursive_deep_heal_reports_stale_delete_marker_repair)$/)) | (binary(usage_observation_read_repair_test) & test(=usage_observation_read_repair_survives_snapshot_cleanup)))) | (package(rustfs-test-utils) & test(=data_usage_snapshot_tests::data_usage_snapshot_recovery_wires_primary_backup_and_negative_cache))'
|
||||
setup = 'ecstore-base-stack'
|
||||
|
||||
[[profile.ci.scripts]]
|
||||
|
||||
@@ -16,7 +16,7 @@ Every other label in this repository is capacity RustFS pays for. ARC pods and l
|
||||
| `sm-standard-2` | RustFS | ARC pod, Ubuntu 24.04, minimal image: no `gh`, no C toolchain; Docker only on the `dind-` label | only a job that a hosted runner cannot run (see the placement rule) |
|
||||
| `sm-standard-4` | RustFS | ARC pod, Ubuntu 24.04, 14 CPUs and 28 GB (the label is not the core count), large disk | workspace-scale Cargo builds |
|
||||
| `ubicloud-standard-16-arm` | RustFS | Ubicloud VM, alias of `ubicloud-standard-16-arm-ubuntu-2404`: Ubuntu 24.04 arm64, 16 vCPU, 48 GB, 300 GB disk. Reached through the `build.yml` matrix, so `actionlint.yaml` does not list it | native aarch64 release builds (`linux-aarch64-musl`, `linux-aarch64-gnu`) |
|
||||
| `dind-sm-standard-2` | RustFS | ARC pod with Docker-in-Docker | Docker workloads with a measured resource or environment requirement beyond the hosted runner |
|
||||
| `dind-sm-standard-2` | RustFS | ARC pod with Docker-in-Docker | image builds that need `buildx` and a registry push |
|
||||
| `smoke-testing`, `pf-testing` | RustFS | long-lived lab machines | the packaged functional chain and performance suites |
|
||||
|
||||
The self-hosted pods and the hosted image are both Ubuntu 24.04, so a binary built on one runs on the other; `ci.yml` builds the debug binary on `sm-standard-4` and runs it on both pools.
|
||||
@@ -27,15 +27,11 @@ A job runs on `ubuntu-latest` unless it has one of these reasons, and the reason
|
||||
|
||||
1. **Disk.** It restores or produces the workspace `target/`: `cargo build` or `cargo test` with `--all-targets`, `cargo nextest run --all`, or any reader of the `ci-dev` / `ci-feat-*` caches. The workspace test build leaves about 64 GB in `target/`; a hosted runner has about 14 GB.
|
||||
2. **Critical-path CPU.** It is a build that several downstream lanes wait on and would blow its timeout at 4 vCPU (`build-rustfs-debug-binary` gates the e2e and s3-tests lanes).
|
||||
3. **Hardware or environment.** Native aarch64 or access to the lab machines. Docker alone is not a reason: hosted Ubuntu ships Docker and supports the QEMU and Buildx setup actions.
|
||||
3. **Hardware.** Native aarch64, Docker-in-Docker, or the lab machines.
|
||||
4. **Cache ownership.** It reads a `rust-cache` key that a self-hosted job writes (see the cache rule below).
|
||||
|
||||
Jobs that do only the following have no reason to be self-hosted: shell or Python scripts, `cargo fmt`, `cargo deny`, typos, actionlint, API calls (`gh`, dependency review, issue and stale bots, CLA checks), downloading an artifact and running a prebuilt binary, or a `cargo build -p rustfs` with its own cache key. `e2e-distributed.yml` and `e2e-upgrade.yml` build the server and the `e2e_test` harness on `ubuntu-latest` inside their budgets, so "it compiles something" alone is not a reason.
|
||||
|
||||
The functional chain's `prepare` and `complete-chain` jobs, the performance runner availability check, and runner hygiene use `ubuntu-latest`: they inspect APIs or artifacts, not the lab hosts. The actual functional and performance suites remain on their lab runners. Functional-chain health collection stays on the operator-managed `smoke-testing` runner as part of the automation environment. Docker image packaging also uses `ubuntu-latest` for both musl and glibc variants; it downloads release binaries rather than compiling the workspace, and still sets up QEMU and Buildx explicitly.
|
||||
|
||||
Moving these jobs off AKS reduces capacity demand, not necessarily the Azure bill immediately. VM costs fall only when nodes scale down or smaller capacity replaces them.
|
||||
|
||||
A hosted runner is also the only choice for a few things the pods cannot do: `mount -o loop` and `mount -t tmpfs` fail inside the ARC pods, and a container runtime cannot guarantee that `io_uring_setup` is allowed. `uring-integration` and `e2e-distributed` are on `ubuntu-latest` for that reason, not for cost.
|
||||
|
||||
## Cache rule
|
||||
|
||||
@@ -337,7 +337,7 @@ jobs:
|
||||
name: Build Docker Images
|
||||
needs: build-check
|
||||
if: needs.build-check.outputs.should_build == 'true'
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: dind-sm-standard-2
|
||||
timeout-minutes: 60
|
||||
strategy:
|
||||
fail-fast: false
|
||||
|
||||
@@ -44,7 +44,7 @@ jobs:
|
||||
check-ephemerality:
|
||||
if: github.repository == 'rustfs/rustfs'
|
||||
name: Check runner ephemerality
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: sm-standard-2
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
|
||||
@@ -42,7 +42,7 @@ concurrency:
|
||||
jobs:
|
||||
prepare:
|
||||
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.event == 'schedule' }}
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: smoke-testing
|
||||
timeout-minutes: 10
|
||||
outputs:
|
||||
manifest: ${{ steps.candidate.outputs.manifest }}
|
||||
@@ -188,7 +188,7 @@ jobs:
|
||||
complete-chain:
|
||||
needs: [prepare, upgrade, s3, kms, tier, storage, heal, pool, security, replication, fault-tolerance, table, performance]
|
||||
if: ${{ always() && needs.prepare.result != 'skipped' }}
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: smoke-testing
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
|
||||
|
||||
@@ -90,7 +90,7 @@ env:
|
||||
jobs:
|
||||
runner-check:
|
||||
if: ${{ inputs.chain_manifest != '' || github.event_name == 'workflow_dispatch' || github.event_name == 'repository_dispatch' }}
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: sm-standard-2
|
||||
timeout-minutes: 5
|
||||
steps:
|
||||
- uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
|
||||
|
||||
@@ -1,224 +1,249 @@
|
||||
# Copyright 2024 RustFS Team
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
name: Windows Filesystem Tests
|
||||
name: Scanner Candidate Group Red Preflight
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main ]
|
||||
paths:
|
||||
- "crates/ecstore/src/disk/**"
|
||||
- "crates/ecstore/src/layout/**"
|
||||
- "crates/ecstore/src/store/init_format.rs"
|
||||
- "crates/ecstore/src/set_disk/ops/locking.rs"
|
||||
- "crates/ecstore/src/object_api/write_commit_context.rs"
|
||||
- "crates/ecstore/src/bucket/utils.rs"
|
||||
- "crates/ecstore/Cargo.toml"
|
||||
- "crates/utils/src/dunce.rs"
|
||||
- "crates/utils/src/os/**"
|
||||
- "crates/utils/Cargo.toml"
|
||||
- "crates/utils/src/path.rs"
|
||||
- "rustfs/build.rs"
|
||||
- "rustfs/Cargo.toml"
|
||||
- "rustfs/src/main.rs"
|
||||
- "rustfs/src/server/runtime.rs"
|
||||
- "rustfs/src/startup_*.rs"
|
||||
- "Cargo.toml"
|
||||
- "Cargo.lock"
|
||||
- ".github/actions/setup/**"
|
||||
- ".github/workflows/windows-filesystem.yml"
|
||||
pull_request:
|
||||
branches: [ main ]
|
||||
paths:
|
||||
- "crates/ecstore/src/disk/**"
|
||||
- "crates/ecstore/src/layout/**"
|
||||
- "crates/ecstore/src/store/init_format.rs"
|
||||
- "crates/ecstore/src/set_disk/ops/locking.rs"
|
||||
- "crates/ecstore/src/object_api/write_commit_context.rs"
|
||||
- "crates/ecstore/src/bucket/utils.rs"
|
||||
- "crates/ecstore/Cargo.toml"
|
||||
- "crates/utils/src/dunce.rs"
|
||||
- "crates/utils/src/os/**"
|
||||
- "crates/utils/Cargo.toml"
|
||||
- "crates/utils/src/path.rs"
|
||||
- "rustfs/build.rs"
|
||||
- "rustfs/Cargo.toml"
|
||||
- "rustfs/src/main.rs"
|
||||
- "rustfs/src/server/runtime.rs"
|
||||
- "rustfs/src/startup_*.rs"
|
||||
- "Cargo.toml"
|
||||
- "Cargo.lock"
|
||||
- ".github/actions/setup/**"
|
||||
- ".github/workflows/windows-filesystem.yml"
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
expected_head:
|
||||
description: Full SHA of this workflow commit
|
||||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
|
||||
RUST_BACKTRACE: 1
|
||||
group: scanner-candidate-group-red-${{ github.ref }}
|
||||
cancel-in-progress: false
|
||||
|
||||
# Eight expected baseline failures and one passing control use only in-memory
|
||||
# observation fixtures. They do not validate the fix, full CI, G, RPC or MRF.
|
||||
jobs:
|
||||
rename-safety:
|
||||
name: Rename Safety
|
||||
runs-on: windows-latest
|
||||
timeout-minutes: 60
|
||||
scoped:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 120
|
||||
env:
|
||||
CARGO_TERM_COLOR: never
|
||||
CARGO_BUILD_JOBS: '2'
|
||||
CARGO_INCREMENTAL: '0'
|
||||
CARGO_PROFILE_DEV_DEBUG: '0'
|
||||
CARGO_PROFILE_TEST_DEBUG: '0'
|
||||
RUST_BACKTRACE: '0'
|
||||
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: 'true'
|
||||
NO_PROXY: 127.0.0.1,localhost
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
- name: Checkout candidate
|
||||
uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
|
||||
with:
|
||||
fetch-depth: 10
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Rust environment
|
||||
uses: ./.github/actions/setup
|
||||
with:
|
||||
rust-version: stable
|
||||
cache-shared-key: build-x86_64-pc-windows-msvc
|
||||
cache-save-if: 'false'
|
||||
install-build-packaging-tools: 'false'
|
||||
install-test-tools: 'false'
|
||||
|
||||
- name: Check production Windows dependencies
|
||||
shell: pwsh
|
||||
run: cargo check -p rustfs-ecstore --lib
|
||||
|
||||
- name: Test guarded rename publication
|
||||
shell: pwsh
|
||||
run: cargo test -p rustfs-ecstore --lib rename_all_ -- --nocapture
|
||||
|
||||
- name: Test multipart parent durability barriers
|
||||
shell: pwsh
|
||||
run: cargo test -p rustfs-ecstore --lib multipart_owned_record_parent_barriers_ -- --nocapture
|
||||
|
||||
- name: Test Windows path conversion
|
||||
shell: pwsh
|
||||
run: "cargo test -p rustfs-utils --no-default-features --features path --lib dunce:: -- --nocapture"
|
||||
|
||||
- name: Test Windows volume and disk-space probes
|
||||
shell: pwsh
|
||||
run: |
|
||||
# Map a drive letter to the temp drive's administrative share so the
|
||||
# remote-volume probe also covers mapped network drives.
|
||||
$drive = (Split-Path -Qualifier ([System.IO.Path]::GetTempPath())).TrimEnd(':')
|
||||
net use R: "\\localhost\$drive`$" /persistent:no
|
||||
if ($LASTEXITCODE -eq 0) {
|
||||
$env:RUSTFS_TEST_WINDOWS_MAPPED_DRIVE = 'R:'
|
||||
} else {
|
||||
Write-Output "::warning::could not map R: to \\localhost\$drive`$; mapped-drive test will skip"
|
||||
}
|
||||
cargo test -p rustfs-utils --features os --lib os:: -- --nocapture
|
||||
$status = $LASTEXITCODE
|
||||
if ($env:RUSTFS_TEST_WINDOWS_MAPPED_DRIVE) { net use R: /delete /y | Out-Null }
|
||||
exit $status
|
||||
|
||||
- name: Test Windows handle guards
|
||||
shell: pwsh
|
||||
run: cargo test -p rustfs-ecstore --lib windows_ -- --nocapture
|
||||
|
||||
- name: Test endpoint path parsing
|
||||
shell: pwsh
|
||||
run: "cargo test -p rustfs-ecstore --lib layout::endpoint:: -- --nocapture"
|
||||
|
||||
- name: Test startup temporary-directory cleanup
|
||||
shell: pwsh
|
||||
run: cargo test -p rustfs-ecstore --lib cleanup_tmp_on_startup_ -- --nocapture
|
||||
|
||||
- name: Test object key Windows admission
|
||||
shell: pwsh
|
||||
run: "cargo test -p rustfs-ecstore --lib bucket::utils:: -- --nocapture"
|
||||
|
||||
- name: Test Windows file-name rules
|
||||
shell: pwsh
|
||||
run: "cargo test -p rustfs-utils --no-default-features --features path --lib dunce:: -- --nocapture"
|
||||
|
||||
- name: Test fresh format publication
|
||||
shell: pwsh
|
||||
run: cargo test -p rustfs-ecstore --lib fresh_format_load_initializes_all_disks -- --nocapture
|
||||
|
||||
# The native Windows main thread only gets the 1 MiB PE stack reserve, while
|
||||
# Linux and macOS hand out 8 MiB. Startup runs the whole root future on the
|
||||
# thread that calls `block_on`, so a debug server once overflowed before it
|
||||
# listened on Windows only. Start a real server to keep that covered.
|
||||
startup-smoke:
|
||||
name: Startup Smoke
|
||||
runs-on: windows-latest
|
||||
timeout-minutes: 90
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Setup Rust environment
|
||||
uses: ./.github/actions/setup
|
||||
with:
|
||||
rust-version: stable
|
||||
cache-shared-key: build-x86_64-pc-windows-msvc
|
||||
cache-save-if: 'false'
|
||||
install-build-packaging-tools: 'false'
|
||||
install-test-tools: 'false'
|
||||
|
||||
- name: Build debug server binary
|
||||
shell: pwsh
|
||||
run: cargo build --locked -p rustfs --bin rustfs
|
||||
|
||||
- name: Print version
|
||||
shell: pwsh
|
||||
run: |
|
||||
& .\target\debug\rustfs.exe --version
|
||||
if ($LASTEXITCODE -ne 0) { throw "rustfs --version exited with $LASTEXITCODE" }
|
||||
|
||||
- name: Start server and wait for readiness
|
||||
shell: pwsh
|
||||
- name: Verify exact baseline and test snapshot
|
||||
shell: bash
|
||||
env:
|
||||
RUSTFS_ACCESS_KEY: rustfsadmin
|
||||
RUSTFS_SECRET_KEY: rustfsadmin
|
||||
EXPECTED_HEAD: ${{ inputs.expected_head }}
|
||||
LOG_DIR: ${{ runner.temp }}/scanner-group-red
|
||||
run: |
|
||||
$volume = Join-Path $env:RUNNER_TEMP 'rustfs-startup-smoke'
|
||||
$stdout = Join-Path $env:RUNNER_TEMP 'rustfs-startup-smoke.out.log'
|
||||
$stderr = Join-Path $env:RUNNER_TEMP 'rustfs-startup-smoke.err.log'
|
||||
New-Item -ItemType Directory -Force -Path $volume | Out-Null
|
||||
$server = Start-Process -FilePath .\target\debug\rustfs.exe `
|
||||
-ArgumentList @('--address', '127.0.0.1:9000', "`"$volume`"") `
|
||||
-RedirectStandardOutput $stdout -RedirectStandardError $stderr `
|
||||
-NoNewWindow -PassThru
|
||||
# Cache the process handle now; otherwise ExitCode reads back empty.
|
||||
$null = $server.Handle
|
||||
$ready = $false
|
||||
try {
|
||||
for ($i = 0; $i -lt 180; $i++) {
|
||||
if ($server.HasExited) { break }
|
||||
try {
|
||||
$response = Invoke-WebRequest -Uri 'http://127.0.0.1:9000/health/ready' -UseBasicParsing -NoProxy -TimeoutSec 2
|
||||
if ($response.StatusCode -eq 200) { $ready = $true; break }
|
||||
} catch {}
|
||||
Start-Sleep -Seconds 1
|
||||
}
|
||||
} finally {
|
||||
if (-not $server.HasExited) { Stop-Process -Id $server.Id -Force }
|
||||
$server.WaitForExit()
|
||||
Write-Host '--- server stdout (tail) ---'
|
||||
Get-Content $stdout -Tail 100 -ErrorAction SilentlyContinue
|
||||
Write-Host '--- server stderr (tail) ---'
|
||||
Get-Content $stderr -Tail 100 -ErrorAction SilentlyContinue
|
||||
set -euo pipefail
|
||||
[[ ! -e "$LOG_DIR" ]]
|
||||
mkdir "$LOG_DIR"
|
||||
head=$(git rev-parse HEAD)
|
||||
workflow_parent=$(git rev-parse "${head}^")
|
||||
source=$(git rev-parse '3a3cd5bbdc2d76ddd2a5540bfe7565c4b1afbca2^{commit}')
|
||||
parent=$(git rev-parse "${source}^")
|
||||
base=$(git rev-parse "${source}~5")
|
||||
tree=$(git rev-parse "${source}^{tree}")
|
||||
parent_tree=$(git rev-parse "${parent}^{tree}")
|
||||
test_blob=$(git rev-parse "${source}:crates/scanner/src/heal_completion/tests.rs")
|
||||
production_blob=$(git rev-parse "${source}:crates/scanner/src/heal_completion.rs")
|
||||
base_production_blob=$(git rev-parse "${base}:crates/scanner/src/heal_completion.rs")
|
||||
last_diff=$(git diff --full-index --binary "$parent" "$source" | sha256sum | cut -d' ' -f1)
|
||||
test_diff=$(git diff --full-index --binary "$base" "$source" | sha256sum | cut -d' ' -f1)
|
||||
test_files=$(git diff --name-only "$base" "$source")
|
||||
workflow_files=$(git diff --name-only "$source" "$head")
|
||||
printf 'head=%s workflow_parent=%s source=%s parent=%s base=%s tree=%s parent_tree=%s test_blob=%s production_blob=%s last_diff=%s test_diff=%s\n' \
|
||||
"$head" "$workflow_parent" "$source" "$parent" "$base" "$tree" "$parent_tree" "$test_blob" "$production_blob" "$last_diff" "$test_diff" | tee "$LOG_DIR/snapshot.txt"
|
||||
printf 'test_files=%s workflow_files=%s\n' "$test_files" "$workflow_files" | tee -a "$LOG_DIR/snapshot.txt"
|
||||
[[ "$EXPECTED_HEAD" =~ ^[0-9a-f]{40}$ ]]
|
||||
[[ "$head" == "$EXPECTED_HEAD" && "$head" == "$GITHUB_SHA" ]]
|
||||
[[ "$workflow_parent" == "$source" ]]
|
||||
[[ "$source" == 3a3cd5bbdc2d76ddd2a5540bfe7565c4b1afbca2 ]]
|
||||
[[ "$parent" == 5608495e0e526c05a40fe5add985a4f7db1e62bc ]]
|
||||
[[ "$base" == 8605f3d3d183e2d98a4b31fe87d39f8439d1b0f4 ]]
|
||||
[[ "$tree" == 96f407f21b088a0d3fc054f907fb8151e655025e ]]
|
||||
[[ "$parent_tree" == 17e7d51b49412aff1b957913f1d9671f3b6707fe ]]
|
||||
[[ "$test_blob" == 1e2e77a1a16afc5cef7f749f60e72ff5ab9a9367 ]]
|
||||
[[ "$production_blob" == 51e51f7bfaa03ec8e1d0efdfdd5847b1130c9f13 && "$production_blob" == "$base_production_blob" ]]
|
||||
[[ "$last_diff" == 77721d72e4e0c505180fc3015a8127a29239aa212228a594555f8fbe0f06ccee ]]
|
||||
[[ "$test_diff" == 935f81f7c3546e44083e2845f08423a35efaafb7ed8e68f468f1edccbb7352da ]]
|
||||
[[ "$test_files" == crates/scanner/src/heal_completion/tests.rs ]]
|
||||
[[ "$workflow_files" == .github/workflows/windows-filesystem.yml ]]
|
||||
[[ -z "$(git status --porcelain)" ]]
|
||||
|
||||
- name: Setup Rust
|
||||
uses: ./.github/actions/setup
|
||||
with:
|
||||
rust-version: stable
|
||||
cache-shared-key: scanner-group-red-8605-hosted
|
||||
cache-save-if: 'false'
|
||||
install-build-packaging-tools: 'false'
|
||||
install-test-tools: 'false'
|
||||
|
||||
- name: Run one passing control and eight expected failures
|
||||
shell: bash
|
||||
env:
|
||||
LOG_DIR: ${{ runner.temp }}/scanner-group-red
|
||||
run: |
|
||||
set -euo pipefail
|
||||
[[ -d "$LOG_DIR" && -f "$LOG_DIR/snapshot.txt" ]]
|
||||
rustc --version --verbose | tee "$LOG_DIR/rustc-version.log"
|
||||
cargo --version --verbose | tee "$LOG_DIR/cargo-version.log"
|
||||
toolchain=$(rustup show active-toolchain)
|
||||
printf '%s\n' "$toolchain" | tee "$LOG_DIR/rustup-version.log"
|
||||
[[ "$toolchain" == stable-* ]]
|
||||
tests=(
|
||||
'heal_completion::tests::mixed_candidate_semantics_settle_independently_in_either_order|RED_GROUP_MIXED_SCOPE|100'
|
||||
'heal_completion::tests::candidate_group_capacity_is_global_and_released_by_completion|RED_GROUP_GLOBAL_CAPACITY|135'
|
||||
'heal_completion::tests::candidate_group_expiry_and_notification_loss_are_independent|RED_GROUP_EXPIRY_WITH_LOSS|174'
|
||||
'heal_completion::tests::candidate_group_expiry_uses_earliest_discovery_not_admission_order|RED_GROUP_FIRST_EARLIEST_EXPIRY|203'
|
||||
'heal_completion::tests::later_candidate_group_also_expires_from_earliest_discovery|RED_GROUP_ADDITIONAL_EARLIEST_EXPIRY|226'
|
||||
'heal_completion::tests::candidate_expiry_is_enforced_when_terminal_arrives_between_ticks|RED_GROUP_TERMINAL_EXPIRY|251'
|
||||
'heal_completion::tests::expired_candidate_is_unknown_even_if_terminal_was_seen_first|RED_GROUP_EXPIRED_ADMISSION|273'
|
||||
'heal_completion::tests::grouped_pending_status_counts_candidates_after_partial_expiry|RED_GROUP_STATUS_AFTER_EXPIRY|312'
|
||||
)
|
||||
control=heal_completion::tests::observation_id_keeps_grouped_owner_generations_separate
|
||||
printf '%s\n' "${tests[@]}" >"$LOG_DIR/selected-red.txt"
|
||||
printf '%s\n' "$control" >"$LOG_DIR/selected-control.txt"
|
||||
unique_names=$(printf '%s\n' "${tests[@]}" | cut -d'|' -f1 | sort -u | wc -l | tr -d '[:space:]')
|
||||
unique_markers=$(printf '%s\n' "${tests[@]}" | cut -d'|' -f2 | sort -u | wc -l | tr -d '[:space:]')
|
||||
[[ "${#tests[@]}" -eq 8 && "$unique_names" -eq 8 && "$unique_markers" -eq 8 ]]
|
||||
python3 - "$LOG_DIR/selected-red.txt" "$control" <<'PY'
|
||||
from pathlib import Path
|
||||
import re
|
||||
import sys
|
||||
|
||||
source = Path('crates/scanner/src/heal_completion/tests.rs').read_text()
|
||||
lines = source.splitlines()
|
||||
for item in Path(sys.argv[1]).read_text().splitlines():
|
||||
name, marker, line_text = item.split('|')
|
||||
symbol = name.rsplit('::', 1)[-1]
|
||||
declarations = list(re.finditer(rf'#\[test\]\s*fn\s+{re.escape(symbol)}\s*\(', source))
|
||||
assert len(declarations) == 1, name
|
||||
assert source.count(marker) == 1, marker
|
||||
line = int(line_text)
|
||||
start = source.count('\n', 0, declarations[0].start()) + 1
|
||||
following = re.search(r'#\[test\]\s*fn\s+', source[declarations[0].end():])
|
||||
end = source.count('\n', 0, declarations[0].end() + following.start()) + 1 if following else len(lines) + 1
|
||||
assert start < line < end, (name, line)
|
||||
assert lines[line - 1].lstrip().startswith(('assert!(', 'assert_eq!(')), (name, line)
|
||||
assert marker in '\n'.join(lines[line - 1:line + 4]), (name, marker, line)
|
||||
control = sys.argv[2].rsplit('::', 1)[-1]
|
||||
assert len(re.findall(rf'#\[test\]\s*fn\s+{re.escape(control)}\s*\(', source)) == 1, control
|
||||
PY
|
||||
validate_control() {
|
||||
local status="$1" log="$2" name="$3"
|
||||
if (( status != 0 )); then return "$status"; fi
|
||||
awk -v name="$name" '
|
||||
$0 == "running 1 test" { runs++ }
|
||||
index($0, "test " name " ...") == 1 {
|
||||
suffix = substr($0, length("test " name " ...") + 1)
|
||||
if (suffix == "" || suffix ~ /^[[:space:]]/) names++
|
||||
}
|
||||
/^test result: ok[.] 1 passed; 0 failed; 0 ignored; [0-9]+ measured; [0-9]+ filtered out; finished in / { passed++ }
|
||||
END {
|
||||
printf "Control markers: running=%d named=%d passed=%d\n", runs, names, passed
|
||||
if (runs != 1 || names != 1 || passed != 1) exit 1
|
||||
}
|
||||
' "$log"
|
||||
}
|
||||
if (-not $ready) {
|
||||
throw ("rustfs did not report ready on /health/ready (exit code: {0})" -f $server.ExitCode)
|
||||
validate_red() {
|
||||
local status="$1" log="$2" name="$3" marker="$4" expected_line="$5"
|
||||
(( status == 101 )) || return 1
|
||||
awk -v name="$name" -v marker="$marker" -v expected_line="$expected_line" '
|
||||
$0 == "running 1 test" { runs++ }
|
||||
index($0, "test " name " ...") == 1 {
|
||||
suffix = substr($0, length("test " name " ...") + 1)
|
||||
if (suffix == "" || suffix ~ /^[[:space:]]/) names++
|
||||
}
|
||||
/^test result: FAILED[.] 0 passed; 1 failed; 0 ignored; [0-9]+ measured; [0-9]+ filtered out; finished in / { failed++ }
|
||||
/^thread .* panicked at / {
|
||||
panics++
|
||||
expected_thread = "thread \047" name "\047"
|
||||
expected_location = "crates/scanner/src/heal_completion/tests.rs:" expected_line ":"
|
||||
tail = substr($0, length(expected_thread) + 1)
|
||||
split_at = index(tail, " panicked at ")
|
||||
thread_id = substr(tail, 1, split_at - 1)
|
||||
location = substr(tail, split_at + length(" panicked at "))
|
||||
column = substr(location, length(expected_location) + 1)
|
||||
target = index($0, expected_thread) == 1 && split_at > 0 && (thread_id == "" || thread_id ~ /^ [(][0-9]+[)]$/) && index(location, expected_location) == 1 && column ~ /^[0-9]+:$/
|
||||
if (target) target_panics++
|
||||
}
|
||||
/RED_GROUP_/ {
|
||||
rest = $0
|
||||
while (match(rest, /RED_GROUP_[A-Z_]+/)) {
|
||||
word = substr(rest, RSTART, RLENGTH)
|
||||
markers++
|
||||
if (target && word == marker) target_markers++
|
||||
rest = substr(rest, RSTART + RLENGTH)
|
||||
}
|
||||
}
|
||||
END {
|
||||
printf "Red markers: running=%d named=%d failed=%d panics=%d target=%d markers=%d matched=%d\n", runs, names, failed, panics, target_panics, markers, target_markers
|
||||
if (runs != 1 || names != 1 || failed != 1 || panics != 1 || target_panics != 1 || markers != 1 || target_markers != 1) exit 1
|
||||
}
|
||||
' "$log"
|
||||
}
|
||||
check_disk() {
|
||||
local available
|
||||
df -h . | tee -a "$LOG_DIR/disk.log"
|
||||
available=$(df -Pk . | awk 'NR == 2 {print $4}')
|
||||
[[ "$available" =~ ^[0-9]+$ ]]
|
||||
if (( available < 4194304 )); then
|
||||
echo 'not_started: insufficient disk' | tee -a "$LOG_DIR/disk.log"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
run_one() {
|
||||
local name="$1" short status
|
||||
short="${name##*::}"
|
||||
check_disk
|
||||
set +e
|
||||
cargo test --locked -p rustfs-scanner --lib -- "$name" --exact --test-threads=1 >"$LOG_DIR/$short.log" 2>&1
|
||||
status=$?
|
||||
set -e
|
||||
printf '%s\n' "$status" >"$LOG_DIR/$short.exit"
|
||||
cat "$LOG_DIR/$short.log"
|
||||
}
|
||||
run_one "$control"
|
||||
control_short="${control##*::}"
|
||||
control_status=$(cat "$LOG_DIR/$control_short.exit")
|
||||
validate_control "$control_status" "$LOG_DIR/$control_short.log" "$control" | tee "$LOG_DIR/$control_short.validation"
|
||||
matched=0
|
||||
mismatched=0
|
||||
for item in "${tests[@]}"; do
|
||||
IFS='|' read -r name marker line <<< "$item"
|
||||
short="${name##*::}"
|
||||
run_one "$name"
|
||||
status=$(cat "$LOG_DIR/$short.exit")
|
||||
if validate_red "$status" "$LOG_DIR/$short.log" "$name" "$marker" "$line" >"$LOG_DIR/$short.validation"; then
|
||||
matched=$((matched + 1))
|
||||
else
|
||||
mismatched=$((mismatched + 1))
|
||||
if ! grep -Fxq 'running 1 test' "$LOG_DIR/$short.log"; then
|
||||
echo "Stopping: test execution did not start for $name" >&2
|
||||
cat "$LOG_DIR/$short.validation"
|
||||
break
|
||||
fi
|
||||
fi
|
||||
cat "$LOG_DIR/$short.validation"
|
||||
done
|
||||
printf 'expected_red=8 matched=%s mismatched=%s\n' "$matched" "$mismatched"
|
||||
[[ "$matched" -eq 8 && "$mismatched" -eq 0 ]]
|
||||
|
||||
- name: Upload raw logs, status codes and selection
|
||||
if: ${{ always() }}
|
||||
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
|
||||
with:
|
||||
name: scanner-group-red-${{ github.run_id }}
|
||||
path: ${{ runner.temp }}/scanner-group-red/
|
||||
retention-days: 7
|
||||
if-no-files-found: warn
|
||||
|
||||
Generated
+1
@@ -9858,6 +9858,7 @@ version = "1.0.2"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror 2.0.21",
|
||||
"tokio",
|
||||
"uuid",
|
||||
]
|
||||
|
||||
@@ -26,7 +26,7 @@ rustfs-io-core = { workspace = true }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
|
||||
# Async runtime
|
||||
tokio = { workspace = true, features = ["sync", "fs", "rt-multi-thread", "time"] }
|
||||
tokio = { workspace = true, features = ["sync", "fs", "rt-multi-thread"] }
|
||||
|
||||
# Logging
|
||||
tracing = { workspace = true }
|
||||
|
||||
@@ -100,7 +100,6 @@ when restoring `/rustfs/console` for a custom OEM build.
|
||||
## S3 API environment variables
|
||||
|
||||
- `RUSTFS_API_OBJECT_MAX_VERSIONS` caps the number of retained versions for a single object. It defaults to `9223372036854775807`, matching MinIO's practical-unlimited default. Set a positive integer to enforce a lower per-object metadata bound.
|
||||
- `RUSTFS_VEEAM_SOSAPI_ENABLE` serves Veeam SOSAPI `system.xml` and `capacity.xml` for an authenticated GET or HEAD of those exact bucket-root keys. It defaults to `true`. Explicit version reads use the normal object path. Capacity requests return `ServiceUnavailable` until the scanner publishes a complete snapshot certified for the current bucket incarnation and authoritative quota metadata can be read. Legacy or mixed-version snapshots without an incarnation proof cannot serve capacity until a compatible scanner publishes a certified snapshot. Capacity also returns `ServiceUnavailable` when cluster or disk observations are missing, stale, or degraded. Retry after scanner convergence and storage or metadata recovery. Capacity assumes shard paths have independent backing space; shared physical storage can make the estimate optimistic. Set the flag to `false` to restore the normal object path, including deletion of a real object previously stored at that key.
|
||||
- `MINIO_API_OBJECT_MAX_VERSIONS` is accepted as a compatibility alias when the canonical RustFS variable is not set.
|
||||
|
||||
## Distributed endpoint locality
|
||||
|
||||
@@ -222,16 +222,6 @@ pub const ENV_RUSTFS_TLS_PATH: &str = "RUSTFS_TLS_PATH";
|
||||
/// Environment variable for server KMS enable.
|
||||
pub const ENV_RUSTFS_KMS_ENABLE: &str = "RUSTFS_KMS_ENABLE";
|
||||
|
||||
/// Environment variable for Veeam SOSAPI virtual system objects.
|
||||
///
|
||||
/// When true (the default), authenticated GET and HEAD of the two Veeam
|
||||
/// SOSAPI keys return generated XML. When false, those keys use the normal
|
||||
/// object path so an operator can remove a real object stored there earlier.
|
||||
pub const ENV_VEEAM_SOSAPI_ENABLE: &str = "RUSTFS_VEEAM_SOSAPI_ENABLE";
|
||||
|
||||
/// Default Veeam SOSAPI enablement.
|
||||
pub const DEFAULT_VEEAM_SOSAPI_ENABLE: bool = true;
|
||||
|
||||
/// Default KMS enable for server-side encryption
|
||||
/// This is the default value for enabling KMS encryption for server-side encryption.
|
||||
/// Default value: false
|
||||
|
||||
@@ -466,9 +466,6 @@ pub struct BucketTargetUsageInfo {
|
||||
#[derive(Debug, Default, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
pub struct BucketUsageInfo {
|
||||
pub size: u64,
|
||||
/// Bucket identity certified by every set contributing to this snapshot.
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub bucket_incarnation: Option<String>,
|
||||
// Following five fields suffixed with V1 are here for backward compatibility
|
||||
// Total Size for objects that have not yet been replicated
|
||||
pub replication_pending_size_v1: u64,
|
||||
@@ -2319,9 +2316,6 @@ impl BucketUsageInfo {
|
||||
/// Add size summary to this bucket usage
|
||||
/// Merge another BucketUsageInfo into this one
|
||||
pub fn merge(&mut self, other: &BucketUsageInfo) {
|
||||
if self.bucket_incarnation != other.bucket_incarnation {
|
||||
self.bucket_incarnation = None;
|
||||
}
|
||||
self.size += other.size;
|
||||
self.objects_count += other.objects_count;
|
||||
self.versions_count += other.versions_count;
|
||||
@@ -3305,31 +3299,6 @@ mod tests {
|
||||
assert_eq!(usage1.versions_count, 15);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn bucket_usage_merge_discards_incompatible_incarnation_proofs() {
|
||||
let id = "00000000-0000-4000-8000-000000000001";
|
||||
let mut same = BucketUsageInfo {
|
||||
bucket_incarnation: Some(id.into()),
|
||||
..Default::default()
|
||||
};
|
||||
same.merge(&BucketUsageInfo {
|
||||
bucket_incarnation: Some(id.into()),
|
||||
..Default::default()
|
||||
});
|
||||
assert_eq!(same.bucket_incarnation.as_deref(), Some(id));
|
||||
same.merge(&BucketUsageInfo::default());
|
||||
assert!(same.bucket_incarnation.is_none());
|
||||
let mut different = BucketUsageInfo {
|
||||
bucket_incarnation: Some(id.into()),
|
||||
..Default::default()
|
||||
};
|
||||
different.merge(&BucketUsageInfo {
|
||||
bucket_incarnation: Some("00000000-0000-4000-8000-000000000002".into()),
|
||||
..Default::default()
|
||||
});
|
||||
assert!(different.bucket_incarnation.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn size_summary_add_saturates_instead_of_overflowing() {
|
||||
// The scanner folds one summary per object into a per-prefix total, so a
|
||||
|
||||
@@ -38,8 +38,6 @@ mod tests {
|
||||
use tracing::info;
|
||||
|
||||
const PAGINATION_TIMEOUT: Duration = Duration::from_secs(120);
|
||||
// Bound queued durable commits on the single fixture disk under CI I/O pressure.
|
||||
const FIXTURE_PUT_CONCURRENCY: usize = 4;
|
||||
|
||||
// Fixture population can require thousands of durable PUTs. Bound the
|
||||
// listing traversal itself with one deadline shared by every page.
|
||||
@@ -566,7 +564,7 @@ mod tests {
|
||||
let object_count = 1002;
|
||||
// Finish every durable PUT before listing, with the same bounded fanout as the delimiter fixtures.
|
||||
stream::iter(0..object_count)
|
||||
.for_each_concurrent(FIXTURE_PUT_CONCURRENCY, |i| {
|
||||
.for_each_concurrent(16, |i| {
|
||||
let client = &client;
|
||||
async move {
|
||||
let key = format!("object{i:04}.txt");
|
||||
@@ -577,7 +575,7 @@ mod tests {
|
||||
.body(ByteStream::from_static(b"test content"))
|
||||
.send()
|
||||
.await
|
||||
.unwrap_or_else(|err| panic!("Failed to put fixture object {key}: {err:?}"));
|
||||
.unwrap_or_else(|err| panic!("Failed to put fixture object {key}: {err}"));
|
||||
}
|
||||
})
|
||||
.await;
|
||||
@@ -824,7 +822,7 @@ mod tests {
|
||||
.flat_map(|dir| (0..10).map(move |file| format!("dir-{dir:03}/file{file:02}.txt")))
|
||||
.collect();
|
||||
stream::iter(&all_keys)
|
||||
.for_each_concurrent(FIXTURE_PUT_CONCURRENCY, |key| {
|
||||
.for_each_concurrent(16, |key| {
|
||||
let client = &client;
|
||||
async move {
|
||||
client
|
||||
@@ -834,7 +832,7 @@ mod tests {
|
||||
.body(ByteStream::from_static(b"x"))
|
||||
.send()
|
||||
.await
|
||||
.unwrap_or_else(|err| panic!("Failed to put fixture object {key}: {err:?}"));
|
||||
.unwrap_or_else(|err| panic!("Failed to put fixture object {key}: {err}"));
|
||||
}
|
||||
})
|
||||
.await;
|
||||
@@ -1057,7 +1055,7 @@ mod tests {
|
||||
let files_per_dir = 100;
|
||||
let fixture_started = std::time::Instant::now();
|
||||
stream::iter((0..dir_count).flat_map(|d| (0..files_per_dir).map(move |f| (d, f))))
|
||||
.for_each_concurrent(FIXTURE_PUT_CONCURRENCY, |(d, f)| {
|
||||
.for_each_concurrent(16, |(d, f)| {
|
||||
let client = &client;
|
||||
async move {
|
||||
let key = format!("dir-{d:02}/file{f:03}.txt");
|
||||
@@ -1068,7 +1066,7 @@ mod tests {
|
||||
.body(ByteStream::from_static(b"x"))
|
||||
.send()
|
||||
.await
|
||||
.unwrap_or_else(|err| panic!("Failed to put fixture object {key}: {err:?}"));
|
||||
.unwrap_or_else(|err| panic!("Failed to put fixture object {key}: {err}"));
|
||||
}
|
||||
})
|
||||
.await;
|
||||
|
||||
@@ -261,61 +261,6 @@ mod tests {
|
||||
archive
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn snowball_auto_extract_rejects_veeam_virtual_members() -> Result<(), Box<dyn Error + Send + Sync>> {
|
||||
init_logging();
|
||||
let mut env = RustFSTestEnvironment::new().await?;
|
||||
env.start_rustfs_server_with_env(vec![], &[("RUSTFS_VEEAM_SOSAPI_ENABLE", "true")])
|
||||
.await?;
|
||||
let client = env.create_s3_client();
|
||||
let bucket = "snowball-veeam-reserved";
|
||||
client.create_bucket().bucket(bucket).send().await?;
|
||||
let prefix = ".system-d26a9498-cb7c-4a87-a44a-8ae204f5ba6c";
|
||||
for (member, destination, use_prefix) in [
|
||||
(format!("{prefix}/system.xml"), format!("{prefix}/system.xml"), false),
|
||||
("capacity.xml".to_string(), format!("{prefix}/capacity.xml"), true),
|
||||
] {
|
||||
let mut builder = tokio_tar::Builder::new(Cursor::new(Vec::new()));
|
||||
append_typed_entry(&mut builder, &member, tokio_tar::EntryType::Regular, b"blocked").await?;
|
||||
let archive = builder.into_inner().await?.into_inner();
|
||||
let mut request = client
|
||||
.put_object()
|
||||
.bucket(bucket)
|
||||
.key("fixture.tar")
|
||||
.metadata("Snowball-Auto-Extract", "true")
|
||||
.body(ByteStream::from(archive));
|
||||
if use_prefix {
|
||||
request = request
|
||||
.metadata("Minio-Snowball-Prefix", prefix)
|
||||
.metadata("Minio-Snowball-Ignore-Errors", "true");
|
||||
}
|
||||
let error = request.send().await.expect_err("virtual archive members must be rejected");
|
||||
assert_eq!(error.code(), Some("MethodNotAllowed"));
|
||||
let listed = client.list_objects_v2().bucket(bucket).prefix(&destination).send().await?;
|
||||
assert!(listed.contents().is_empty(), "rejected virtual member must not be stored");
|
||||
}
|
||||
let mut builder = tokio_tar::Builder::new(Cursor::new(Vec::new()));
|
||||
append_typed_entry(&mut builder, "ordinary.xml", tokio_tar::EntryType::Regular, b"ordinary").await?;
|
||||
client
|
||||
.put_object()
|
||||
.bucket(bucket)
|
||||
.key("fixture.tar")
|
||||
.metadata("Snowball-Auto-Extract", "true")
|
||||
.metadata("Minio-Snowball-Prefix", prefix)
|
||||
.body(ByteStream::from(builder.into_inner().await?.into_inner()))
|
||||
.send()
|
||||
.await?;
|
||||
let ordinary = client
|
||||
.get_object()
|
||||
.bucket(bucket)
|
||||
.key(format!("{prefix}/ordinary.xml"))
|
||||
.send()
|
||||
.await?;
|
||||
assert_eq!(ordinary.body.collect().await?.into_bytes().as_ref(), b"ordinary");
|
||||
env.stop_server();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn snowball_auto_extract_supports_minio_prefix_and_directory_markers() -> Result<(), Box<dyn Error + Send + Sync>> {
|
||||
init_logging();
|
||||
|
||||
@@ -600,154 +600,6 @@ mod tests {
|
||||
info!("✅ PASSED: Veeam backup workflow simulation completed successfully");
|
||||
}
|
||||
|
||||
/// Veeam B&R discovers SOSAPI by GET/HEAD of two well-known keys.
|
||||
#[tokio::test]
|
||||
async fn test_veeam_sosapi_system_and_capacity() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
|
||||
use crate::common::local_http_client;
|
||||
|
||||
const SYSTEM_KEY: &str = ".system-d26a9498-cb7c-4a87-a44a-8ae204f5ba6c/system.xml";
|
||||
const CAPACITY_KEY: &str = ".system-d26a9498-cb7c-4a87-a44a-8ae204f5ba6c/capacity.xml";
|
||||
|
||||
init_logging();
|
||||
info!("🧪 TEST: Veeam SOSAPI system.xml and capacity.xml");
|
||||
|
||||
let mut env = RustFSTestEnvironment::new().await?;
|
||||
env.start_rustfs_server_with_env(vec![], crate::common::FAST_DATA_USAGE_SCANNER_ENV)
|
||||
.await?;
|
||||
let client = create_s3_client(&env);
|
||||
let bucket = "veeam-sosapi";
|
||||
create_bucket(&client, bucket).await?;
|
||||
|
||||
let system = client.get_object().bucket(bucket).key(SYSTEM_KEY).send().await?;
|
||||
let system_etag = system.e_tag().map(str::to_string);
|
||||
let system_len = system.content_length();
|
||||
assert_eq!(system.content_type(), Some("application/xml"));
|
||||
let system_body = system.body.collect().await?.into_bytes();
|
||||
let system_xml = std::str::from_utf8(&system_body)?;
|
||||
assert!(system_xml.contains("<ProtocolVersion>\"1.0\"</ProtocolVersion>"), "{system_xml}");
|
||||
assert!(
|
||||
system_xml.contains("<ModelName>\"RustFS ") && system_xml.contains("\"</ModelName>"),
|
||||
"{system_xml}"
|
||||
);
|
||||
assert!(system_xml.contains("<CapacityInfo>true</CapacityInfo>"));
|
||||
assert!(system_xml.contains("<UploadSessions>false</UploadSessions>"));
|
||||
assert!(system_xml.contains("<IAMSTS>false</IAMSTS>"));
|
||||
assert!(!system_xml.contains("SystemRecommendations"));
|
||||
assert!(!system_xml.contains("APIEndpoints"));
|
||||
assert!(!system_xml.contains("""));
|
||||
|
||||
let head = client.head_object().bucket(bucket).key(SYSTEM_KEY).send().await?;
|
||||
assert_eq!(head.content_type(), Some("application/xml"));
|
||||
assert_eq!(head.content_length(), system_len);
|
||||
assert_eq!(head.e_tag().map(str::to_string), system_etag);
|
||||
assert!(head.last_modified().is_some());
|
||||
|
||||
let ranged = client
|
||||
.get_object()
|
||||
.bucket(bucket)
|
||||
.key(SYSTEM_KEY)
|
||||
.range("bytes=0-3")
|
||||
.send()
|
||||
.await?;
|
||||
assert_eq!(ranged.content_length(), Some(4));
|
||||
let ranged_header = ranged.content_range().unwrap_or("");
|
||||
assert!(ranged_header.starts_with("bytes 0-3/"), "{ranged_header}");
|
||||
let ranged_body = ranged.body.collect().await?.into_bytes();
|
||||
assert_eq!(&ranged_body[..], &system_body[..4]);
|
||||
|
||||
let capacity = tokio::time::timeout(std::time::Duration::from_secs(180), async {
|
||||
loop {
|
||||
match client.get_object().bucket(bucket).key(CAPACITY_KEY).send().await {
|
||||
Ok(capacity) => break Ok(capacity),
|
||||
Err(err) if err.code() == Some("ServiceUnavailable") => {
|
||||
tokio::time::sleep(std::time::Duration::from_secs(2)).await;
|
||||
}
|
||||
Err(err) => break Err(err),
|
||||
}
|
||||
}
|
||||
})
|
||||
.await??;
|
||||
assert_eq!(capacity.content_type(), Some("application/xml"));
|
||||
let capacity_body = capacity.body.collect().await?.into_bytes();
|
||||
let capacity_xml = std::str::from_utf8(&capacity_body)?;
|
||||
let capacity_value = xml_u64(capacity_xml, "Capacity")?;
|
||||
let available_value = xml_u64(capacity_xml, "Available")?;
|
||||
let used_value = xml_u64(capacity_xml, "Used")?;
|
||||
assert!(used_value <= capacity_value, "{capacity_xml}");
|
||||
assert!(available_value <= capacity_value.saturating_sub(used_value), "{capacity_xml}");
|
||||
|
||||
let put_err = client
|
||||
.put_object()
|
||||
.bucket(bucket)
|
||||
.key(SYSTEM_KEY)
|
||||
.body(ByteStream::from_static(b"overwrite"))
|
||||
.send()
|
||||
.await
|
||||
.expect_err("SOSAPI put must fail");
|
||||
assert_eq!(put_err.code(), Some("MethodNotAllowed"));
|
||||
let delete_err = client
|
||||
.delete_object()
|
||||
.bucket(bucket)
|
||||
.key(CAPACITY_KEY)
|
||||
.send()
|
||||
.await
|
||||
.expect_err("SOSAPI delete must fail");
|
||||
assert_eq!(delete_err.code(), Some("MethodNotAllowed"));
|
||||
|
||||
let normal_key = "Veeam/Backup/job.dat";
|
||||
client
|
||||
.put_object()
|
||||
.bucket(bucket)
|
||||
.key(normal_key)
|
||||
.body(ByteStream::from_static(b"backup-bytes"))
|
||||
.send()
|
||||
.await?;
|
||||
let normal = client.get_object().bucket(bucket).key(normal_key).send().await?;
|
||||
let normal_body = normal.body.collect().await?.into_bytes();
|
||||
assert_eq!(&normal_body[..], b"backup-bytes");
|
||||
|
||||
let anon = local_http_client()
|
||||
.get(format!("{}/{bucket}/{SYSTEM_KEY}", env.url))
|
||||
.send()
|
||||
.await?;
|
||||
assert_eq!(anon.status(), reqwest::StatusCode::FORBIDDEN);
|
||||
let anon_body = anon.text().await?;
|
||||
assert!(!anon_body.contains("ProtocolVersion"), "{anon_body}");
|
||||
|
||||
let now = time::OffsetDateTime::now_utc();
|
||||
let scope_date = format!("{:04}{:02}{:02}", now.year(), u8::from(now.month()), now.day());
|
||||
let amz_date = format!("{scope_date}T{:02}{:02}{:02}Z", now.hour(), now.minute(), now.second());
|
||||
let bad = local_http_client()
|
||||
.get(format!("{}/{bucket}/{SYSTEM_KEY}", env.url))
|
||||
.header("x-amz-date", &amz_date)
|
||||
.header("x-amz-content-sha256", "UNSIGNED-PAYLOAD")
|
||||
.header(
|
||||
"authorization",
|
||||
format!(
|
||||
"AWS4-HMAC-SHA256 Credential=bad/{scope_date}/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=0000000000000000000000000000000000000000000000000000000000000000"
|
||||
),
|
||||
)
|
||||
.send()
|
||||
.await?;
|
||||
assert_eq!(bad.status(), reqwest::StatusCode::FORBIDDEN);
|
||||
let bad_body = bad.text().await?;
|
||||
assert!(!bad_body.contains("ProtocolVersion"), "{bad_body}");
|
||||
|
||||
info!("✅ PASSED: Veeam SOSAPI system.xml and capacity.xml");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn xml_u64(xml: &str, element: &str) -> Result<u64, Box<dyn std::error::Error + Send + Sync>> {
|
||||
let start = format!("<{element}>");
|
||||
let end = format!("</{element}>");
|
||||
let start_idx = xml.find(&start).ok_or_else(|| format!("missing {element} in {xml}"))? + start.len();
|
||||
let end_idx = xml[start_idx..]
|
||||
.find(&end)
|
||||
.ok_or_else(|| format!("unclosed {element} in {xml}"))?
|
||||
+ start_idx;
|
||||
Ok(xml[start_idx..end_idx].parse()?)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_terraform_put_after_delete() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
|
||||
init_logging();
|
||||
|
||||
@@ -252,7 +252,7 @@ pub mod bucket {
|
||||
pub mod quota {
|
||||
pub use crate::bucket::quota::{
|
||||
BucketQuota, QUOTA_RESERVATION_PROTOCOL_V1, QUOTA_RESERVATION_PROTOCOL_V2, QuotaCheckResult, QuotaError,
|
||||
QuotaMigrationSkipReason, QuotaOperation, QuotaProtocolMigration, QuotaType,
|
||||
QuotaMigrationSkipReason, QuotaOperation, QuotaProtocolMigration,
|
||||
};
|
||||
|
||||
pub mod checker {
|
||||
@@ -371,15 +371,6 @@ pub mod compression {
|
||||
|
||||
pub mod config {
|
||||
pub mod com {
|
||||
/// Preserve empty existing objects so callers can distinguish corruption from absence.
|
||||
pub async fn read_config_preserve_empty_with_metadata_opts(
|
||||
api: std::sync::Arc<crate::store::ECStore>,
|
||||
file: &str,
|
||||
opts: &crate::object_api::ObjectOptions,
|
||||
) -> crate::error::Result<(Vec<u8>, crate::object_api::ObjectInfo)> {
|
||||
crate::config::com::read_config_preserve_empty_with_metadata_opts(api, file, opts).await
|
||||
}
|
||||
|
||||
pub use crate::config::com::{
|
||||
COMMA_SEPARATED_LISTS, CONFIG_PREFIX, ENV_CONFIG_RECOVER_ON_CORRUPTION, STORAGE_CLASS_SUB_SYS,
|
||||
ServerConfigCorruptError, ServerConfigSaveResult, ServerConfigSnapshot, delete_config, delete_config_no_lock,
|
||||
@@ -425,10 +416,9 @@ pub mod data_usage {
|
||||
DATA_USAGE_CACHE_NAME, apply_bucket_usage_memory_overlay, compute_bucket_usage,
|
||||
init_compression_total_memory_from_backend, invalidate_admin_data_usage_snapshot_cache,
|
||||
invalidate_data_usage_snapshot_cache, live_bucket_usage_computations, load_admin_data_usage_from_backend_cached,
|
||||
load_bucket_usage_from_backend_cached, load_compression_total_from_memory, load_data_usage_from_backend,
|
||||
load_data_usage_from_backend_cached, quota_object_size, record_bucket_delete_marker_memory,
|
||||
record_bucket_object_delete_memory, record_bucket_object_version_write_memory, record_bucket_object_write_memory,
|
||||
record_bucket_object_write_unknown_previous_memory, record_compression_total_memory,
|
||||
load_compression_total_from_memory, load_data_usage_from_backend, load_data_usage_from_backend_cached, quota_object_size,
|
||||
record_bucket_delete_marker_memory, record_bucket_object_delete_memory, record_bucket_object_version_write_memory,
|
||||
record_bucket_object_write_memory, record_bucket_object_write_unknown_previous_memory, record_compression_total_memory,
|
||||
refresh_bucket_usage_from_object_layer, refresh_versioned_bucket_usage_from_object_layer,
|
||||
remove_bucket_usage_from_backend, replace_bucket_usage_memory_from_info, store_compression_total_in_backend,
|
||||
store_data_usage_in_backend,
|
||||
|
||||
@@ -1086,9 +1086,8 @@ impl ExpiryState {
|
||||
}))
|
||||
}
|
||||
|
||||
#[cfg(any(test, feature = "test-util"))]
|
||||
#[doc(hidden)]
|
||||
pub fn new_with_unconsumed_worker_channel(capacity: usize) -> Arc<RwLock<Self>> {
|
||||
#[cfg(test)]
|
||||
fn new_with_unconsumed_worker_channel(capacity: usize) -> Arc<RwLock<Self>> {
|
||||
let (tx, rx) = mpsc::channel(capacity);
|
||||
Arc::new(RwLock::new(Self {
|
||||
tasks_tx: vec![tx],
|
||||
@@ -3517,21 +3516,13 @@ async fn stale_upload_current_size_with_opts(
|
||||
.await
|
||||
.ok()?;
|
||||
|
||||
stale_upload_size_from_parts(&parts)
|
||||
}
|
||||
|
||||
fn stale_upload_size_from_parts(parts: &crate::storage_api_contracts::multipart::ListPartsInfo) -> Option<usize> {
|
||||
if parts.is_truncated {
|
||||
return None;
|
||||
}
|
||||
parts.parts.iter().try_fold(0usize, |total, part| {
|
||||
// ListParts represents a quorum-confirmed missing part with an empty ETag.
|
||||
if part.etag.as_deref().is_none_or(str::is_empty) {
|
||||
return None;
|
||||
}
|
||||
let actual_size = usize::try_from(part.actual_size.max(0)).ok()?;
|
||||
total.checked_add(part.size.max(actual_size))
|
||||
})
|
||||
Some(
|
||||
parts
|
||||
.parts
|
||||
.iter()
|
||||
.map(|part| part.actual_size.max(part.size as i64).max(0) as usize)
|
||||
.sum(),
|
||||
)
|
||||
}
|
||||
|
||||
async fn stale_upload_lifecycle_due(
|
||||
@@ -3548,43 +3539,18 @@ async fn stale_upload_lifecycle_due(
|
||||
let bucket = metadata.get(RUSTFS_MULTIPART_BUCKET_KEY)?;
|
||||
let object = metadata.get(RUSTFS_MULTIPART_OBJECT_KEY)?;
|
||||
|
||||
let mut lifecycle = match metadata_boundary::get_lifecycle_config(bucket).await {
|
||||
let lifecycle = match metadata_boundary::get_lifecycle_config(bucket).await {
|
||||
Ok((lifecycle, _)) => lifecycle,
|
||||
Err(_) => return None,
|
||||
};
|
||||
|
||||
let has_size_filter = |filter: &s3s::dto::LifecycleRuleFilter| {
|
||||
filter.object_size_greater_than.is_some()
|
||||
|| filter.object_size_less_than.is_some()
|
||||
|| filter
|
||||
.and
|
||||
.as_ref()
|
||||
.is_some_and(|and| and.object_size_greater_than.is_some() || and.object_size_less_than.is_some())
|
||||
};
|
||||
let needs_size = lifecycle
|
||||
.rules
|
||||
.iter()
|
||||
.any(|rule| rule.abort_incomplete_multipart_upload.is_some() && rule.filter.as_ref().is_some_and(has_size_filter));
|
||||
let size = if needs_size {
|
||||
match stale_upload_current_size_with_opts(set, metadata, upload_dir, no_lock).await {
|
||||
Some(size) => size,
|
||||
None => {
|
||||
// An unknown size cannot authorize a size-filtered abort.
|
||||
// Unrelated rules can still be evaluated independently.
|
||||
lifecycle
|
||||
.rules
|
||||
.retain(|rule| !rule.filter.as_ref().is_some_and(has_size_filter));
|
||||
0
|
||||
}
|
||||
}
|
||||
} else {
|
||||
0
|
||||
};
|
||||
let object_opts = ObjectOpts {
|
||||
name: object.clone(),
|
||||
user_tags: metadata.get(AMZ_OBJECT_TAGGING).cloned().unwrap_or_default(),
|
||||
mod_time: Some(initiated),
|
||||
size,
|
||||
size: stale_upload_current_size_with_opts(set, metadata, upload_dir, no_lock)
|
||||
.await
|
||||
.unwrap_or_default(),
|
||||
is_latest: true,
|
||||
delete_marker: false,
|
||||
user_defined: metadata.clone(),
|
||||
@@ -3837,8 +3803,7 @@ async fn cleanup_stale_multipart_uploads_in_set(set: &Arc<SetDisks>, now: Offset
|
||||
for candidate in candidates.into_values() {
|
||||
let upload_dir = candidate.path.rsplit('/').next().unwrap_or_default().to_string();
|
||||
let mut due = stale_upload_default_due(candidate.initiated, default_expiry);
|
||||
if now < due
|
||||
&& let Some(metadata) = candidate.metadata.as_ref()
|
||||
if let Some(metadata) = candidate.metadata.as_ref()
|
||||
&& let Some(lifecycle_due) = stale_upload_lifecycle_due(set, metadata, candidate.initiated, &upload_dir, false).await
|
||||
&& lifecycle_due < due
|
||||
{
|
||||
@@ -3867,9 +3832,8 @@ async fn cleanup_stale_multipart_uploads_in_set(set: &Arc<SetDisks>, now: Offset
|
||||
let current_metadata = cleanup_guard.file_info().metadata.clone();
|
||||
let current_initiated = initiated_from_upload_dir(&upload_dir, cleanup_guard.file_info().mod_time);
|
||||
let mut current_due = stale_upload_default_due(current_initiated, default_expiry);
|
||||
if now < current_due
|
||||
&& let Some(lifecycle_due) =
|
||||
stale_upload_lifecycle_due(set, ¤t_metadata, current_initiated, &upload_dir, true).await
|
||||
if let Some(lifecycle_due) =
|
||||
stale_upload_lifecycle_due(set, ¤t_metadata, current_initiated, &upload_dir, true).await
|
||||
&& lifecycle_due < current_due
|
||||
{
|
||||
current_due = lifecycle_due;
|
||||
@@ -15904,261 +15868,6 @@ mod tests {
|
||||
assert!(ecstore.is_ok(), "fresh local ECStore boot should succeed, got {ecstore:?}");
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "current_thread")]
|
||||
#[serial]
|
||||
async fn stale_multipart_cleanup_preserves_partial_metadata_without_upload_part_warning() {
|
||||
use tracing::instrument::WithSubscriber as _;
|
||||
#[derive(Clone, Default)]
|
||||
struct CapturedLogs(Arc<StdMutex<Vec<u8>>>);
|
||||
struct LogWriter(Arc<StdMutex<Vec<u8>>>);
|
||||
impl std::io::Write for LogWriter {
|
||||
fn write(&mut self, bytes: &[u8]) -> std::io::Result<usize> {
|
||||
self.0.lock().unwrap().extend_from_slice(bytes);
|
||||
Ok(bytes.len())
|
||||
}
|
||||
fn flush(&mut self) -> std::io::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
impl<'a> tracing_subscriber::fmt::MakeWriter<'a> for CapturedLogs {
|
||||
type Writer = LogWriter;
|
||||
fn make_writer(&'a self) -> Self::Writer {
|
||||
LogWriter(self.0.clone())
|
||||
}
|
||||
}
|
||||
|
||||
let (paths, ecstore) = setup_test_env().await;
|
||||
let bucket = format!("stale-partial-{}", Uuid::new_v4().simple());
|
||||
create_test_bucket(&ecstore, &bucket).await;
|
||||
for copies in [1, 2] {
|
||||
let object = format!("partial-{copies}.bin");
|
||||
let initiated = OffsetDateTime::now_utc() - time::Duration::hours(30);
|
||||
let upload = ecstore
|
||||
.new_multipart_upload(
|
||||
&bucket,
|
||||
&object,
|
||||
&ObjectOptions {
|
||||
mod_time: Some(initiated),
|
||||
max_parity: true,
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.await
|
||||
.expect("multipart upload should be created");
|
||||
let decoded = base64_simd::URL_SAFE_NO_PAD
|
||||
.decode_to_vec(upload.upload_id.as_bytes())
|
||||
.unwrap();
|
||||
let decoded = String::from_utf8(decoded).unwrap();
|
||||
let (_, upload_dir) = decoded.split_once('.').expect("deployment-prefixed upload id");
|
||||
let upload_path = format!("{}/{upload_dir}", multipart_sha_dir(&bucket, &object));
|
||||
let physical_paths: Vec<_> = paths
|
||||
.iter()
|
||||
.map(|path| path.join(RUSTFS_META_MULTIPART_BUCKET).join(&upload_path))
|
||||
.collect();
|
||||
let original: Vec<_> = physical_paths
|
||||
.iter()
|
||||
.take(copies)
|
||||
.map(|path| std::fs::read(path.join(STORAGE_FORMAT_FILE)).unwrap())
|
||||
.collect();
|
||||
let info = super::get_file_info(
|
||||
&original[0],
|
||||
RUSTFS_META_MULTIPART_BUCKET,
|
||||
&upload_path,
|
||||
"",
|
||||
super::FileInfoOpts {
|
||||
data: false,
|
||||
include_free_versions: false,
|
||||
include_part_checksums: false,
|
||||
},
|
||||
)
|
||||
.unwrap();
|
||||
assert_eq!((info.erasure.data_blocks, info.erasure.parity_blocks), (2, 2));
|
||||
for path in physical_paths.iter().skip(copies) {
|
||||
fs::remove_dir_all(path).await.expect("remove selected metadata copies");
|
||||
}
|
||||
if copies == 2 {
|
||||
ecstore
|
||||
.get_multipart_info(&bucket, &object, &upload.upload_id, &ObjectOptions::default())
|
||||
.await
|
||||
.expect("two metadata copies must meet read quorum");
|
||||
}
|
||||
|
||||
let logs = CapturedLogs::default();
|
||||
let subscriber = tracing_subscriber::fmt()
|
||||
.with_max_level(tracing::Level::DEBUG)
|
||||
.with_writer(logs.clone())
|
||||
.with_ansi(false)
|
||||
.without_time()
|
||||
.finish();
|
||||
cleanup_stale_multipart_uploads_once_at(
|
||||
ecstore.clone(),
|
||||
OffsetDateTime::now_utc(),
|
||||
StdDuration::from_secs(24 * 60 * 60),
|
||||
)
|
||||
.with_subscriber(subscriber)
|
||||
.await;
|
||||
|
||||
for (path, expected) in physical_paths.iter().zip(&original) {
|
||||
assert_eq!(fs::read(path.join(STORAGE_FORMAT_FILE)).await.unwrap(), *expected);
|
||||
}
|
||||
let log_output = String::from_utf8(logs.0.lock().unwrap().clone()).unwrap();
|
||||
assert!(
|
||||
log_output.contains(&upload_path),
|
||||
"missing background diagnostic for {upload_path}: {log_output}"
|
||||
);
|
||||
assert!(log_output.contains("multipart_cleanup_lock_or_recheck_failed"), "{log_output}");
|
||||
assert!(!log_output.contains("op=\"upload_part\""), "unexpected upload-part warning: {log_output}");
|
||||
for path in physical_paths.iter().take(copies) {
|
||||
fs::remove_dir_all(path).await.unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "current_thread")]
|
||||
#[serial]
|
||||
async fn stale_multipart_cleanup_lists_parts_only_when_size_is_needed() {
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
use tracing::instrument::WithSubscriber as _;
|
||||
use tracing_subscriber::prelude::*;
|
||||
|
||||
struct PartListCounter(Arc<AtomicUsize>);
|
||||
impl<S: tracing::Subscriber> tracing_subscriber::Layer<S> for PartListCounter {
|
||||
fn on_new_span(
|
||||
&self,
|
||||
attrs: &tracing::span::Attributes<'_>,
|
||||
_id: &tracing::span::Id,
|
||||
_ctx: tracing_subscriber::layer::Context<'_, S>,
|
||||
) {
|
||||
if attrs.metadata().name() == "list_object_parts" {
|
||||
self.0.fetch_add(1, Ordering::Relaxed);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let (_, ecstore) = setup_test_env().await;
|
||||
let bucket = format!("stale-list-parts-{}", Uuid::new_v4().simple());
|
||||
create_test_bucket(&ecstore, &bucket).await;
|
||||
set_abort_incomplete_lifecycle(&bucket, "logs/", 0).await;
|
||||
let now = OffsetDateTime::now_utc();
|
||||
for (object, age, size_filter, should_list) in [
|
||||
("logs/default-expired", time::Duration::hours(30), false, false),
|
||||
("logs/lifecycle-only", time::Duration::minutes(5), false, false),
|
||||
("logs/size-filter", time::Duration::minutes(5), true, true),
|
||||
] {
|
||||
if size_filter {
|
||||
set_abort_incomplete_lifecycle_with_size(&bucket, "logs/", 0, 0).await;
|
||||
}
|
||||
let upload = ecstore
|
||||
.new_multipart_upload(
|
||||
&bucket,
|
||||
object,
|
||||
&ObjectOptions {
|
||||
mod_time: Some(now - age),
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.await
|
||||
.expect("create multipart upload");
|
||||
if size_filter {
|
||||
let mut data = PutObjReader::from_vec(vec![1, 2, 3, 4]);
|
||||
ecstore
|
||||
.put_object_part(&bucket, object, &upload.upload_id, 1, &mut data, &ObjectOptions::default())
|
||||
.await
|
||||
.expect("upload a part for size filtering");
|
||||
}
|
||||
let calls = Arc::new(AtomicUsize::new(0));
|
||||
let subscriber = tracing_subscriber::registry().with(PartListCounter(Arc::clone(&calls)));
|
||||
cleanup_stale_multipart_uploads_once_at(ecstore.clone(), now, StdDuration::from_secs(24 * 60 * 60))
|
||||
.with_subscriber(subscriber)
|
||||
.await;
|
||||
let listed = calls.load(Ordering::Relaxed);
|
||||
assert_eq!(listed > 0, should_list, "unexpected ListParts calls for {object}: {listed}");
|
||||
let result = ecstore
|
||||
.get_multipart_info(&bucket, object, &upload.upload_id, &ObjectOptions::default())
|
||||
.await;
|
||||
assert!(
|
||||
matches!(result, Err(ref err) if is_err_invalid_upload_id(err)),
|
||||
"upload must be removed: {result:?}"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stale_multipart_cleanup_rejects_incomplete_or_overflowing_part_sizes() {
|
||||
use crate::storage_api_contracts::multipart::{ListPartsInfo, PartInfo};
|
||||
|
||||
let part = |size, actual_size, etag: &str| PartInfo {
|
||||
size,
|
||||
actual_size,
|
||||
etag: Some(etag.to_owned()),
|
||||
..Default::default()
|
||||
};
|
||||
let mut parts = ListPartsInfo {
|
||||
parts: vec![part(4, 6, "valid")],
|
||||
..Default::default()
|
||||
};
|
||||
assert_eq!(super::stale_upload_size_from_parts(&parts), Some(6));
|
||||
parts.is_truncated = true;
|
||||
assert_eq!(super::stale_upload_size_from_parts(&parts), None);
|
||||
parts.is_truncated = false;
|
||||
parts.parts = vec![part(0, 0, "")];
|
||||
assert_eq!(super::stale_upload_size_from_parts(&parts), None);
|
||||
parts.parts = vec![part(usize::MAX, 0, "valid"), part(1, 1, "valid")];
|
||||
assert_eq!(super::stale_upload_size_from_parts(&parts), None);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn stale_multipart_cleanup_handles_unknown_size_without_false_abort() {
|
||||
let (_, ecstore) = setup_test_env().await;
|
||||
let bucket = format!("stale-unknown-size-{}", Uuid::new_v4().simple());
|
||||
let object = "logs/object";
|
||||
create_test_bucket(&ecstore, &bucket).await;
|
||||
let size_rule = r#"<Rule><ID>size</ID><Status>Enabled</Status><Filter><ObjectSizeLessThan>5</ObjectSizeLessThan></Filter><AbortIncompleteMultipartUpload><DaysAfterInitiation>0</DaysAfterInitiation></AbortIncompleteMultipartUpload></Rule>"#;
|
||||
let independent_rule = r#"<Rule><ID>prefix</ID><Status>Enabled</Status><Filter><Prefix>logs/</Prefix></Filter><AbortIncompleteMultipartUpload><DaysAfterInitiation>0</DaysAfterInitiation></AbortIncompleteMultipartUpload></Rule>"#;
|
||||
let lifecycle = |rules: &str| format!("<LifecycleConfiguration>{rules}</LifecycleConfiguration>").into_bytes();
|
||||
metadata_sys::update(&bucket, BUCKET_LIFECYCLE_CONFIG, lifecycle(size_rule))
|
||||
.await
|
||||
.expect("install upper-size lifecycle rule");
|
||||
let metadata = HashMap::from([
|
||||
(super::RUSTFS_MULTIPART_BUCKET_KEY.to_owned(), bucket.clone()),
|
||||
(super::RUSTFS_MULTIPART_OBJECT_KEY.to_owned(), object.to_owned()),
|
||||
]);
|
||||
let initiated = OffsetDateTime::now_utc() - time::Duration::hours(1);
|
||||
let set = &ecstore.pools[0].disk_set[0];
|
||||
let upload = ecstore
|
||||
.new_multipart_upload(&bucket, object, &ObjectOptions::default())
|
||||
.await
|
||||
.expect("create empty multipart upload");
|
||||
let decoded = base64_simd::URL_SAFE_NO_PAD
|
||||
.decode_to_vec(upload.upload_id.as_bytes())
|
||||
.expect("decode upload ID");
|
||||
let decoded = String::from_utf8(decoded).expect("upload ID must be UTF-8");
|
||||
let (_, upload_dir) = decoded.split_once('.').expect("deployment-prefixed upload ID");
|
||||
assert!(
|
||||
super::stale_upload_lifecycle_due(set, &metadata, initiated, upload_dir, false)
|
||||
.await
|
||||
.is_some(),
|
||||
"a known empty upload must match the upper-size rule"
|
||||
);
|
||||
let missing_upload = format!("{}x{}", Uuid::new_v4(), initiated.unix_timestamp_nanos());
|
||||
assert!(
|
||||
super::stale_upload_lifecycle_due(set, &metadata, initiated, &missing_upload, false)
|
||||
.await
|
||||
.is_none(),
|
||||
"an unreadable size must not match the upper-size rule"
|
||||
);
|
||||
metadata_sys::update(&bucket, BUCKET_LIFECYCLE_CONFIG, lifecycle(&format!("{size_rule}{independent_rule}")))
|
||||
.await
|
||||
.expect("install size-independent lifecycle rule");
|
||||
assert!(
|
||||
super::stale_upload_lifecycle_due(set, &metadata, initiated, &missing_upload, false)
|
||||
.await
|
||||
.is_some(),
|
||||
"a size-independent rule remains eligible when size is unknown"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn stale_multipart_cleanup_uses_default_expiry_without_lifecycle() {
|
||||
|
||||
@@ -63,7 +63,14 @@ pub(crate) async fn get_expiry_configs_for_options(
|
||||
bucket: &str,
|
||||
opts: &crate::object_api::ObjectOptions,
|
||||
) -> Result<LifecycleExpiryConfigs> {
|
||||
let bucket_incarnation_id = metadata_sys::get_bucket_incarnation_id_for_options_in(&api.ctx, bucket, opts).await?;
|
||||
let bucket_incarnation_id = match opts
|
||||
.object_lock_config_snapshot
|
||||
.as_ref()
|
||||
.and_then(|snapshot| snapshot.validated_bucket_incarnation_for(api.id, bucket, opts.expected_bucket_incarnation_id))
|
||||
{
|
||||
Some(incarnation_id) => incarnation_id,
|
||||
None => metadata_sys::get_bucket_incarnation_id_for_options_in(&api.ctx, bucket, opts).await?,
|
||||
};
|
||||
let metadata = get_authoritative_metadata(api, bucket, bucket_incarnation_id).await?;
|
||||
let table_bucket_enabled = metadata.table_bucket_enabled();
|
||||
|
||||
|
||||
@@ -564,39 +564,12 @@ pub(crate) async fn validate_bucket_reconstruction_in(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Resolve the authoritative bucket incarnation id for `opts`:
|
||||
/// 1. When namespace locking is enabled and `opts.object_lock_config_snapshot` is
|
||||
/// present, validate and return the snapshot's incarnation under its held
|
||||
/// lifecycle and metadata-transaction fences.
|
||||
/// 2. When namespace locking is enabled and `opts.bucket_lifecycle_lock_fence` is
|
||||
/// present and not lost, reuse the store's `BucketFenceRegistry` memo if a
|
||||
/// registered lifecycle read guard is currently held without lock loss.
|
||||
/// 3. Otherwise, acquire the bucket metadata transaction read lock (unless
|
||||
/// already held on `opts`) and read the incarnation from disk.
|
||||
/// Validate against disk while retaining an already-held Object Lock fence.
|
||||
pub(crate) async fn get_bucket_incarnation_id_for_options_in(
|
||||
ctx: &crate::runtime::instance::InstanceContext,
|
||||
bucket: &str,
|
||||
opts: &ObjectOptions,
|
||||
) -> Result<Uuid> {
|
||||
if !ctx.lock_manager().is_disabled() {
|
||||
if let Some(snapshot) = opts.object_lock_config_snapshot.as_ref() {
|
||||
let store = object_store_in(ctx).await?;
|
||||
return snapshot
|
||||
.validated_bucket_incarnation_for(store.id, bucket, opts.expected_bucket_incarnation_id)
|
||||
.ok_or_else(|| {
|
||||
Error::other("Object Lock snapshot does not hold a valid metadata transaction fence for this bucket")
|
||||
});
|
||||
}
|
||||
if opts
|
||||
.bucket_lifecycle_lock_fence
|
||||
.as_ref()
|
||||
.is_some_and(|fence| !fence.is_lock_lost())
|
||||
&& let Some(store) = object_store_if_initialized_in(ctx).await
|
||||
&& let Some(incarnation) = store.bucket_fence_registry.validated_incarnation(bucket)
|
||||
{
|
||||
return Ok(incarnation);
|
||||
}
|
||||
}
|
||||
let sys = bucket_metadata_sys_of(ctx)?;
|
||||
let sys = sys.read().await.clone();
|
||||
let guard = acquire_bucket_metadata_transaction_read_lock_for_options_in(ctx, bucket, opts).await?;
|
||||
|
||||
@@ -488,18 +488,6 @@ where
|
||||
Ok(data)
|
||||
}
|
||||
|
||||
/// Read config bytes and metadata while preserving an existing empty payload.
|
||||
pub(crate) async fn read_config_preserve_empty_with_metadata_opts<S>(
|
||||
api: Arc<S>,
|
||||
file: &str,
|
||||
opts: &ObjectOptions,
|
||||
) -> Result<(Vec<u8>, ObjectInfo)>
|
||||
where
|
||||
S: EcstoreObjectIO,
|
||||
{
|
||||
read_config_with_metadata_inner(api, file, opts, true, None).await
|
||||
}
|
||||
|
||||
pub async fn read_config_no_lock<S>(api: Arc<S>, file: &str) -> Result<Vec<u8>>
|
||||
where
|
||||
S: ObjectIO<
|
||||
|
||||
@@ -1493,48 +1493,6 @@ pub async fn load_data_usage_from_backend_cached(store: Arc<ECStore>) -> Result<
|
||||
project_data_usage_from_backend_cached(store, DataUsageInfo::clone).await
|
||||
}
|
||||
|
||||
/// Read one bucket's persisted usage without cloning the complete snapshot.
|
||||
pub async fn load_bucket_usage_from_backend_cached(
|
||||
store: Arc<ECStore>,
|
||||
bucket: &str,
|
||||
incarnation: uuid::Uuid,
|
||||
) -> Result<Option<u64>, Error> {
|
||||
project_data_usage_from_backend_cached(store, |info| certified_bucket_usage(info, bucket, incarnation)).await
|
||||
}
|
||||
|
||||
fn certified_bucket_usage(info: &DataUsageInfo, bucket: &str, incarnation: uuid::Uuid) -> Option<u64> {
|
||||
if incarnation.is_nil()
|
||||
|| !info.is_complete_bucket_usage_snapshot()
|
||||
|| info.usage_snapshot_observational
|
||||
|| info.scanner_cycle.is_none()
|
||||
|| info.scanner_epoch.is_none()
|
||||
{
|
||||
return None;
|
||||
}
|
||||
let pending_count = u64::try_from(info.usage_snapshot_pending_buckets.len()).ok()?;
|
||||
if pending_count != info.usage_snapshot_pending_bucket_count {
|
||||
return None;
|
||||
}
|
||||
match info.usage_snapshot_converged {
|
||||
Some(true) if pending_count == 0 => {}
|
||||
Some(false)
|
||||
if pending_count > 0
|
||||
&& info.usage_snapshot_pending_buckets.windows(2).all(|pair| pair[0] < pair[1])
|
||||
&& info
|
||||
.usage_snapshot_pending_buckets
|
||||
.binary_search_by(|pending| pending.as_str().cmp(bucket))
|
||||
.is_err() => {}
|
||||
_ => return None,
|
||||
}
|
||||
let usage = info.buckets_usage.get(bucket)?;
|
||||
let certified = usage
|
||||
.bucket_incarnation
|
||||
.as_deref()
|
||||
.and_then(|id| uuid::Uuid::parse_str(id).ok())
|
||||
.filter(|id| !id.is_nil())?;
|
||||
(certified == incarnation).then_some(usage.size)
|
||||
}
|
||||
|
||||
// Project under the cache guard so scalar readers never copy the snapshot's
|
||||
// bucket maps. The owned API shares the same TTL, refresh and invalidation path.
|
||||
async fn project_data_usage_from_backend_cached<T>(
|
||||
|
||||
@@ -129,41 +129,6 @@ fn projected_publication_moves_bucket_maps_into_cache() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn certified_bucket_usage_rejects_unproven_and_pending_data() {
|
||||
let id = uuid::Uuid::from_u128(7);
|
||||
let mut info = data_usage_info_for_test("known", 1, 42, SystemTime::UNIX_EPOCH);
|
||||
info.usage_snapshot_converged = Some(true);
|
||||
info.scanner_cycle = Some(1);
|
||||
info.scanner_epoch = Some(1);
|
||||
info.buckets_usage.get_mut("known").unwrap().bucket_incarnation = Some(id.to_string());
|
||||
assert_eq!(certified_bucket_usage(&info, "known", id), Some(42));
|
||||
assert_eq!(certified_bucket_usage(&info, "known", uuid::Uuid::from_u128(8)), None);
|
||||
assert_eq!(certified_bucket_usage(&info, "known", uuid::Uuid::nil()), None);
|
||||
let mut legacy = info.clone();
|
||||
legacy.buckets_usage.get_mut("known").unwrap().bucket_incarnation = None;
|
||||
assert_eq!(certified_bucket_usage(&legacy, "known", id), None);
|
||||
legacy.buckets_usage.get_mut("known").unwrap().bucket_incarnation = Some("corrupt".into());
|
||||
assert_eq!(certified_bucket_usage(&legacy, "known", id), None);
|
||||
let mut pending = info.clone();
|
||||
pending.usage_snapshot_converged = Some(false);
|
||||
pending.usage_snapshot_pending_buckets = vec!["other".into()];
|
||||
pending.usage_snapshot_pending_bucket_count = 1;
|
||||
assert_eq!(certified_bucket_usage(&pending, "known", id), Some(42));
|
||||
pending.usage_snapshot_pending_buckets = vec!["known".into()];
|
||||
assert_eq!(certified_bucket_usage(&pending, "known", id), None);
|
||||
pending.usage_snapshot_pending_bucket_count = 0;
|
||||
assert_eq!(certified_bucket_usage(&pending, "known", id), None);
|
||||
pending.usage_snapshot_pending_buckets = vec!["z".into(), "a".into()];
|
||||
pending.usage_snapshot_pending_bucket_count = 2;
|
||||
assert_eq!(certified_bucket_usage(&pending, "known", id), None);
|
||||
let mut observational = info.clone();
|
||||
observational.usage_snapshot_observational = true;
|
||||
assert_eq!(certified_bucket_usage(&observational, "known", id), None);
|
||||
info.usage_snapshot_converged = None;
|
||||
assert_eq!(certified_bucket_usage(&info, "known", id), None);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn persisted_scalar_projection_shares_cache_refresh_and_invalidation() {
|
||||
@@ -175,13 +140,6 @@ async fn persisted_scalar_projection_shares_cache_refresh_and_invalidation() {
|
||||
info.buckets_usage.insert("empty".to_string(), BucketUsageInfo::default());
|
||||
info.bucket_sizes.insert("empty".to_string(), 0);
|
||||
info.buckets_count = 2;
|
||||
info.usage_snapshot_converged = Some(true);
|
||||
info.scanner_cycle = Some(1);
|
||||
info.scanner_epoch = Some(1);
|
||||
let incarnation = uuid::Uuid::from_u128(7);
|
||||
for usage in info.buckets_usage.values_mut() {
|
||||
usage.bucket_incarnation = Some(incarnation.to_string());
|
||||
}
|
||||
save_config(
|
||||
store.clone(),
|
||||
DATA_USAGE_OBJ_NAME_PATH.as_str(),
|
||||
@@ -193,29 +151,11 @@ async fn persisted_scalar_projection_shares_cache_refresh_and_invalidation() {
|
||||
|
||||
for (bucket, expected) in [("known", Some(42)), ("empty", Some(0)), ("missing", None)] {
|
||||
assert_eq!(persisted_bucket_usage(store.clone(), bucket).await, expected);
|
||||
assert_eq!(
|
||||
load_bucket_usage_from_backend_cached(store.clone(), bucket, incarnation)
|
||||
.await
|
||||
.expect("project bucket usage"),
|
||||
expected
|
||||
);
|
||||
let owned = load_data_usage_from_backend_cached(store.clone())
|
||||
.await
|
||||
.expect("owned cached snapshot");
|
||||
assert_eq!(expected, owned.buckets_usage.get(bucket).map(|usage| usage.size));
|
||||
}
|
||||
assert_eq!(
|
||||
load_bucket_usage_from_backend_cached(store.clone(), "known", uuid::Uuid::from_u128(8))
|
||||
.await
|
||||
.unwrap(),
|
||||
None
|
||||
);
|
||||
assert_eq!(
|
||||
load_bucket_usage_from_backend_cached(store.clone(), "known", uuid::Uuid::nil())
|
||||
.await
|
||||
.unwrap(),
|
||||
None
|
||||
);
|
||||
info.buckets_usage.get_mut("known").expect("known bucket").size = 84;
|
||||
info.bucket_sizes.insert("known".to_string(), 84);
|
||||
save_config(
|
||||
|
||||
@@ -8450,23 +8450,6 @@ impl LocalDisk {
|
||||
return Err(std::io::Error::other("metadata read worker cancelled"));
|
||||
}
|
||||
let _io_permit = io_permit;
|
||||
#[cfg(all(any(test, feature = "test-util"), not(windows)))]
|
||||
{
|
||||
let opened = root.open_readonly(&path);
|
||||
if opened.is_ok() {
|
||||
os::prepared_publication_test_hooks::run(
|
||||
os::prepared_publication_test_hooks::Stage::MetadataReadAfterOpen,
|
||||
&path,
|
||||
);
|
||||
}
|
||||
let result = read_fn(opened);
|
||||
os::prepared_publication_test_hooks::run(
|
||||
os::prepared_publication_test_hooks::Stage::MetadataReadAfterRead,
|
||||
&path,
|
||||
);
|
||||
Ok(result)
|
||||
}
|
||||
#[cfg(not(all(any(test, feature = "test-util"), not(windows))))]
|
||||
Ok(read_fn(root.open_readonly(&path)))
|
||||
})
|
||||
.await
|
||||
|
||||
@@ -333,8 +333,6 @@ pub(crate) mod prepared_publication_test_hooks {
|
||||
PreparedRename,
|
||||
Rename,
|
||||
Remove,
|
||||
MetadataReadAfterOpen,
|
||||
MetadataReadAfterRead,
|
||||
#[cfg(test)]
|
||||
Rollback,
|
||||
#[cfg(test)]
|
||||
@@ -459,8 +457,6 @@ pub enum LocalPublicationStage {
|
||||
PreparedRename,
|
||||
Rename,
|
||||
Remove,
|
||||
MetadataReadAfterOpen,
|
||||
MetadataReadAfterRead,
|
||||
}
|
||||
|
||||
#[cfg(all(feature = "test-util", not(windows)))]
|
||||
@@ -473,8 +469,6 @@ impl LocalPublicationPause {
|
||||
LocalPublicationStage::PreparedRename => prepared_publication_test_hooks::Stage::PreparedRename,
|
||||
LocalPublicationStage::Rename => prepared_publication_test_hooks::Stage::Rename,
|
||||
LocalPublicationStage::Remove => prepared_publication_test_hooks::Stage::Remove,
|
||||
LocalPublicationStage::MetadataReadAfterOpen => prepared_publication_test_hooks::Stage::MetadataReadAfterOpen,
|
||||
LocalPublicationStage::MetadataReadAfterRead => prepared_publication_test_hooks::Stage::MetadataReadAfterRead,
|
||||
};
|
||||
let (entered_tx, entered) = oneshot::channel();
|
||||
let (release, release_rx) = std::sync::mpsc::channel::<()>();
|
||||
|
||||
@@ -4245,23 +4245,14 @@ pub(super) struct MultipartWriteQuorumContext<'a> {
|
||||
part_number: Option<usize>,
|
||||
}
|
||||
|
||||
fn record_multipart_write_quorum_failure(
|
||||
stage: &'static str,
|
||||
errs: &[Option<DiskError>],
|
||||
write_quorum: usize,
|
||||
) -> crate::disk::error_reduce::WriteQuorumFailureSummary {
|
||||
let summary = build_write_quorum_failure_summary(errs, OBJECT_OP_IGNORED_ERRS, write_quorum);
|
||||
runtime_sources::record_erasure_write_quorum_failure(stage, summary.dominant_error_label);
|
||||
summary
|
||||
}
|
||||
|
||||
fn log_multipart_write_quorum_failure(
|
||||
context: MultipartWriteQuorumContext<'_>,
|
||||
errs: &[Option<DiskError>],
|
||||
write_quorum: usize,
|
||||
returned_error: &DiskError,
|
||||
) {
|
||||
let summary = record_multipart_write_quorum_failure(context.stage, errs, write_quorum);
|
||||
let summary = build_write_quorum_failure_summary(errs, OBJECT_OP_IGNORED_ERRS, write_quorum);
|
||||
runtime_sources::record_erasure_write_quorum_failure(context.stage, summary.dominant_error_label);
|
||||
warn!(
|
||||
target: "rustfs_ecstore::set_disk",
|
||||
event = EVENT_SET_DISK_MULTIPART,
|
||||
|
||||
@@ -40,35 +40,9 @@ pub(crate) mod test_hooks {
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
type Hook = Arc<dyn Fn() -> BoxFuture<'static, ()> + Send + Sync>;
|
||||
type TransactionLockHook = Arc<dyn Fn(&rustfs_lock::NamespaceLockGuard) + Send + Sync>;
|
||||
|
||||
static BEFORE_GC_FINALIZE: Mutex<Vec<(String, String, Hook)>> = Mutex::new(Vec::new());
|
||||
static CLEANUP_ATTEMPTS: Mutex<Vec<(String, String)>> = Mutex::new(Vec::new());
|
||||
static AFTER_TRANSACTION_LOCK: Mutex<Vec<(String, String, TransactionLockHook)>> = Mutex::new(Vec::new());
|
||||
|
||||
pub(crate) fn after_transaction_lock_acquired(bucket: &str, object: &str, hook: TransactionLockHook) {
|
||||
AFTER_TRANSACTION_LOCK
|
||||
.lock()
|
||||
.expect("transaction lock hooks")
|
||||
.push((bucket.to_owned(), object.to_owned(), hook));
|
||||
}
|
||||
|
||||
pub(in crate::set_disk) fn run_after_transaction_lock_acquired(
|
||||
bucket: &str,
|
||||
object: &str,
|
||||
guard: &rustfs_lock::NamespaceLockGuard,
|
||||
) {
|
||||
let hook = {
|
||||
let mut hooks = AFTER_TRANSACTION_LOCK.lock().expect("transaction lock hooks");
|
||||
hooks
|
||||
.iter()
|
||||
.position(|(hook_bucket, hook_object, _)| hook_bucket == bucket && hook_object == object)
|
||||
.map(|index| hooks.remove(index).2)
|
||||
};
|
||||
if let Some(hook) = hook {
|
||||
hook(guard);
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn record_cleanup_attempt(bucket: &str, object: &str) {
|
||||
CLEANUP_ATTEMPTS
|
||||
@@ -138,7 +112,6 @@ pub(crate) struct DeleteRecoveryContext<'a> {
|
||||
/// Only the locked heal path may repair a live marker-creation source.
|
||||
pub repair_marker_source: bool,
|
||||
pub namespace_owner: Option<Arc<dyn Send + Sync>>,
|
||||
pub transaction_guard: Option<Arc<rustfs_lock::NamespaceLockGuard>>,
|
||||
pub recovery_ticket: Option<crate::store::delete_recovery_runtime::DeleteRecoveryTicket>,
|
||||
pub published_hint: Option<(Uuid, &'a [Result<DeleteRecoveryInspection>])>,
|
||||
pub can_commit: &'a (dyn Fn() -> bool + Sync),
|
||||
@@ -152,7 +125,6 @@ impl<'a> DeleteRecoveryContext<'a> {
|
||||
explicit_delete: false,
|
||||
repair_marker_source: false,
|
||||
namespace_owner: None,
|
||||
transaction_guard: None,
|
||||
recovery_ticket: None,
|
||||
published_hint: None,
|
||||
can_commit,
|
||||
@@ -401,22 +373,9 @@ impl SetDisks {
|
||||
write_quorum: usize,
|
||||
mut context: DeleteRecoveryContext<'_>,
|
||||
) -> Result<()> {
|
||||
let transaction_guard = match context.transaction_guard.take() {
|
||||
Some(guard) => guard,
|
||||
None => self
|
||||
.acquire_delete_transaction_lock(bucket, object)
|
||||
.await
|
||||
.map_err(DiskError::other)?,
|
||||
};
|
||||
let outer_can_commit = context.can_commit;
|
||||
let can_commit = || outer_can_commit() && !transaction_guard.is_lock_lost();
|
||||
context.can_commit = &can_commit;
|
||||
context.transaction_guard = Some(Arc::clone(&transaction_guard));
|
||||
let owner = context
|
||||
.namespace_owner
|
||||
.take()
|
||||
.unwrap_or_else(|| self.ctx.begin_namespace_commit());
|
||||
context.namespace_owner = Some(Arc::new((owner, Arc::clone(&transaction_guard))));
|
||||
if context.namespace_owner.is_none() {
|
||||
context.namespace_owner = Some(self.ctx.begin_namespace_commit());
|
||||
}
|
||||
let can_commit = context.can_commit;
|
||||
let states = inspect(disks, bucket, object, transaction).await;
|
||||
let untouched_absence = |state: &Result<DeleteRecoveryInspection>| matches!(state, Ok(state) if state.state == DeleteRecoveryState::Absent && state.current_digest.is_none());
|
||||
@@ -588,25 +547,8 @@ impl SetDisks {
|
||||
&self,
|
||||
bucket: &str,
|
||||
object: &str,
|
||||
mut context: DeleteRecoveryContext<'_>,
|
||||
context: DeleteRecoveryContext<'_>,
|
||||
) -> Result<DeleteRecoverySummary> {
|
||||
let transaction_guard = match context.transaction_guard.take() {
|
||||
Some(guard) => guard,
|
||||
None => self
|
||||
.acquire_delete_transaction_lock(bucket, object)
|
||||
.await
|
||||
.map_err(DiskError::other)?,
|
||||
};
|
||||
let outer_can_commit = context.can_commit;
|
||||
let can_commit = || outer_can_commit() && !transaction_guard.is_lock_lost();
|
||||
context.can_commit = &can_commit;
|
||||
if !context.dry_run {
|
||||
let owner = context
|
||||
.namespace_owner
|
||||
.take()
|
||||
.unwrap_or_else(|| self.ctx.begin_namespace_commit());
|
||||
context.namespace_owner = Some(Arc::new((owner, Arc::clone(&transaction_guard))));
|
||||
}
|
||||
let DeleteRecoveryContext {
|
||||
incarnation,
|
||||
dry_run,
|
||||
@@ -616,7 +558,6 @@ impl SetDisks {
|
||||
published_hint,
|
||||
can_commit,
|
||||
recovery_ticket: _,
|
||||
transaction_guard: _,
|
||||
} = context;
|
||||
let disks = self.disk_inventory().await;
|
||||
let complete_inventory = disks.len() == self.set_drive_count && disks.iter().all(Option::is_some);
|
||||
@@ -1316,135 +1257,6 @@ mod tests {
|
||||
assert_eq!(body(&store, bucket, None).await, original);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn delete_recovery_deferred_batch_discards_released_alias_fence_and_preserves_caller_fence() {
|
||||
use crate::bucket::metadata_sys::ObjectLockConfigState;
|
||||
use crate::object_api::{NamespaceLockFence, NamespaceLockSignalTestFence, ObjectLockConfigSnapshot};
|
||||
use crate::storage_api_contracts::object::ObjectToDelete;
|
||||
use std::sync::Mutex;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
|
||||
for lose_caller in [false, true] {
|
||||
let bucket = if lose_caller {
|
||||
"deferred-batch-lost-caller"
|
||||
} else {
|
||||
"deferred-batch-released-alias"
|
||||
};
|
||||
let (_dirs, store, disks) = fixture(bucket).await;
|
||||
put(&store, bucket, &[27; 4096], false).await;
|
||||
let transaction = applied(&store, &disks, bucket, None, disks.len()).await;
|
||||
let before = join_all(
|
||||
disks
|
||||
.iter()
|
||||
.map(|disk| disk.inspect_delete_transaction(bucket, "object", transaction)),
|
||||
)
|
||||
.await
|
||||
.into_iter()
|
||||
.collect::<Result<Vec<_>>>()
|
||||
.expect("capture pending recovery evidence");
|
||||
let mut set = (*store.pools[0].disk_set[0]).clone();
|
||||
set.lockers = vec![Arc::new(rustfs_lock::LocalClient::with_manager(Arc::new(
|
||||
rustfs_lock::GlobalLockManager::Enabled(Arc::new(rustfs_lock::FastObjectLockManager::new())),
|
||||
)))];
|
||||
set.ctx
|
||||
.update_erasure_type(crate::layout::endpoints::SetupType::DistErasure)
|
||||
.await;
|
||||
|
||||
let (caller_fence, caller_lost) = NamespaceLockFence::loss_handle_for_test();
|
||||
let released_alias_lost = Arc::new(AtomicBool::new(false));
|
||||
let signal_fence = Arc::new(Mutex::new(None));
|
||||
let captured_signal_fence = Arc::clone(&signal_fence);
|
||||
let captured_alias_lost = Arc::clone(&released_alias_lost);
|
||||
test_hooks::after_transaction_lock_acquired(
|
||||
bucket,
|
||||
"object",
|
||||
Arc::new(move |guard| {
|
||||
let signal = guard.lock_lost_signal().expect("distributed alias signal");
|
||||
let fence = NamespaceLockSignalTestFence::install_with_loss_handle(&signal, Arc::clone(&captured_alias_lost));
|
||||
// Retain the signal so a later allocation cannot reuse its
|
||||
// registry identity after the original guard is dropped.
|
||||
*captured_signal_fence.lock().expect("captured alias fence") = Some((fence, signal));
|
||||
}),
|
||||
);
|
||||
let replay_started = Arc::new(AtomicBool::new(false));
|
||||
let captured_replay_started = Arc::clone(&replay_started);
|
||||
let expired_alias = Arc::clone(&released_alias_lost);
|
||||
test_hooks::after_transaction_lock_acquired(
|
||||
bucket,
|
||||
"object",
|
||||
Arc::new(move |_| {
|
||||
// Acquiring the same transaction key again proves the first
|
||||
// lease was released. Only its copied fence becomes stale.
|
||||
expired_alias.store(true, Ordering::Release);
|
||||
caller_lost.store(lose_caller, Ordering::Release);
|
||||
captured_replay_started.store(true, Ordering::Release);
|
||||
}),
|
||||
);
|
||||
|
||||
let (deleted, errors) = set
|
||||
.delete_objects(
|
||||
bucket,
|
||||
vec![ObjectToDelete {
|
||||
object_name: "object".into(),
|
||||
..Default::default()
|
||||
}],
|
||||
ObjectOptions {
|
||||
namespace_lock_fence: Some(caller_fence),
|
||||
object_lock_config_snapshot: Some(Arc::new(ObjectLockConfigSnapshot::new(
|
||||
ObjectLockConfigState::ConfirmedAbsent,
|
||||
))),
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.await;
|
||||
assert!(
|
||||
replay_started.load(Ordering::Acquire),
|
||||
"missing metadata must take the deferred replay path"
|
||||
);
|
||||
assert!(
|
||||
released_alias_lost.load(Ordering::Acquire),
|
||||
"the completed batch alias must be marked lost"
|
||||
);
|
||||
if lose_caller {
|
||||
assert!(errors[0].is_some(), "losing the original caller fence must reject deferred replay");
|
||||
for (disk, original) in disks.iter().zip(before) {
|
||||
let after = disk
|
||||
.inspect_delete_transaction(bucket, "object", transaction)
|
||||
.await
|
||||
.expect("retained proof");
|
||||
assert_eq!(
|
||||
after.fingerprint, original.fingerprint,
|
||||
"lost caller authority must preserve every prepared journal"
|
||||
);
|
||||
}
|
||||
} else {
|
||||
assert!(
|
||||
errors.iter().all(Option::is_none),
|
||||
"released alias loss must not reject fresh recovery: {errors:?}"
|
||||
);
|
||||
assert!(
|
||||
!deleted[0].found,
|
||||
"fresh unversioned recovery commits absence before the idempotent batch retry"
|
||||
);
|
||||
for disk in &disks {
|
||||
assert!(
|
||||
discover(disk, bucket, Some("object"))
|
||||
.await
|
||||
.expect("final recovery evidence")
|
||||
.is_empty()
|
||||
);
|
||||
assert_eq!(
|
||||
disk.read_version("", bucket, "object", "", &ReadOptions::default())
|
||||
.await
|
||||
.expect_err("replayed delete must remove the source"),
|
||||
DiskError::FileNotFound
|
||||
);
|
||||
}
|
||||
}
|
||||
drop(signal_fence);
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn delete_recovery_corrupt_bucket_does_not_prevent_other_bucket_rollback() {
|
||||
let bad_bucket = "recover-corrupt-bucket";
|
||||
|
||||
@@ -3634,18 +3634,6 @@ impl SetDisks {
|
||||
return Ok((result, err.map(|e| e.into())));
|
||||
}
|
||||
|
||||
// Keep the transaction key through both replay and the metadata heal
|
||||
// based on that replay. The raw target key always precedes this key.
|
||||
let transaction_guard =
|
||||
if _write_lock_guard.is_some() && !opts.read_repair && !crate::bucket::utils::is_meta_bucketname(bucket) {
|
||||
Some(self.acquire_delete_transaction_lock(bucket, object).await?)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
let locks_lost = || {
|
||||
_write_lock_guard.as_deref().is_some_and(|guard| guard.is_lock_lost())
|
||||
|| transaction_guard.as_ref().is_some_and(|guard| guard.is_lock_lost())
|
||||
};
|
||||
let mut recovery_removed_version = false;
|
||||
if !opts.read_repair
|
||||
&& _write_lock_guard.is_some()
|
||||
@@ -3667,17 +3655,12 @@ impl SetDisks {
|
||||
dry_run: opts.dry_run,
|
||||
explicit_delete,
|
||||
repair_marker_source: true,
|
||||
transaction_guard: transaction_guard.clone(),
|
||||
namespace_owner: (!opts.dry_run).then(|| {
|
||||
Arc::new((
|
||||
scope.clone(),
|
||||
self.ctx.begin_namespace_commit(),
|
||||
_write_lock_guard.clone(),
|
||||
transaction_guard.clone(),
|
||||
)) as Arc<dyn Send + Sync>
|
||||
Arc::new((scope.clone(), self.ctx.begin_namespace_commit(), _write_lock_guard.clone()))
|
||||
as Arc<dyn Send + Sync>
|
||||
}),
|
||||
..crate::set_disk::DeleteRecoveryContext::new(Some(scope.incarnation), &|| {
|
||||
scope.check().is_ok() && !locks_lost()
|
||||
scope.check().is_ok() && !_write_lock_guard.as_deref().is_some_and(|guard| guard.is_lock_lost())
|
||||
})
|
||||
},
|
||||
)
|
||||
@@ -3769,7 +3752,7 @@ impl SetDisks {
|
||||
&& errs
|
||||
.iter()
|
||||
.all(|err| matches!(err, Some(DiskError::FileNotFound | DiskError::FileVersionNotFound)))
|
||||
&& !locks_lost()
|
||||
&& !_write_lock_guard.as_deref().is_some_and(|guard| guard.is_lock_lost())
|
||||
{
|
||||
*absence = Some(HealedObjectAbsence {
|
||||
pool_index: self.pool_index,
|
||||
@@ -3784,10 +3767,8 @@ impl SetDisks {
|
||||
// Pass no_lock=true since we already obtained write lock (or are already called with no_lock=true)
|
||||
let mut inner_opts = *opts;
|
||||
inner_opts.no_lock = true;
|
||||
let commit_fence = || !locks_lost();
|
||||
let namespace_owner = _write_lock_guard
|
||||
.as_ref()
|
||||
.map(|guard| Arc::new((Arc::clone(guard), transaction_guard.clone())) as Arc<dyn Send + Sync>);
|
||||
let commit_fence = || !_write_lock_guard.as_ref().is_some_and(|guard| guard.is_lock_lost());
|
||||
let namespace_owner = _write_lock_guard.as_ref().map(|guard| guard.clone() as Arc<dyn Send + Sync>);
|
||||
let (result, err) = pin_object_heal_future(|| {
|
||||
self.heal_object_with_explicit_version_regen(
|
||||
bucket,
|
||||
@@ -3834,7 +3815,7 @@ impl SetDisks {
|
||||
result,
|
||||
err.map(Into::into),
|
||||
absence,
|
||||
locks_lost(),
|
||||
_write_lock_guard.as_deref().is_some_and(|guard| guard.is_lock_lost()),
|
||||
bucket,
|
||||
object,
|
||||
));
|
||||
@@ -3846,7 +3827,7 @@ impl SetDisks {
|
||||
result,
|
||||
err.map(Into::into),
|
||||
absence,
|
||||
locks_lost(),
|
||||
_write_lock_guard.as_deref().is_some_and(|guard| guard.is_lock_lost()),
|
||||
bucket,
|
||||
object,
|
||||
))
|
||||
|
||||
@@ -44,21 +44,6 @@ impl crate::storage_api_contracts::namespace::NamespaceLocking for SetDisks {
|
||||
|
||||
#[tracing::instrument(level = "trace", skip(self))]
|
||||
async fn new_ns_lock(&self, bucket: &str, object: &str) -> Result<NamespaceLockWrapper> {
|
||||
// Lock the file the disk resolves, not the spelling: on Windows `a\b`
|
||||
// and `a/b` share one xl.meta, so they must share one lock. The key is
|
||||
// folded by the requesting node only; lock servers compare it verbatim.
|
||||
let resource = ObjectKey {
|
||||
bucket: Arc::from(bucket),
|
||||
object: Arc::from(object_name_disk_identity(object).as_ref()),
|
||||
version: None,
|
||||
};
|
||||
|
||||
Ok(self.namespace_lock_for_key(resource).await)
|
||||
}
|
||||
}
|
||||
|
||||
impl SetDisks {
|
||||
async fn namespace_lock_for_key(&self, resource: ObjectKey) -> NamespaceLockWrapper {
|
||||
// Resolved from this set's own instance context (backlog#1052), not the
|
||||
// ambient facade: the facade tracks whichever context is currently
|
||||
// published process-wide, so a second instance (or, in tests, another
|
||||
@@ -84,33 +69,20 @@ impl SetDisks {
|
||||
NamespaceLock::with_local_manager_shared(self.set_lock_namespace.clone(), self.local_lock_manager.clone())
|
||||
};
|
||||
|
||||
NamespaceLockWrapper::new(set_lock, resource, self.locker_owner.clone())
|
||||
}
|
||||
// Lock the file the disk resolves, not the spelling: on Windows `a\b`
|
||||
// and `a/b` share one xl.meta, so they must share one lock. The key is
|
||||
// folded by the requesting node only; lock servers compare it verbatim.
|
||||
let resource = ObjectKey {
|
||||
bucket: Arc::from(bucket),
|
||||
object: Arc::from(object_name_disk_identity(object).as_ref()),
|
||||
version: None,
|
||||
};
|
||||
|
||||
/// Raw object locks precede this set-local transaction lock. Its versioned
|
||||
/// resource cannot collide with normal namespace keys, which use None.
|
||||
/// Keeping the target set's clients avoids nesting overlapping raw quorums.
|
||||
pub(in crate::set_disk) async fn acquire_delete_transaction_lock(
|
||||
&self,
|
||||
bucket: &str,
|
||||
object: &str,
|
||||
) -> Result<Arc<rustfs_lock::NamespaceLockGuard>> {
|
||||
let resource = ObjectKey::with_version(
|
||||
bucket,
|
||||
object_name_disk_identity(object).as_ref(),
|
||||
format!("rustfs:delete-transaction:{}:{}", self.pool_index, self.set_index),
|
||||
);
|
||||
let guard = self
|
||||
.namespace_lock_for_key(resource)
|
||||
.await
|
||||
.get_write_lock(super::super::get_lock_acquire_timeout())
|
||||
.await
|
||||
.map_err(|error| self.map_namespace_lock_error(bucket, object, "delete_transaction", error))?;
|
||||
#[cfg(test)]
|
||||
super::delete_recovery::test_hooks::run_after_transaction_lock_acquired(bucket, object, &guard);
|
||||
Ok(Arc::new(guard))
|
||||
Ok(NamespaceLockWrapper::new(set_lock, resource, self.locker_owner.clone()))
|
||||
}
|
||||
}
|
||||
|
||||
impl SetDisks {
|
||||
#[allow(dead_code, reason = "lock diagnostics formatter with no caller in this port (backlog#1823)")]
|
||||
pub(in crate::set_disk) fn format_lock_error(&self, bucket: &str, object: &str, mode: &str, err: &LockResult) -> String {
|
||||
match err {
|
||||
|
||||
@@ -44,9 +44,9 @@ use super::super::{
|
||||
create_bitrot_writer, debug, disk, error, file_info_is_valid_for_metadata, get_complete_multipart_md5, get_header_map,
|
||||
get_str, insert_str, is_err_object_not_found, is_err_version_not_found, is_min_allowed_part_size,
|
||||
log_multipart_write_quorum_failure, parts_after_marker, path_join_buf, prepare_complete_multipart_parts,
|
||||
record_compression_total_memory, record_multipart_write_quorum_failure, reduce_read_quorum_errs, reduce_write_quorum_errs,
|
||||
remove_header_map, resolve_write_layout, restore_commit_operation_id_from_metadata, should_persist_encryption_original_size,
|
||||
strip_internal_multipart_metadata, to_object_err, warn,
|
||||
record_compression_total_memory, reduce_read_quorum_errs, reduce_write_quorum_errs, remove_header_map, resolve_write_layout,
|
||||
restore_commit_operation_id_from_metadata, should_persist_encryption_original_size, strip_internal_multipart_metadata,
|
||||
to_object_err, warn,
|
||||
};
|
||||
use super::bitrot_self_verify::{BitrotSelfVerifyTarget, drop_failed_writer_disks, verify_written_bitrot_shards};
|
||||
#[cfg(test)]
|
||||
@@ -233,19 +233,6 @@ fn admitted_multipart_size(current: u64, candidate: u64, limit: u64) -> Result<u
|
||||
Ok(total)
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||
enum MultipartMetadataQuorum {
|
||||
Read,
|
||||
Write,
|
||||
Cleanup,
|
||||
}
|
||||
|
||||
impl From<bool> for MultipartMetadataQuorum {
|
||||
fn from(write: bool) -> Self {
|
||||
if write { Self::Write } else { Self::Read }
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) struct StaleMultipartCleanupGuard {
|
||||
file_info: FileInfo,
|
||||
upload_path: String,
|
||||
@@ -1152,7 +1139,7 @@ impl SetDisks {
|
||||
}
|
||||
let upload_id = runtime_sources::deployment_upload_id(raw_upload_id);
|
||||
let file_info = match self
|
||||
.check_multipart_upload_path_exists(bucket, object, &upload_id, &upload_path, MultipartMetadataQuorum::Read, true)
|
||||
.check_multipart_upload_path_exists(bucket, object, &upload_id, &upload_path, false, true)
|
||||
.await
|
||||
{
|
||||
Ok((file_info, _)) => file_info,
|
||||
@@ -1239,7 +1226,7 @@ impl SetDisks {
|
||||
.acquire_write_lock_diag("abort_data_movement_multipart", RUSTFS_META_MULTIPART_BUCKET, &upload_path)
|
||||
.await?;
|
||||
let file_info = match self
|
||||
.check_multipart_upload_path_exists(bucket, object, upload_id, &upload_path, MultipartMetadataQuorum::Write, true)
|
||||
.check_multipart_upload_path_exists(bucket, object, upload_id, &upload_path, true, true)
|
||||
.await
|
||||
{
|
||||
Ok((file_info, _)) => file_info,
|
||||
@@ -1346,7 +1333,7 @@ impl SetDisks {
|
||||
data_movement: bool,
|
||||
) -> Result<(FileInfo, Vec<FileInfo>)> {
|
||||
let upload_id_path = Self::validated_multipart_upload_path(bucket, object, upload_id, data_movement)?;
|
||||
self.check_multipart_upload_path_exists(bucket, object, upload_id, &upload_id_path, write.into(), false)
|
||||
self.check_multipart_upload_path_exists(bucket, object, upload_id, &upload_id_path, write, false)
|
||||
.await
|
||||
}
|
||||
|
||||
@@ -1386,7 +1373,7 @@ impl SetDisks {
|
||||
object: &str,
|
||||
upload_id: &str,
|
||||
upload_id_path: &str,
|
||||
quorum_mode: MultipartMetadataQuorum,
|
||||
write: bool,
|
||||
include_recovery: bool,
|
||||
) -> Result<(FileInfo, Vec<FileInfo>)> {
|
||||
// Slow metadata I/O must not hold the topology registry's read lock.
|
||||
@@ -1502,26 +1489,22 @@ impl SetDisks {
|
||||
}
|
||||
|
||||
let mut quorum = read_quorum as usize;
|
||||
if quorum_mode != MultipartMetadataQuorum::Read {
|
||||
if write {
|
||||
quorum = write_quorum as usize;
|
||||
|
||||
if let Some(err) = reduce_write_quorum_errs(&errs, OBJECT_OP_IGNORED_ERRS, quorum) {
|
||||
if quorum_mode == MultipartMetadataQuorum::Write {
|
||||
log_multipart_write_quorum_failure(
|
||||
MultipartWriteQuorumContext {
|
||||
stage: MULTIPART_WRITE_QUORUM_UPLOAD_METADATA,
|
||||
bucket,
|
||||
object,
|
||||
upload_id,
|
||||
part_number: None,
|
||||
},
|
||||
&errs,
|
||||
quorum,
|
||||
&err,
|
||||
);
|
||||
} else {
|
||||
record_multipart_write_quorum_failure(MULTIPART_WRITE_QUORUM_UPLOAD_METADATA, &errs, quorum);
|
||||
}
|
||||
log_multipart_write_quorum_failure(
|
||||
MultipartWriteQuorumContext {
|
||||
stage: MULTIPART_WRITE_QUORUM_UPLOAD_METADATA,
|
||||
bucket,
|
||||
object,
|
||||
upload_id,
|
||||
part_number: None,
|
||||
},
|
||||
&errs,
|
||||
quorum,
|
||||
&err,
|
||||
);
|
||||
return Err(map_error(err));
|
||||
}
|
||||
} else if let Some(err) = reduce_read_quorum_errs(&errs, OBJECT_OP_IGNORED_ERRS, quorum) {
|
||||
@@ -1540,7 +1523,7 @@ impl SetDisks {
|
||||
.acquire_write_lock_diag("stale_multipart_cleanup", RUSTFS_META_MULTIPART_BUCKET, upload_path)
|
||||
.await?;
|
||||
let (file_info, _) = self
|
||||
.check_multipart_upload_path_exists("", "", "", upload_path, MultipartMetadataQuorum::Cleanup, true)
|
||||
.check_multipart_upload_path_exists("", "", "", upload_path, true, true)
|
||||
.await?;
|
||||
let write_quorum = file_info.write_quorum(self.default_write_quorum());
|
||||
Ok(StaleMultipartCleanupGuard {
|
||||
@@ -3049,7 +3032,7 @@ impl crate::storage_api_contracts::multipart::MultipartOperations for SetDisks {
|
||||
// its full write quorum and the upload's incarnation/lifecycle fences.
|
||||
let upload_id_path = Self::validated_multipart_upload_path(bucket, object, upload_id, opts.data_movement)?;
|
||||
let (fi, _) = self
|
||||
.check_multipart_upload_path_exists(bucket, object, upload_id, &upload_id_path, MultipartMetadataQuorum::Read, true)
|
||||
.check_multipart_upload_path_exists(bucket, object, upload_id, &upload_id_path, false, true)
|
||||
.await?;
|
||||
ensure_data_movement_upload_access(&fi, bucket, object, upload_id, opts)?;
|
||||
ensure_multipart_bucket_incarnation(&self.ctx, &fi, bucket, object, upload_id, opts.expected_bucket_incarnation_id)
|
||||
@@ -3209,14 +3192,7 @@ impl crate::storage_api_contracts::multipart::MultipartOperations for SetDisks {
|
||||
}
|
||||
SourceRecovery::Missing => {
|
||||
return match self
|
||||
.check_multipart_upload_path_exists(
|
||||
bucket,
|
||||
object,
|
||||
upload_id,
|
||||
&upload_id_path,
|
||||
MultipartMetadataQuorum::Read,
|
||||
true,
|
||||
)
|
||||
.check_multipart_upload_path_exists(bucket, object, upload_id, &upload_id_path, false, true)
|
||||
.await
|
||||
{
|
||||
Ok(_) => Err(Error::ErasureWriteQuorum),
|
||||
@@ -11157,7 +11133,7 @@ mod tests {
|
||||
*disk = None;
|
||||
}
|
||||
let (info, _) = set
|
||||
.check_multipart_upload_path_exists(bucket, object, &upload, &path, MultipartMetadataQuorum::Read, true)
|
||||
.check_multipart_upload_path_exists(bucket, object, &upload, &path, false, true)
|
||||
.await
|
||||
.expect("four primary plus four recovery copies reach metadata read quorum");
|
||||
assert_eq!(info.name, path);
|
||||
@@ -11178,7 +11154,7 @@ mod tests {
|
||||
*disk = None;
|
||||
}
|
||||
assert!(
|
||||
set.check_multipart_upload_path_exists(bucket, object, &upload, &path, MultipartMetadataQuorum::Read, true)
|
||||
set.check_multipart_upload_path_exists(bucket, object, &upload, &path, false, true)
|
||||
.await
|
||||
.is_err(),
|
||||
"two files on each of four disks must not count as eight voters"
|
||||
@@ -14495,7 +14471,7 @@ mod tests {
|
||||
object,
|
||||
&u_new,
|
||||
&SetDisks::get_upload_id_dir(bucket, object, &u_new),
|
||||
MultipartMetadataQuorum::Write,
|
||||
true,
|
||||
true,
|
||||
)
|
||||
.await
|
||||
@@ -14540,7 +14516,7 @@ mod tests {
|
||||
object,
|
||||
&upload,
|
||||
&SetDisks::get_upload_id_dir(bucket, object, &upload),
|
||||
MultipartMetadataQuorum::Write,
|
||||
true,
|
||||
true,
|
||||
)
|
||||
.await
|
||||
@@ -14623,7 +14599,7 @@ mod tests {
|
||||
assert_completion_files_preserved(&disk_stores, RUSTFS_META_MULTIPART_BUCKET, &source_files).await;
|
||||
set_disks
|
||||
.check_multipart_upload_path_exists(
|
||||
bucket, object, &u_new, &SetDisks::get_upload_id_dir(bucket, object, &u_new), MultipartMetadataQuorum::Write, true,
|
||||
bucket, object, &u_new, &SetDisks::get_upload_id_dir(bucket, object, &u_new), true, true,
|
||||
)
|
||||
.await
|
||||
.expect("upload authority must survive the post-commit crash");
|
||||
|
||||
@@ -507,7 +507,7 @@ mod native_abort_closure_tests {
|
||||
let path = SetDisks::get_upload_id_dir(bucket, object, &upload);
|
||||
pin_historical_unmarked_upload(&disks, bucket, &path).await;
|
||||
let before = originals(&disks, &path).await;
|
||||
set.check_multipart_upload_path_exists(bucket, object, &upload, &path, MultipartMetadataQuorum::Read, true)
|
||||
set.check_multipart_upload_path_exists(bucket, object, &upload, &path, false, true)
|
||||
.await
|
||||
.expect("readonly legacy cleanup identity lookup");
|
||||
assert_eq!(
|
||||
@@ -786,7 +786,7 @@ mod native_abort_closure_tests {
|
||||
"known orphan native evidence remains unknown: {inspected:?}"
|
||||
);
|
||||
let readonly = set
|
||||
.check_multipart_upload_path_exists(bucket, object, &upload, &path, MultipartMetadataQuorum::Read, true)
|
||||
.check_multipart_upload_path_exists(bucket, object, &upload, &path, false, true)
|
||||
.await;
|
||||
assert!(
|
||||
matches!(
|
||||
|
||||
@@ -73,7 +73,6 @@ struct DeleteCommitContext<'a> {
|
||||
incarnation: Option<Uuid>,
|
||||
options: Option<&'a ObjectOptions>,
|
||||
guard: Option<Arc<super::super::ObjectLockDiagGuard>>,
|
||||
transaction_guard: Option<Arc<rustfs_lock::NamespaceLockGuard>>,
|
||||
}
|
||||
|
||||
impl<'a> DeleteCommitContext<'a> {
|
||||
@@ -82,37 +81,17 @@ impl<'a> DeleteCommitContext<'a> {
|
||||
incarnation: options.expected_bucket_incarnation_id,
|
||||
options: Some(options),
|
||||
guard: guard.cloned(),
|
||||
transaction_guard: None,
|
||||
}
|
||||
}
|
||||
|
||||
fn with_transaction_guard(mut self, guard: Option<&Arc<rustfs_lock::NamespaceLockGuard>>) -> Self {
|
||||
self.transaction_guard = guard.cloned();
|
||||
self
|
||||
}
|
||||
|
||||
fn ensure_transaction_lock_held(&self, bucket: &str, object: &str) -> Result<()> {
|
||||
if self.transaction_guard.as_ref().is_some_and(|guard| guard.is_lock_lost()) {
|
||||
return Err(StorageError::NamespaceLockQuorumUnavailable {
|
||||
mode: "delete_transaction",
|
||||
bucket: bucket.to_owned(),
|
||||
object: object.to_owned(),
|
||||
required: 1,
|
||||
achieved: 0,
|
||||
});
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn can_commit(&self, bucket: &str, object: &str) -> bool {
|
||||
!self.transaction_guard.as_ref().is_some_and(|guard| guard.is_lock_lost())
|
||||
&& self.options.is_none_or(|options| {
|
||||
ensure_delete_commit_locks_held(self.guard.as_deref(), bucket, object, options).is_ok()
|
||||
&& options
|
||||
.scanner_publication_commit_scope
|
||||
.as_ref()
|
||||
.is_none_or(|scope| scope.can_commit())
|
||||
})
|
||||
self.options.is_none_or(|options| {
|
||||
ensure_delete_commit_locks_held(self.guard.as_deref(), bucket, object, options).is_ok()
|
||||
&& options
|
||||
.scanner_publication_commit_scope
|
||||
.as_ref()
|
||||
.is_none_or(|scope| scope.can_commit())
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3873,7 +3852,6 @@ impl SetDisks {
|
||||
object: &str,
|
||||
opts: &ObjectOptions,
|
||||
lock_guard: Option<&Arc<super::super::ObjectLockDiagGuard>>,
|
||||
transaction_guard: Option<&Arc<rustfs_lock::NamespaceLockGuard>>,
|
||||
) -> Result<bool> {
|
||||
if is_meta_bucketname(bucket)
|
||||
|| opts.version_id.is_some()
|
||||
@@ -3910,7 +3888,6 @@ impl SetDisks {
|
||||
object,
|
||||
DeleteRecoveryContext {
|
||||
explicit_delete: true,
|
||||
transaction_guard: transaction_guard.cloned(),
|
||||
namespace_owner: Some(Arc::new((
|
||||
self.ctx.begin_namespace_commit(),
|
||||
lock_guard.cloned(),
|
||||
@@ -8900,11 +8877,8 @@ impl SetDisks {
|
||||
fi: &FileInfo,
|
||||
force_del_marker: bool,
|
||||
delete_marker_purge: Option<MrfDeleteMarkerPurge>,
|
||||
mut commit_context: DeleteCommitContext<'_>,
|
||||
commit_context: DeleteCommitContext<'_>,
|
||||
) -> Result<()> {
|
||||
if !is_meta_bucketname(bucket) && commit_context.transaction_guard.is_none() {
|
||||
commit_context.transaction_guard = Some(self.acquire_delete_transaction_lock(bucket, object).await?);
|
||||
}
|
||||
let source_bucket_incarnation_id = commit_context.incarnation;
|
||||
let transported = delete_file_info_with_replication_transport_metadata(fi);
|
||||
let fi = &transported;
|
||||
@@ -8913,7 +8887,6 @@ impl SetDisks {
|
||||
Arc::new((
|
||||
self.ctx.begin_namespace_commit(),
|
||||
commit_context.guard.clone(),
|
||||
commit_context.transaction_guard.clone(),
|
||||
commit_context
|
||||
.options
|
||||
.and_then(|options| options.object_lock_config_snapshot.clone()),
|
||||
@@ -8953,11 +8926,7 @@ impl SetDisks {
|
||||
|
||||
for disk in disks.iter() {
|
||||
let disk_namespace_owner = namespace_owner.clone().map(|owner| owner as Arc<dyn Send + Sync>);
|
||||
let transaction_guard = commit_context.transaction_guard.as_ref();
|
||||
futures.push(async move {
|
||||
if transaction_guard.is_some_and(|guard| guard.is_lock_lost()) {
|
||||
return Err(DiskError::DiskOngoingReq);
|
||||
}
|
||||
if let Some(disk) = disk {
|
||||
let options = DeleteOptions {
|
||||
old_data_dir: Some(rollback_dir),
|
||||
@@ -9007,7 +8976,6 @@ impl SetDisks {
|
||||
}
|
||||
}
|
||||
|
||||
commit_context.ensure_transaction_lock_held(bucket, object)?;
|
||||
let mut quorum_result = resolve_tiered_decommission_write_quorum_result(&errs, write_quorum, bucket, object);
|
||||
if !is_meta_bucketname(bucket) && errs.iter().flatten().any(super::delete_recovery::unsupported_recovery) {
|
||||
quorum_result = Err(DiskError::UnsupportedDisk.into());
|
||||
@@ -9040,7 +9008,6 @@ impl SetDisks {
|
||||
write_quorum,
|
||||
DeleteRecoveryContext {
|
||||
recovery_ticket,
|
||||
transaction_guard: commit_context.transaction_guard.clone(),
|
||||
namespace_owner: namespace_owner.clone().map(|owner| owner as Arc<dyn Send + Sync>),
|
||||
..DeleteRecoveryContext::new(source_bucket_incarnation_id, &|| commit_context.can_commit(bucket, object))
|
||||
},
|
||||
@@ -9050,7 +9017,6 @@ impl SetDisks {
|
||||
}
|
||||
#[cfg(test)]
|
||||
pause_delete_before_cleanup(bucket).await;
|
||||
commit_context.ensure_transaction_lock_held(bucket, object)?;
|
||||
let mut rollback_futures = Vec::new();
|
||||
for (index, err) in errs.iter().enumerate() {
|
||||
if structured_cleanup {
|
||||
@@ -9076,11 +9042,7 @@ impl SetDisks {
|
||||
let object = object.to_string();
|
||||
let fi = fi.clone();
|
||||
let disk_namespace_owner = namespace_owner.clone().map(|owner| owner as Arc<dyn Send + Sync>);
|
||||
let transaction_guard = commit_context.transaction_guard.as_ref();
|
||||
rollback_futures.push(async move {
|
||||
if transaction_guard.is_some_and(|guard| guard.is_lock_lost()) {
|
||||
return;
|
||||
}
|
||||
if should_rollback {
|
||||
// The dedicated undo path never forwards the marker-only creation flag.
|
||||
if let Err(err) = disk
|
||||
@@ -9137,7 +9099,6 @@ impl SetDisks {
|
||||
}
|
||||
|
||||
join_all(rollback_futures).await;
|
||||
commit_context.ensure_transaction_lock_held(bucket, object)?;
|
||||
drop(namespace_owner);
|
||||
if quorum_result.is_ok()
|
||||
&& errs.iter().any(Option::is_some)
|
||||
@@ -9597,8 +9558,9 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
&self,
|
||||
bucket: &str,
|
||||
objects: Vec<ObjectToDelete>,
|
||||
mut opts: ObjectOptions,
|
||||
opts: ObjectOptions,
|
||||
) -> (Vec<DeletedObject>, Vec<Option<Error>>, Vec<Option<DeleteAccounting>>) {
|
||||
let current_generations = opts.conditional_delete_generations.as_deref();
|
||||
let mut del_objects = vec![DeletedObject::default(); objects.len()];
|
||||
let mut accounting = vec![None; objects.len()];
|
||||
let delete_config_snapshot = opts
|
||||
@@ -9693,30 +9655,6 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
}
|
||||
}
|
||||
|
||||
let outer_namespace_lock_fence = opts.namespace_lock_fence.clone();
|
||||
let mut transaction_guards = std::collections::BTreeMap::new();
|
||||
if !is_meta_bucketname(bucket) {
|
||||
// Every raw batch lock is acquired first. Canonical sorting also
|
||||
// gives aliases of one disk key exactly one transaction owner.
|
||||
let keys: std::collections::BTreeSet<_> = locked_objects.iter().cloned().collect();
|
||||
for key in keys {
|
||||
match self.acquire_delete_transaction_lock(bucket, &key).await {
|
||||
Ok(guard) => {
|
||||
opts.add_namespace_lock_guard(&guard);
|
||||
transaction_guards.insert(key, guard);
|
||||
}
|
||||
Err(error) => {
|
||||
for (index, lock_name) in lock_names.iter().enumerate() {
|
||||
if lock_name.as_ref() == key {
|
||||
del_errs[index] = Some(error.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
let transaction_guards = Arc::new(transaction_guards);
|
||||
let current_generations = opts.conditional_delete_generations.as_deref();
|
||||
let object_lock_config = if is_meta_bucketname(bucket) {
|
||||
Arc::new(ObjectLockConfigSnapshot::new(ObjectLockConfigState::ConfirmedAbsent))
|
||||
} else {
|
||||
@@ -9814,7 +9752,6 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
&dobj.object_name,
|
||||
DeleteRecoveryContext {
|
||||
dry_run: !opts.no_lock,
|
||||
transaction_guard: transaction_guards.get(lock_names[i].as_ref()).cloned(),
|
||||
namespace_owner: opts.delete_mutation_owner.clone(),
|
||||
..DeleteRecoveryContext::new(opts.expected_bucket_incarnation_id, &|| {
|
||||
ensure_delete_commit_locks_held(None, bucket, &dobj.object_name, &opts).is_ok()
|
||||
@@ -10096,7 +10033,6 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
let namespace_owner = (!is_meta_bucketname(bucket)).then(|| {
|
||||
Arc::new((
|
||||
self.ctx.begin_namespace_commit(),
|
||||
Arc::clone(&transaction_guards),
|
||||
opts.delete_mutation_owner.clone(),
|
||||
opts.object_lock_config_snapshot.clone(),
|
||||
opts.scanner_publication_commit_scope.clone(),
|
||||
@@ -10272,24 +10208,6 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
}
|
||||
|
||||
let results = join_all(futures).await;
|
||||
if transaction_guards.values().any(|guard| guard.is_lock_lost()) {
|
||||
for (index, object) in objects.iter().enumerate() {
|
||||
if del_errs[index].is_none() {
|
||||
accounting[index] = None;
|
||||
del_errs[index] = Some(StorageError::NamespaceLockQuorumUnavailable {
|
||||
mode: "delete_transaction",
|
||||
bucket: bucket.to_owned(),
|
||||
object: object.object_name.clone(),
|
||||
required: 1,
|
||||
achieved: 0,
|
||||
});
|
||||
}
|
||||
}
|
||||
if dist_erasure {
|
||||
self.release_dist_delete_object_locks_batch(dist_batch_lock_ids).await;
|
||||
}
|
||||
return (del_objects, del_errs, accounting);
|
||||
}
|
||||
|
||||
let mut del_obj_errs: Vec<Vec<Option<DiskError>>> = vec![vec![None; objects.len()]; disks.len()];
|
||||
|
||||
@@ -10385,9 +10303,6 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
let group = &vers[index];
|
||||
let recovery_ticket = recovery_tickets[index].clone();
|
||||
let namespace_owner = namespace_owner.clone();
|
||||
let transaction_guard = transaction_guards
|
||||
.get(object_name_disk_identity(&group.name).as_ref())
|
||||
.cloned();
|
||||
let disks = &disks;
|
||||
let opts = &opts;
|
||||
async move {
|
||||
@@ -10408,7 +10323,6 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
DeleteRecoveryContext {
|
||||
recovery_ticket,
|
||||
namespace_owner,
|
||||
transaction_guard,
|
||||
..DeleteRecoveryContext::new(opts.expected_bucket_incarnation_id, &can_commit)
|
||||
},
|
||||
)
|
||||
@@ -10455,11 +10369,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
let object = fi_vers.name.clone();
|
||||
let versions = fi_vers.clone();
|
||||
let disk_namespace_owner = namespace_owner.clone();
|
||||
let transaction_guard = transaction_guards.get(object_name_disk_identity(&object).as_ref()).cloned();
|
||||
rollback_futures.push(async move {
|
||||
if transaction_guard.as_ref().is_some_and(|guard| guard.is_lock_lost()) {
|
||||
return;
|
||||
}
|
||||
if should_rollback {
|
||||
let errs = disk
|
||||
.delete_versions_with_namespace_owner(
|
||||
@@ -10535,16 +10445,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
if del_errs[index].is_none() {
|
||||
let object = &objects[index].object_name;
|
||||
let result = match ensure_delete_commit_locks_held(None, bucket, object, &opts) {
|
||||
Ok(()) => {
|
||||
self.reclaim_missing_delete_residue(
|
||||
bucket,
|
||||
object,
|
||||
&opts,
|
||||
None,
|
||||
transaction_guards.get(object_name_disk_identity(object).as_ref()),
|
||||
)
|
||||
.await
|
||||
}
|
||||
Ok(()) => self.reclaim_missing_delete_residue(bucket, object, &opts, None).await,
|
||||
Err(err) => Err(err),
|
||||
};
|
||||
if let Err(err) = result {
|
||||
@@ -10553,13 +10454,6 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
}
|
||||
}
|
||||
|
||||
// Deferred recovery takes fresh raw and transaction locks. Discard the
|
||||
// completed leases' deadlines while retaining every caller-owned fence.
|
||||
opts.namespace_lock_fence = outer_namespace_lock_fence;
|
||||
// Release inner owners before reacquiring any raw key lock.
|
||||
drop(namespace_owner);
|
||||
drop(transaction_guards);
|
||||
|
||||
// TODO(backlog): support partial object deletion for multi-part objects
|
||||
|
||||
if dist_erasure {
|
||||
@@ -10669,16 +10563,6 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
} else {
|
||||
None
|
||||
};
|
||||
// Lock order: the caller's raw object lock, then this target set's
|
||||
// transaction key. The inner key remains distinct even when pool
|
||||
// client quorums overlap, and no_lock never bypasses journal ownership.
|
||||
let transaction_guard = if !is_meta_bucketname(bucket) && (!opts.delete_prefix || opts.delete_prefix_object) {
|
||||
let guard = self.acquire_delete_transaction_lock(bucket, object).await?;
|
||||
opts.add_namespace_lock_guard(&guard);
|
||||
Some(guard)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
if opts.delete_prefix {
|
||||
let destructive_dispatch_phase = opts.lifecycle_delete_all.as_ref().is_none_or(|request| {
|
||||
matches!(
|
||||
@@ -10779,8 +10663,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
&delete_request,
|
||||
false,
|
||||
None,
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref())
|
||||
.with_transaction_guard(transaction_guard.as_ref()),
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref()),
|
||||
)
|
||||
.await?;
|
||||
if let Some((_, deleted_object)) = replication_delete {
|
||||
@@ -10814,8 +10697,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
&delete_request,
|
||||
false,
|
||||
None,
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref())
|
||||
.with_transaction_guard(transaction_guard.as_ref()),
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref()),
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
@@ -10835,8 +10717,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
&delete_request,
|
||||
false,
|
||||
None,
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref())
|
||||
.with_transaction_guard(transaction_guard.as_ref()),
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref()),
|
||||
)
|
||||
.await?;
|
||||
}
|
||||
@@ -10925,7 +10806,6 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
bucket,
|
||||
object,
|
||||
DeleteRecoveryContext {
|
||||
transaction_guard: transaction_guard.clone(),
|
||||
namespace_owner: Some(Arc::new((
|
||||
self.ctx.begin_namespace_commit(),
|
||||
_lock_guard.clone(),
|
||||
@@ -10966,7 +10846,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
if is_err_object_not_found(err) {
|
||||
ensure_delete_commit_locks_held(_lock_guard.as_deref(), bucket, object, &opts)?;
|
||||
if self
|
||||
.reclaim_missing_delete_residue(bucket, object, &opts, _lock_guard.as_ref(), transaction_guard.as_ref())
|
||||
.reclaim_missing_delete_residue(bucket, object, &opts, _lock_guard.as_ref())
|
||||
.await?
|
||||
{
|
||||
if let Some(scope) = scanner_publication_commit_scope.as_ref() {
|
||||
@@ -11016,7 +10896,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
&dfi,
|
||||
false,
|
||||
None,
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref()).with_transaction_guard(transaction_guard.as_ref()),
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref()),
|
||||
)
|
||||
.await
|
||||
.map_err(|e| to_object_err(e, vec![bucket, object]))?;
|
||||
@@ -11118,7 +10998,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
&fi,
|
||||
should_force_delete_marker_for_missing_version(&opts),
|
||||
delete_marker_purge.clone(),
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref()).with_transaction_guard(transaction_guard.as_ref()),
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref()),
|
||||
)
|
||||
.await
|
||||
.map_err(|e| to_object_err(e, vec![bucket, object]))?;
|
||||
@@ -11183,7 +11063,7 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
&dfi,
|
||||
opts.delete_marker,
|
||||
delete_marker_purge,
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref()).with_transaction_guard(transaction_guard.as_ref()),
|
||||
DeleteCommitContext::request(&opts, _lock_guard.as_ref()),
|
||||
)
|
||||
.await
|
||||
.map_err(|e| to_object_err(e, vec![bucket, object]))?;
|
||||
@@ -11958,12 +11838,13 @@ impl crate::storage_api_contracts::object::ObjectOperations for SetDisks {
|
||||
let bucket_lifecycle_guard = if let Some(expected_incarnation_id) = opts.expected_bucket_incarnation_id
|
||||
&& opts.bucket_lifecycle_lock_fence.is_none()
|
||||
{
|
||||
Some(
|
||||
metadata_sys::object_store_in(&self.ctx)
|
||||
.await?
|
||||
.acquire_bucket_incarnation_fence_with_options(bucket, expected_incarnation_id, Some(opts))
|
||||
.await?,
|
||||
)
|
||||
let guard = metadata_sys::object_store_in(&self.ctx)
|
||||
.await?
|
||||
.acquire_bucket_lifecycle_read_lock(bucket)
|
||||
.await?;
|
||||
self.validate_bucket_incarnation(bucket, expected_incarnation_id, opts)
|
||||
.await?;
|
||||
Some(guard)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
@@ -25525,7 +25406,6 @@ mod delete_objects_lock_gating_tests {
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial_test::serial]
|
||||
async fn delete_object_aborts_when_outer_lock_is_lost_at_commit() {
|
||||
let (_temp_dirs, disk_stores, set_disks) = hermetic_set_disks(4).await;
|
||||
let bucket = "single-lost-outer-lock";
|
||||
@@ -25746,13 +25626,6 @@ mod delete_objects_lock_gating_tests {
|
||||
.as_fast_lock_manager()
|
||||
.expect("isolated fixture should use the local lock manager");
|
||||
let lock_metrics = lock_manager.get_metrics().shard_metrics;
|
||||
let raw_key = ObjectKey::new(bucket, "obj-a");
|
||||
let raw_holder = lock_manager.get_lock_info(&raw_key).expect("outer holder must be visible");
|
||||
let transaction_key = ObjectKey::with_version(
|
||||
bucket,
|
||||
"obj-a",
|
||||
format!("rustfs:delete-transaction:{}:{}", set_disks.pool_index, set_disks.set_index),
|
||||
);
|
||||
assert_eq!(lock_manager.current_lock_counts(), (1, 0));
|
||||
let mut delete = Box::pin(set_disks.delete_objects(
|
||||
bucket,
|
||||
@@ -25769,43 +25642,23 @@ mod delete_objects_lock_gating_tests {
|
||||
// than a second on CI without waiting for the namespace lock at all.
|
||||
let deletion = futures::future::poll_fn(|cx| {
|
||||
let result = std::future::Future::poll(delete.as_mut(), cx);
|
||||
let current_holder = lock_manager.get_lock_info(&raw_key).expect("outer holder must remain held");
|
||||
assert_eq!(
|
||||
(current_holder.mode, ¤t_holder.owner, current_holder.acquired_at),
|
||||
(raw_holder.mode, &raw_holder.owner, raw_holder.acquired_at),
|
||||
"no_lock must preserve the original raw object holder"
|
||||
);
|
||||
let transaction_holder = lock_manager.get_lock_info(&transaction_key);
|
||||
if let Some(holder) = &transaction_holder {
|
||||
assert_eq!(holder.mode, rustfs_lock::LockMode::Exclusive);
|
||||
}
|
||||
assert_eq!(
|
||||
lock_manager.current_lock_counts(),
|
||||
(1 + u64::from(transaction_holder.is_some()), 0),
|
||||
"only the distinct transaction owner may be added, without raw-key waiters"
|
||||
(1, 0),
|
||||
"no_lock batch delete must preserve the outer holder without adding lock waiters"
|
||||
);
|
||||
let current = lock_manager.get_metrics().shard_metrics;
|
||||
assert!(
|
||||
current.total_acquisitions() <= lock_metrics.total_acquisitions() + 1,
|
||||
"the transaction owner must be reused by inline recovery"
|
||||
assert_eq!(
|
||||
(current.total_acquisitions(), current.timeouts),
|
||||
(lock_metrics.total_acquisitions(), lock_metrics.timeouts),
|
||||
"no_lock batch delete must not acquire or time out on another namespace lock"
|
||||
);
|
||||
assert_eq!(current.timeouts, lock_metrics.timeouts, "the raw key must never be reacquired");
|
||||
result
|
||||
});
|
||||
let (deleted, errs) = tokio::time::timeout(Duration::from_secs(30), deletion)
|
||||
.await
|
||||
.expect("no_lock batch delete disk work should complete");
|
||||
|
||||
assert_eq!(lock_manager.current_lock_counts(), (1, 0));
|
||||
assert!(
|
||||
lock_manager.get_lock_info(&transaction_key).is_none(),
|
||||
"the transaction owner must be released"
|
||||
);
|
||||
assert_eq!(
|
||||
lock_manager.get_metrics().shard_metrics.total_acquisitions(),
|
||||
lock_metrics.total_acquisitions() + 1,
|
||||
"no_lock still requires exactly one distinct transaction owner"
|
||||
);
|
||||
assert!(errs[0].is_none(), "no_lock batch delete should not fail with a lock error: {:?}", errs[0]);
|
||||
assert!(deleted[0].found, "existing object must still be deleted");
|
||||
for disk in &disk_stores {
|
||||
|
||||
@@ -448,14 +448,6 @@ impl ECStore {
|
||||
await_orphan_bucket_recovery(bucket, &publication_guard, &lifecycle_guard, &metadata_guard, &ns_guard, recover).await
|
||||
}
|
||||
|
||||
/// Read quota and bucket identity from one authoritative metadata snapshot.
|
||||
pub async fn bucket_quota_and_incarnation_from_disk(
|
||||
&self,
|
||||
bucket: &str,
|
||||
) -> Result<(Option<crate::bucket::quota::BucketQuota>, Uuid, OffsetDateTime)> {
|
||||
metadata_sys::get_quota_config_and_incarnation_from_disk_in(&self.ctx, bucket).await
|
||||
}
|
||||
|
||||
pub async fn get_bucket_metadata(&self, bucket: &str) -> Result<Arc<BucketMetadata>> {
|
||||
let sys = metadata_sys::require_bucket_metadata_sys_in(&self.ctx)?;
|
||||
sys.read().await.get(bucket).await
|
||||
@@ -572,83 +564,13 @@ impl ECStore {
|
||||
.await
|
||||
}
|
||||
|
||||
pub(crate) async fn acquire_bucket_incarnation_fence_with_options(
|
||||
pub(super) async fn acquire_bucket_incarnation_fence_with_options(
|
||||
&self,
|
||||
bucket: &str,
|
||||
expected: Uuid,
|
||||
opts: Option<&ObjectOptions>,
|
||||
) -> Result<super::BucketIncarnationFenceGuard> {
|
||||
Ok(self
|
||||
.acquire_bucket_incarnation_fence_for_options(bucket, Some(expected), opts)
|
||||
.await?
|
||||
.0)
|
||||
}
|
||||
|
||||
pub(crate) async fn acquire_bucket_incarnation_fence_for_options(
|
||||
&self,
|
||||
bucket: &str,
|
||||
expected: Option<Uuid>,
|
||||
opts: Option<&ObjectOptions>,
|
||||
) -> Result<(super::BucketIncarnationFenceGuard, Uuid)> {
|
||||
let inner = self.acquire_bucket_lifecycle_read_lock(bucket).await?;
|
||||
self.validate_bucket_incarnation_fence_guard_with_options(bucket, inner, expected, opts)
|
||||
.await
|
||||
}
|
||||
|
||||
/// Acquire lexicographically ordered bucket lifecycle read locks for a copy
|
||||
/// operation and validate both bucket incarnations through [`super::BucketFenceRegistry`].
|
||||
pub async fn acquire_copy_bucket_incarnation_fences(
|
||||
&self,
|
||||
source_bucket: &str,
|
||||
expected_source: Option<Uuid>,
|
||||
destination_bucket: &str,
|
||||
expected_destination: Option<Uuid>,
|
||||
) -> Result<(super::BucketIncarnationFenceGuard, Uuid, Option<super::BucketIncarnationFenceGuard>, Uuid)> {
|
||||
let (source_guard, destination_guard) = if source_bucket == destination_bucket {
|
||||
(self.acquire_bucket_lifecycle_read_lock(source_bucket).await?, None)
|
||||
} else if source_bucket < destination_bucket {
|
||||
let source_guard = self.acquire_bucket_lifecycle_read_lock(source_bucket).await?;
|
||||
let destination_guard = self.acquire_bucket_lifecycle_read_lock(destination_bucket).await?;
|
||||
(source_guard, Some(destination_guard))
|
||||
} else {
|
||||
let destination_guard = self.acquire_bucket_lifecycle_read_lock(destination_bucket).await?;
|
||||
let source_guard = self.acquire_bucket_lifecycle_read_lock(source_bucket).await?;
|
||||
(source_guard, Some(destination_guard))
|
||||
};
|
||||
let (source_guard, current_source_incarnation_id) = self
|
||||
.validate_bucket_incarnation_fence_guard_with_options(source_bucket, source_guard, expected_source, None)
|
||||
.await?;
|
||||
let (destination_guard, current_destination_incarnation_id) = if let Some(destination_guard) = destination_guard {
|
||||
let (destination_guard, destination_incarnation_id) = self
|
||||
.validate_bucket_incarnation_fence_guard_with_options(
|
||||
destination_bucket,
|
||||
destination_guard,
|
||||
expected_destination,
|
||||
None,
|
||||
)
|
||||
.await?;
|
||||
(Some(destination_guard), destination_incarnation_id)
|
||||
} else {
|
||||
if expected_destination.is_some_and(|expected| expected != current_source_incarnation_id) {
|
||||
return Err(StorageError::BucketNotFound(destination_bucket.to_owned()));
|
||||
}
|
||||
(None, current_source_incarnation_id)
|
||||
};
|
||||
Ok((
|
||||
source_guard,
|
||||
current_source_incarnation_id,
|
||||
destination_guard,
|
||||
current_destination_incarnation_id,
|
||||
))
|
||||
}
|
||||
|
||||
async fn validate_bucket_incarnation_fence_guard_with_options(
|
||||
&self,
|
||||
bucket: &str,
|
||||
inner: rustfs_lock::NamespaceLockGuard,
|
||||
expected: Option<Uuid>,
|
||||
opts: Option<&ObjectOptions>,
|
||||
) -> Result<(super::BucketIncarnationFenceGuard, Uuid)> {
|
||||
let mut guard = super::BucketIncarnationFenceGuard::new(
|
||||
Arc::clone(&self.bucket_fence_registry),
|
||||
bucket,
|
||||
@@ -664,10 +586,10 @@ impl ECStore {
|
||||
}
|
||||
})
|
||||
.await?;
|
||||
if expected.is_some_and(|expected| current != expected) {
|
||||
if current != expected {
|
||||
return Err(StorageError::BucketNotFound(bucket.to_owned()));
|
||||
}
|
||||
Ok((guard, current))
|
||||
Ok(guard)
|
||||
}
|
||||
|
||||
/// Hold this guard through recursive-delete authorization and mutation so
|
||||
|
||||
@@ -149,18 +149,6 @@ impl BucketFenceRegistry {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Return the memoized incarnation id for `bucket` when at least one
|
||||
/// registered lifecycle read guard is currently held without lock loss.
|
||||
pub(crate) fn validated_incarnation(&self, bucket: &str) -> Option<Uuid> {
|
||||
let mut entries = self.entries.lock().expect("bucket fence registry poisoned");
|
||||
let entry = entries.get_mut(bucket)?;
|
||||
if entry.guards.iter().any(|guard| guard.loss_probe.is_lost()) {
|
||||
entry.validated = None;
|
||||
return None;
|
||||
}
|
||||
entry.validated
|
||||
}
|
||||
}
|
||||
|
||||
/// Owns continuous lifecycle coverage and its incarnation validation memo.
|
||||
@@ -233,7 +221,7 @@ impl BucketIncarnationFenceGuard {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn is_lock_lost(&self) -> bool {
|
||||
pub(crate) fn is_lock_lost(&self) -> bool {
|
||||
self.inner.as_ref().is_some_and(NamespaceLockGuard::is_lock_lost)
|
||||
}
|
||||
|
||||
@@ -322,16 +310,9 @@ mod tests {
|
||||
let (first_probe, first_lost) = controllable_probe();
|
||||
let first = reg.enter("b", first_probe);
|
||||
assert_eq!(first.memoized, None);
|
||||
assert_eq!(reg.validated_incarnation("b"), None);
|
||||
reg.memoize("b", uuid(7));
|
||||
assert_eq!(reg.validated_incarnation("b"), Some(uuid(7)));
|
||||
|
||||
first_lost.store(true, std::sync::atomic::Ordering::SeqCst);
|
||||
assert_eq!(
|
||||
reg.validated_incarnation("b"),
|
||||
None,
|
||||
"live lost guard must clear and block validated_incarnation"
|
||||
);
|
||||
|
||||
let second = reg.enter("b", live_probe());
|
||||
assert_eq!(second.memoized, None, "live lost guard must force disk revalidation");
|
||||
@@ -339,11 +320,9 @@ mod tests {
|
||||
|
||||
let third = reg.enter("b", live_probe());
|
||||
assert_eq!(third.memoized, None, "memo remains blocked while the lost guard is live");
|
||||
assert_eq!(reg.validated_incarnation("b"), None);
|
||||
|
||||
reg.exit("b", first.token, true);
|
||||
reg.memoize("b", uuid(8));
|
||||
assert_eq!(reg.validated_incarnation("b"), Some(uuid(8)));
|
||||
let fourth = reg.enter("b", live_probe());
|
||||
assert_eq!(fourth.memoized, Some(uuid(8)), "memo resumes after lost coverage leaves");
|
||||
|
||||
|
||||
@@ -21384,141 +21384,6 @@ mod tests {
|
||||
shutdown.cancel();
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial_test::serial(storage_class_env)]
|
||||
async fn put_object_metadata_and_copy_object_reuse_overlapping_incarnation_fence() {
|
||||
let temp = tempfile::tempdir().expect("create metadata/copy fence store");
|
||||
let (_ctx, store, shutdown) =
|
||||
without_storage_class_env(build_isolated_test_store(temp.path(), "metadata-copy-fence-reuse", &[4])).await;
|
||||
crate::bucket::metadata_sys::init_bucket_metadata_sys(store.clone(), Vec::new()).await;
|
||||
let bucket = format!("metadata-copy-fence-{}", Uuid::new_v4());
|
||||
store
|
||||
.make_bucket(&bucket, &MakeBucketOptions::default())
|
||||
.await
|
||||
.expect("create bucket");
|
||||
let mut seed_reader = PutObjReader::from_vec(b"seed payload".to_vec());
|
||||
let versioned_opts = ObjectOptions {
|
||||
versioned: true,
|
||||
..Default::default()
|
||||
};
|
||||
let mut src_info = store
|
||||
.put_object(&bucket, "src.bin", &mut seed_reader, &versioned_opts)
|
||||
.await
|
||||
.expect("seed source object");
|
||||
let src_version_id = src_info
|
||||
.version_id
|
||||
.expect("versioned PUT should return a version ID")
|
||||
.to_string();
|
||||
let expected = store.bucket_incarnation_id(&bucket).await.expect("read incarnation");
|
||||
let coverage = store
|
||||
.acquire_bucket_incarnation_fence(&bucket, expected)
|
||||
.await
|
||||
.expect("validate continuous coverage");
|
||||
let metadata_writer = crate::bucket::metadata_sys::acquire_bucket_metadata_transaction_lock_in(&store.ctx, &bucket)
|
||||
.await
|
||||
.expect("hold metadata writer during covered metadata and copy operations");
|
||||
|
||||
let updated = tokio::time::timeout(
|
||||
Duration::from_secs(10),
|
||||
store.put_object_metadata(
|
||||
&bucket,
|
||||
"src.bin",
|
||||
&ObjectOptions {
|
||||
version_id: Some(src_version_id.clone()),
|
||||
versioned: true,
|
||||
eval_metadata: Some(HashMap::from([("x-amz-meta-fenced".to_string(), "true".to_string())])),
|
||||
..Default::default()
|
||||
},
|
||||
),
|
||||
)
|
||||
.await
|
||||
.expect("covered put_object_metadata must not reacquire the metadata transaction lock")
|
||||
.expect("update object metadata using authoritative memo");
|
||||
assert_eq!(updated.user_defined.get("x-amz-meta-fenced").map(String::as_str), Some("true"));
|
||||
|
||||
Arc::make_mut(&mut src_info.user_defined).insert("x-amz-meta-copied".to_string(), "true".to_string());
|
||||
let src_copy_opts = ObjectOptions {
|
||||
version_id: Some(src_version_id),
|
||||
versioned: true,
|
||||
..Default::default()
|
||||
};
|
||||
let copied = tokio::time::timeout(
|
||||
Duration::from_secs(10),
|
||||
store.copy_object(&bucket, "src.bin", &bucket, "src.bin", &mut src_info, &src_copy_opts, &versioned_opts),
|
||||
)
|
||||
.await
|
||||
.expect("covered versioned copy_object must not reacquire the metadata transaction lock")
|
||||
.expect("versioned copy using authoritative memo");
|
||||
assert_eq!(copied.user_defined.get("x-amz-meta-copied").map(String::as_str), Some("true"));
|
||||
|
||||
let (src_guard, src_incarnation, dst_guard, dst_incarnation) = tokio::time::timeout(
|
||||
Duration::from_secs(10),
|
||||
store.acquire_copy_bucket_incarnation_fences(&bucket, Some(expected), &bucket, Some(expected)),
|
||||
)
|
||||
.await
|
||||
.expect("covered acquire_copy_bucket_incarnation_fences must not reacquire the metadata transaction lock")
|
||||
.expect("validate same-bucket copy fences using authoritative memo");
|
||||
assert!(dst_guard.is_none());
|
||||
assert_eq!(src_incarnation, expected);
|
||||
assert_eq!(dst_incarnation, expected);
|
||||
let mut borrowed_fence_opts = ObjectOptions {
|
||||
expected_bucket_incarnation_id: Some(expected),
|
||||
..Default::default()
|
||||
};
|
||||
src_guard.attach_to_object_options(&mut borrowed_fence_opts);
|
||||
let fenced_incarnation = tokio::time::timeout(
|
||||
Duration::from_secs(10),
|
||||
crate::bucket::metadata_sys::get_bucket_incarnation_id_for_options_in(&store.ctx, &bucket, &borrowed_fence_opts),
|
||||
)
|
||||
.await
|
||||
.expect("borrowed fence under active coverage must not reacquire the metadata transaction lock")
|
||||
.expect("resolve incarnation under borrowed fence");
|
||||
assert_eq!(fenced_incarnation, expected);
|
||||
assert!(
|
||||
matches!(
|
||||
store
|
||||
.acquire_copy_bucket_incarnation_fences(&bucket, Some(expected), &bucket, Some(Uuid::new_v4()))
|
||||
.await,
|
||||
Err(StorageError::BucketNotFound(_))
|
||||
),
|
||||
"same-bucket copy fence must reject a mismatched destination incarnation"
|
||||
);
|
||||
drop(src_guard);
|
||||
|
||||
let stale_opts = ObjectOptions {
|
||||
expected_bucket_incarnation_id: Some(Uuid::new_v4()),
|
||||
versioned: true,
|
||||
..Default::default()
|
||||
};
|
||||
assert!(
|
||||
matches!(
|
||||
store.put_object_metadata(&bucket, "src.bin", &stale_opts).await,
|
||||
Err(StorageError::BucketNotFound(_))
|
||||
),
|
||||
"put_object_metadata must reject a stale expected incarnation even under warm coverage"
|
||||
);
|
||||
assert!(
|
||||
matches!(
|
||||
store
|
||||
.copy_object(
|
||||
&bucket,
|
||||
"src.bin",
|
||||
&bucket,
|
||||
"src.bin",
|
||||
&mut src_info,
|
||||
&ObjectOptions::default(),
|
||||
&stale_opts,
|
||||
)
|
||||
.await,
|
||||
Err(StorageError::BucketNotFound(_))
|
||||
),
|
||||
"copy_object must reject a stale expected incarnation even under warm coverage"
|
||||
);
|
||||
drop(metadata_writer);
|
||||
drop(coverage);
|
||||
shutdown.cancel();
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial_test::serial(storage_class_env)]
|
||||
async fn multipart_snapshot_bypasses_initializer_queued_behind_metadata_writer() {
|
||||
@@ -21604,25 +21469,10 @@ mod tests {
|
||||
.acquire_bucket_incarnation_fence(&bucket, old)
|
||||
.await
|
||||
.expect("validate with no-op lock");
|
||||
let snapshot = store
|
||||
.object_lock_config_snapshot_under_lifecycle_fence(&bucket, &crate::object_api::NamespaceLockFence::new())
|
||||
.await
|
||||
.expect("capture snapshot under no-op lock");
|
||||
let current = Uuid::new_v4();
|
||||
crate::bucket::metadata::save_bucket_incarnation(store.clone(), &bucket, current)
|
||||
.await
|
||||
.expect("replace authority while no-op guard provides no exclusion");
|
||||
let snapshot_opts = ObjectOptions {
|
||||
expected_bucket_incarnation_id: Some(old),
|
||||
object_lock_config_snapshot: Some(snapshot),
|
||||
..Default::default()
|
||||
};
|
||||
assert_eq!(
|
||||
crate::bucket::metadata_sys::get_bucket_incarnation_id_for_options_in(&store.ctx, &bucket, &snapshot_opts)
|
||||
.await
|
||||
.expect("disabled lock manager must re-read incarnation from disk instead of trusting snapshot"),
|
||||
current
|
||||
);
|
||||
assert!(
|
||||
matches!(
|
||||
store.acquire_bucket_incarnation_fence(&bucket, old).await,
|
||||
|
||||
@@ -1030,19 +1030,16 @@ impl ECStore {
|
||||
// Lock order matches writes: bucket lifecycle, metadata validation,
|
||||
// then object namespace. Borrow fences supplied by an outer operation.
|
||||
let bucket_guard = if opts.bucket_lifecycle_lock_fence.is_none() {
|
||||
let guard = self
|
||||
.acquire_bucket_incarnation_fence_with_options(bucket, bucket_incarnation_id, Some(&opts))
|
||||
.await?;
|
||||
guard.attach_to_object_options(&mut opts);
|
||||
let guard = self.acquire_bucket_lifecycle_read_lock(bucket).await?;
|
||||
opts.add_bucket_lifecycle_lock_guard(&guard);
|
||||
Some(guard)
|
||||
} else {
|
||||
let incarnation =
|
||||
crate::bucket::metadata_sys::get_bucket_incarnation_id_for_options_in(&self.ctx, bucket, &opts).await?;
|
||||
if incarnation != bucket_incarnation_id {
|
||||
return Err(Error::BucketNotFound(bucket.to_owned()));
|
||||
}
|
||||
None
|
||||
};
|
||||
let incarnation = crate::bucket::metadata_sys::get_bucket_incarnation_id_for_options_in(&self.ctx, bucket, &opts).await?;
|
||||
if incarnation != bucket_incarnation_id {
|
||||
return Err(Error::BucketNotFound(bucket.to_owned()));
|
||||
}
|
||||
let metadata_sys = crate::bucket::metadata_sys::bucket_metadata_sys_of(&self.ctx)?;
|
||||
let metadata_sys = metadata_sys.read().await.clone();
|
||||
let (versioning, _) = metadata_sys.get_versioning_config(bucket).await?;
|
||||
|
||||
@@ -412,7 +412,7 @@ impl ECStore {
|
||||
|
||||
/// Multipart lock order is bucket lifecycle, generation validation, then
|
||||
/// object/upload locks in the selected set.
|
||||
pub(super) async fn guard_multipart_bucket_incarnation(
|
||||
async fn guard_multipart_bucket_incarnation(
|
||||
&self,
|
||||
bucket: &str,
|
||||
opts: &ObjectOptions,
|
||||
|
||||
@@ -30,8 +30,8 @@ use crate::bucket::lifecycle::{
|
||||
},
|
||||
};
|
||||
use crate::bucket::metadata_sys::{
|
||||
acquire_bucket_metadata_transaction_read_lock_in, get_cached_bucket_incarnation_id_in, get_delete_config_from_disk_in,
|
||||
get_object_lock_config_and_incarnation_from_disk_in,
|
||||
acquire_bucket_metadata_transaction_read_lock_in, get_bucket_incarnation_id_for_options_in,
|
||||
get_cached_bucket_incarnation_id_in, get_delete_config_from_disk_in, get_object_lock_config_and_incarnation_from_disk_in,
|
||||
};
|
||||
use crate::bucket::object_lock::objectlock_sys::{
|
||||
check_object_lock_for_deletion_with_state, ensure_recursive_force_delete_allowed_for_state,
|
||||
@@ -4883,20 +4883,24 @@ impl ECStore {
|
||||
if !is_meta_bucketname(dst_bucket) && dst_opts.expected_bucket_incarnation_id.is_none() {
|
||||
dst_opts.expected_bucket_incarnation_id = Some(self.bucket_incarnation_id(dst_bucket).await?);
|
||||
}
|
||||
let (_bucket_lifecycle_guard, current_bucket_incarnation_id) =
|
||||
if is_meta_bucketname(dst_bucket) || dst_opts.bucket_lifecycle_lock_fence.is_some() {
|
||||
(None, dst_opts.expected_bucket_incarnation_id)
|
||||
} else {
|
||||
let (guard, current_incarnation_id) = self
|
||||
.acquire_bucket_incarnation_fence_for_options(
|
||||
dst_bucket,
|
||||
dst_opts.expected_bucket_incarnation_id,
|
||||
Some(&dst_opts),
|
||||
)
|
||||
.await?;
|
||||
guard.attach_to_object_options(&mut dst_opts);
|
||||
(Some(guard), Some(current_incarnation_id))
|
||||
};
|
||||
let _bucket_lifecycle_guard = if is_meta_bucketname(dst_bucket) || dst_opts.bucket_lifecycle_lock_fence.is_some() {
|
||||
None
|
||||
} else {
|
||||
Some(self.acquire_bucket_lifecycle_read_lock(dst_bucket).await?)
|
||||
};
|
||||
let current_bucket_incarnation_id = if let Some(guard) = _bucket_lifecycle_guard.as_ref() {
|
||||
dst_opts.add_bucket_lifecycle_lock_guard(guard);
|
||||
let current_incarnation_id = get_bucket_incarnation_id_for_options_in(&self.ctx, dst_bucket, &dst_opts).await?;
|
||||
if dst_opts
|
||||
.expected_bucket_incarnation_id
|
||||
.is_some_and(|expected| expected != current_incarnation_id)
|
||||
{
|
||||
return Err(StorageError::BucketNotFound(dst_bucket.to_string()));
|
||||
}
|
||||
Some(current_incarnation_id)
|
||||
} else {
|
||||
dst_opts.expected_bucket_incarnation_id
|
||||
};
|
||||
if dst_opts
|
||||
.bucket_lifecycle_lock_fence
|
||||
.as_ref()
|
||||
@@ -6500,8 +6504,24 @@ impl ECStore {
|
||||
opts: &ObjectOptions,
|
||||
) -> Result<()> {
|
||||
let object = encode_dir_object(object);
|
||||
let opts = transition_restore_pool_opts(opts);
|
||||
let (mut opts, _bucket_lifecycle_guard) = self.guard_multipart_bucket_incarnation(bucket, &opts).await?;
|
||||
let mut opts = transition_restore_pool_opts(opts);
|
||||
if !is_meta_bucketname(bucket) && opts.expected_bucket_incarnation_id.is_none() {
|
||||
opts.expected_bucket_incarnation_id = Some(self.bucket_incarnation_id(bucket).await?);
|
||||
}
|
||||
let bucket_lifecycle_guard = if is_meta_bucketname(bucket) {
|
||||
None
|
||||
} else {
|
||||
Some(self.acquire_bucket_lifecycle_read_lock(bucket).await?)
|
||||
};
|
||||
if let Some(guard) = bucket_lifecycle_guard.as_ref() {
|
||||
opts.add_bucket_lifecycle_lock_guard(guard);
|
||||
}
|
||||
if !is_meta_bucketname(bucket) {
|
||||
let current_incarnation_id = get_bucket_incarnation_id_for_options_in(&self.ctx, bucket, &opts).await?;
|
||||
if opts.expected_bucket_incarnation_id != Some(current_incarnation_id) {
|
||||
return Err(StorageError::BucketNotFound(bucket.to_string()));
|
||||
}
|
||||
}
|
||||
if opts.overwrites_existing_version() && !is_meta_bucketname(bucket) {
|
||||
let expected_incarnation_id = opts
|
||||
.expected_bucket_incarnation_id
|
||||
@@ -6569,11 +6589,16 @@ impl ECStore {
|
||||
let bucket_lifecycle_guard = if is_meta_bucketname(bucket) {
|
||||
None
|
||||
} else {
|
||||
let (guard, current_incarnation_id) = self
|
||||
.acquire_bucket_incarnation_fence_for_options(bucket, opts.expected_bucket_incarnation_id, Some(&opts))
|
||||
.await?;
|
||||
let guard = self.acquire_bucket_lifecycle_read_lock(bucket).await?;
|
||||
let current_incarnation_id = get_bucket_incarnation_id_for_options_in(&self.ctx, bucket, &opts).await?;
|
||||
if opts
|
||||
.expected_bucket_incarnation_id
|
||||
.is_some_and(|expected| expected != current_incarnation_id)
|
||||
{
|
||||
return Err(StorageError::BucketNotFound(bucket.to_string()));
|
||||
}
|
||||
opts.expected_bucket_incarnation_id = Some(current_incarnation_id);
|
||||
guard.attach_to_object_options(&mut opts);
|
||||
opts.add_bucket_lifecycle_lock_guard(&guard);
|
||||
if guard.is_lock_lost() {
|
||||
return Err(Error::other("bucket lifecycle lock was lost before the metadata update"));
|
||||
}
|
||||
@@ -13142,202 +13167,6 @@ mod tests {
|
||||
})
|
||||
.await;
|
||||
}
|
||||
|
||||
async fn assert_delete_excludes_recovery_across_pool_lock_domains(topology: &str, batch: bool) {
|
||||
let ctx = Arc::new(crate::runtime::instance::InstanceContext::new());
|
||||
let (_first_dirs, first_set) = make_local_set_disks_with_ctx(4, 2, Arc::clone(&ctx)).await;
|
||||
let (_second_dirs, second_set) = make_local_set_disks_with_ctx(4, 2, Arc::clone(&ctx)).await;
|
||||
let mut store = new_prepared_reader_test_store_with_ctx(&[first_set, second_set], Arc::clone(&ctx)).await;
|
||||
let clients: Vec<Arc<dyn rustfs_lock::LockClient>> = (0..4)
|
||||
.map(|_| {
|
||||
Arc::new(rustfs_lock::LocalClient::with_manager(Arc::new(rustfs_lock::GlobalLockManager::Enabled(
|
||||
Arc::new(rustfs_lock::FastObjectLockManager::new()),
|
||||
)))) as Arc<dyn rustfs_lock::LockClient>
|
||||
})
|
||||
.collect();
|
||||
let domains = match topology {
|
||||
"disjoint" => [vec![clients[0].clone()], vec![clients[1].clone()]],
|
||||
"identical" => [clients[..3].to_vec(), clients[..3].to_vec()],
|
||||
"overlapping" => [clients[..3].to_vec(), clients[1..].to_vec()],
|
||||
_ => panic!("unknown lock topology"),
|
||||
};
|
||||
for (pool, lockers) in store.pools.iter_mut().zip(domains) {
|
||||
let mut set = (*pool.disk_set[0]).clone();
|
||||
set.lockers = lockers;
|
||||
Arc::make_mut(pool).disk_set[0] = Arc::new(set);
|
||||
}
|
||||
let store = Arc::new(store);
|
||||
crate::bucket::metadata_sys::init_bucket_metadata_sys(Arc::clone(&store), Vec::new()).await;
|
||||
let bucket = "delete-nonzero-pool-lock";
|
||||
let object = "object.bin";
|
||||
store
|
||||
.handle_make_bucket(bucket, &MakeBucketOptions::default())
|
||||
.await
|
||||
.expect("create the bucket in both pools");
|
||||
if batch {
|
||||
// Latest-marker routing sends this batch only to the nonzero pool,
|
||||
// so the cleanup barrier observes its prepared journal directly.
|
||||
store
|
||||
.update_bucket_metadata_config(
|
||||
bucket,
|
||||
crate::bucket::metadata::BUCKET_VERSIONING_CONFIG,
|
||||
b"<VersioningConfiguration><Status>Enabled</Status></VersioningConfiguration>".to_vec(),
|
||||
)
|
||||
.await
|
||||
.expect("enable versioning for the routed batch");
|
||||
}
|
||||
let target = store.pools[1].get_disks_by_key(object);
|
||||
let source = target
|
||||
.put_object(
|
||||
bucket,
|
||||
object,
|
||||
&mut PutObjReader::from_vec(b"delete lock regression".to_vec()),
|
||||
&ObjectOptions {
|
||||
versioned: batch,
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.await
|
||||
.expect("seed an object only in the nonzero pool");
|
||||
ctx.update_erasure_type(SetupType::DistErasure).await;
|
||||
|
||||
let object_barrier = (!batch).then(|| crate::set_disk::DeleteObjectCommitBarrier::install(bucket, object));
|
||||
let batch_barrier = batch.then(|| crate::set_disk::DeleteCleanupBarrier::install(bucket));
|
||||
let delete_store = Arc::clone(&store);
|
||||
let delete = tokio::spawn(async move {
|
||||
if batch {
|
||||
let (_, errors) = delete_store
|
||||
.delete_objects(
|
||||
bucket,
|
||||
vec![ObjectToDelete {
|
||||
object_name: object.to_owned(),
|
||||
..Default::default()
|
||||
}],
|
||||
ObjectOptions::default(),
|
||||
)
|
||||
.await;
|
||||
match errors.into_iter().flatten().next() {
|
||||
Some(error) => Err(error),
|
||||
None => Ok(()),
|
||||
}
|
||||
} else {
|
||||
delete_store
|
||||
.delete_object(bucket, object, ObjectOptions::default())
|
||||
.await
|
||||
.map(|_| ())
|
||||
}
|
||||
});
|
||||
if let Some(barrier) = &object_barrier {
|
||||
barrier.wait_until_paused().await;
|
||||
}
|
||||
if let Some(barrier) = &batch_barrier {
|
||||
barrier.wait_until_paused().await;
|
||||
}
|
||||
let recovery_store = Arc::clone(&store);
|
||||
let mut recovery = tokio::spawn(async move {
|
||||
recovery_store
|
||||
.recover_delete_transactions_at_incarnation(
|
||||
bucket,
|
||||
Some(object),
|
||||
None,
|
||||
&HealOpts {
|
||||
pool: Some(1),
|
||||
set: Some(0),
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.await
|
||||
});
|
||||
let early_recovery = tokio::time::timeout(Duration::from_millis(100), &mut recovery).await;
|
||||
let recovery_was_blocked = early_recovery.is_err();
|
||||
if let Some(barrier) = &object_barrier {
|
||||
barrier.release();
|
||||
}
|
||||
if let Some(barrier) = &batch_barrier {
|
||||
barrier.release();
|
||||
}
|
||||
tokio::time::timeout(Duration::from_secs(10), delete)
|
||||
.await
|
||||
.expect("the delete should finish after releasing its commit barrier")
|
||||
.expect("the delete task should join")
|
||||
.expect("the delete should succeed");
|
||||
let recovered = match early_recovery {
|
||||
Ok(result) => result,
|
||||
Err(_) => tokio::time::timeout(Duration::from_secs(10), recovery)
|
||||
.await
|
||||
.expect("recovery should finish after the frontend delete"),
|
||||
};
|
||||
recovered
|
||||
.expect("the recovery task should join")
|
||||
.expect("recovery should succeed");
|
||||
assert!(
|
||||
recovery_was_blocked,
|
||||
"recovery must not inspect an in-flight frontend delete with {topology} pool lock clients"
|
||||
);
|
||||
if batch {
|
||||
let marker = target
|
||||
.get_object_info(bucket, object, &ObjectOptions::default())
|
||||
.await
|
||||
.expect("the versioned batch must publish a current delete marker");
|
||||
assert!(marker.delete_marker && marker.is_latest);
|
||||
assert_eq!(marker.num_versions, 2, "the source version must remain beside the new marker");
|
||||
assert_ne!(marker.version_id, source.version_id);
|
||||
let mut reader = target
|
||||
.get_object_reader(
|
||||
bucket,
|
||||
object,
|
||||
None,
|
||||
HeaderMap::new(),
|
||||
&ObjectOptions {
|
||||
version_id: Some(source.version_id.expect("versioned source identity").to_string()),
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.await
|
||||
.expect("the original source version must remain readable");
|
||||
let mut body = Vec::new();
|
||||
reader
|
||||
.stream
|
||||
.read_to_end(&mut body)
|
||||
.await
|
||||
.expect("read the retained source version");
|
||||
assert_eq!(body, b"delete lock regression");
|
||||
} else {
|
||||
let error = target
|
||||
.get_object_info(bucket, object, &ObjectOptions::default())
|
||||
.await
|
||||
.expect_err("the deleted object must be absent");
|
||||
assert!(is_err_object_not_found(&error));
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial_test::serial]
|
||||
#[serial_test::serial(storage_class_env)]
|
||||
async fn batch_delete_excludes_recovery_on_nonzero_pool() {
|
||||
assert_delete_excludes_recovery_across_pool_lock_domains("disjoint", true).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial_test::serial]
|
||||
#[serial_test::serial(storage_class_env)]
|
||||
async fn delete_excludes_recovery_with_disjoint_pool_lock_clients() {
|
||||
assert_delete_excludes_recovery_across_pool_lock_domains("disjoint", false).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial_test::serial]
|
||||
#[serial_test::serial(storage_class_env)]
|
||||
async fn delete_excludes_recovery_with_identical_pool_lock_clients() {
|
||||
assert_delete_excludes_recovery_across_pool_lock_domains("identical", false).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial_test::serial]
|
||||
#[serial_test::serial(storage_class_env)]
|
||||
async fn delete_excludes_recovery_with_overlapping_pool_lock_clients() {
|
||||
assert_delete_excludes_recovery_across_pool_lock_domains("overlapping", false).await;
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
@@ -29,8 +29,9 @@ workspace = true
|
||||
|
||||
[dependencies]
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
thiserror.workspace = true
|
||||
tokio = { workspace = true, features = ["sync"] }
|
||||
uuid = { workspace = true, features = ["v4", "fast-rng", "macro-diagnostics"] }
|
||||
uuid = { workspace = true, features = ["v4", "serde", "fast-rng", "macro-diagnostics"] }
|
||||
|
||||
[dev-dependencies]
|
||||
serde_json = { workspace = true }
|
||||
|
||||
@@ -18,12 +18,25 @@ use crate::{
|
||||
heal_channel::HealScanMode,
|
||||
outcome::{HealExecutionOutcome, HealObjectReceipt},
|
||||
};
|
||||
use std::sync::{Arc, OnceLock};
|
||||
use std::sync::{
|
||||
Arc, OnceLock,
|
||||
atomic::{AtomicU64, Ordering},
|
||||
};
|
||||
use tokio::sync::broadcast;
|
||||
|
||||
pub const MAX_COMPLETION_IDENTITY_BYTES: usize = 4096;
|
||||
const COMPLETION_CHANNEL_CAPACITY: usize = 1024;
|
||||
|
||||
/// A process-local observation identity. It is never persisted or sent over RPC.
|
||||
pub type HealObservationId = u64;
|
||||
|
||||
/// Allocate one identity per accepted owner. Exhaustion is reported as unknown.
|
||||
pub fn new_heal_observation_id() -> Option<HealObservationId> {
|
||||
static NEXT: AtomicU64 = AtomicU64::new(1);
|
||||
NEXT.try_update(Ordering::Relaxed, Ordering::Relaxed, |value| value.checked_add(1))
|
||||
.ok()
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct HealCompletion {
|
||||
/// The accepted owner, never a discarded merged request ID.
|
||||
@@ -36,33 +49,84 @@ pub struct HealCompletion {
|
||||
pub object: Option<HealObjectReceipt>,
|
||||
}
|
||||
|
||||
fn sender() -> &'static broadcast::Sender<Arc<HealCompletion>> {
|
||||
static SENDER: OnceLock<broadcast::Sender<Arc<HealCompletion>>> = OnceLock::new();
|
||||
SENDER.get_or_init(|| broadcast::channel(COMPLETION_CHANNEL_CAPACITY).0)
|
||||
/// A completion paired with an optional in-process owner identity.
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct ObservedHealCompletion {
|
||||
pub completion: Arc<HealCompletion>,
|
||||
pub observation_id: Option<HealObservationId>,
|
||||
}
|
||||
|
||||
impl std::ops::Deref for ObservedHealCompletion {
|
||||
type Target = HealCompletion;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.completion
|
||||
}
|
||||
}
|
||||
|
||||
struct CompletionBroadcaster {
|
||||
legacy: broadcast::Sender<Arc<HealCompletion>>,
|
||||
observed: broadcast::Sender<Arc<ObservedHealCompletion>>,
|
||||
}
|
||||
|
||||
impl CompletionBroadcaster {
|
||||
fn new(capacity: usize) -> Self {
|
||||
Self {
|
||||
legacy: broadcast::channel(capacity).0,
|
||||
observed: broadcast::channel(capacity).0,
|
||||
}
|
||||
}
|
||||
|
||||
fn has_observers(&self) -> bool {
|
||||
self.legacy.receiver_count() > 0 || self.observed.receiver_count() > 0
|
||||
}
|
||||
|
||||
fn publish(&self, completion: HealCompletion, observation_id: Option<HealObservationId>) {
|
||||
let identity_bytes = completion.object.as_ref().map_or(0, |object| {
|
||||
object
|
||||
.identity
|
||||
.bucket
|
||||
.capacity()
|
||||
.saturating_add(object.identity.object.capacity())
|
||||
.saturating_add(object.identity.version_id.as_ref().map_or(0, String::capacity))
|
||||
});
|
||||
if completion.task_id.capacity().saturating_add(identity_bytes) <= MAX_COMPLETION_IDENTITY_BYTES {
|
||||
let completion = Arc::new(completion);
|
||||
let _ = self.legacy.send(Arc::clone(&completion));
|
||||
let _ = self.observed.send(Arc::new(ObservedHealCompletion {
|
||||
completion,
|
||||
observation_id,
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn broadcaster() -> &'static CompletionBroadcaster {
|
||||
static BROADCASTER: OnceLock<CompletionBroadcaster> = OnceLock::new();
|
||||
BROADCASTER.get_or_init(|| CompletionBroadcaster::new(COMPLETION_CHANNEL_CAPACITY))
|
||||
}
|
||||
|
||||
pub fn has_heal_completion_observers() -> bool {
|
||||
sender().receiver_count() > 0
|
||||
broadcaster().has_observers()
|
||||
}
|
||||
|
||||
/// Subscribe before admission so a fast worker cannot precede subscription.
|
||||
pub fn subscribe_heal_completions() -> broadcast::Receiver<Arc<HealCompletion>> {
|
||||
sender().subscribe()
|
||||
broadcaster().legacy.subscribe()
|
||||
}
|
||||
|
||||
pub fn subscribe_observed_heal_completions() -> broadcast::Receiver<Arc<ObservedHealCompletion>> {
|
||||
broadcaster().observed.subscribe()
|
||||
}
|
||||
|
||||
/// Oversized diagnostics and lagging consumers lose observations, never repairs.
|
||||
pub fn publish_heal_completion(completion: HealCompletion) {
|
||||
let identity_bytes = completion.object.as_ref().map_or(0, |object| {
|
||||
object
|
||||
.identity
|
||||
.bucket
|
||||
.capacity()
|
||||
.saturating_add(object.identity.object.capacity())
|
||||
.saturating_add(object.identity.version_id.as_ref().map_or(0, String::capacity))
|
||||
});
|
||||
if completion.task_id.capacity().saturating_add(identity_bytes) <= MAX_COMPLETION_IDENTITY_BYTES {
|
||||
let _ = sender().send(Arc::new(completion));
|
||||
}
|
||||
publish_observed_heal_completion(completion, None);
|
||||
}
|
||||
|
||||
/// Each channel is FIFO independently; relative delivery across channels is not ordered.
|
||||
pub fn publish_observed_heal_completion(completion: HealCompletion, observation_id: Option<HealObservationId>) {
|
||||
broadcaster().publish(completion, observation_id);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -70,36 +134,155 @@ mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn completion_delivery_is_bounded_and_does_not_require_a_consumer() {
|
||||
let mut receiver = subscribe_heal_completions();
|
||||
fn public_completion_facades_share_receipts_and_preserve_missing_tokens() {
|
||||
// Other completion tests use private broadcasters, keeping this global
|
||||
// facade test isolated from their capacity and lag checks.
|
||||
let mut legacy = subscribe_heal_completions();
|
||||
let mut observed = subscribe_observed_heal_completions();
|
||||
let completion = HealCompletion {
|
||||
task_id: uuid::Uuid::new_v4().to_string(),
|
||||
scan_mode: HealScanMode::Deep,
|
||||
dry_run: false,
|
||||
execution: None,
|
||||
object: None,
|
||||
};
|
||||
publish_heal_completion(completion.clone());
|
||||
let legacy_event = legacy.try_recv().expect("legacy subscriber receives old API event");
|
||||
let observed_event = observed.try_recv().expect("observer receives old API event");
|
||||
assert!(Arc::ptr_eq(&legacy_event, &observed_event.completion));
|
||||
assert_eq!(legacy_event.task_id, completion.task_id);
|
||||
assert_eq!(observed_event.observation_id, None);
|
||||
|
||||
publish_observed_heal_completion(completion, Some(51));
|
||||
let legacy_event = legacy.try_recv().expect("legacy subscriber receives observed API event");
|
||||
let observed_event = observed.try_recv().expect("observer receives observed API event");
|
||||
assert!(Arc::ptr_eq(&legacy_event, &observed_event.completion));
|
||||
assert_eq!(observed_event.observation_id, Some(51));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn legacy_and_observed_subscribers_receive_the_same_completion_in_each_channel_order() {
|
||||
let id = uuid::Uuid::new_v4().to_string();
|
||||
let bus = CompletionBroadcaster::new(COMPLETION_CHANNEL_CAPACITY);
|
||||
let mut legacy = bus.legacy.subscribe();
|
||||
let mut observed = bus.observed.subscribe();
|
||||
assert!(bus.has_observers());
|
||||
for (suffix, token) in [("first", Some(41)), ("second", None)] {
|
||||
bus.publish(
|
||||
HealCompletion {
|
||||
task_id: format!("{id}-{suffix}"),
|
||||
scan_mode: HealScanMode::Normal,
|
||||
dry_run: false,
|
||||
execution: None,
|
||||
object: None,
|
||||
},
|
||||
token,
|
||||
);
|
||||
}
|
||||
for (suffix, token) in [("first", Some(41)), ("second", None)] {
|
||||
let expected = format!("{id}-{suffix}");
|
||||
let legacy_event = loop {
|
||||
let event = legacy.try_recv().expect("legacy completion");
|
||||
if event.task_id == expected {
|
||||
break event;
|
||||
}
|
||||
};
|
||||
let observed_event = loop {
|
||||
let event = observed.try_recv().expect("observed completion");
|
||||
if event.task_id == expected {
|
||||
break event;
|
||||
}
|
||||
};
|
||||
assert!(Arc::ptr_eq(&legacy_event, &observed_event.completion));
|
||||
assert_eq!(observed_event.observation_id, token);
|
||||
}
|
||||
drop(legacy);
|
||||
assert!(bus.has_observers(), "observed-only subscribers require completion construction");
|
||||
let completion = HealCompletion {
|
||||
task_id: id.clone(),
|
||||
scan_mode: HealScanMode::Deep,
|
||||
dry_run: false,
|
||||
execution: None,
|
||||
object: None,
|
||||
};
|
||||
bus.publish(completion, None);
|
||||
let observed_event = loop {
|
||||
let event = observed.try_recv().expect("legacy publication reaches observed channel");
|
||||
if event.task_id == id {
|
||||
break event;
|
||||
}
|
||||
};
|
||||
assert_eq!(observed_event.observation_id, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn legacy_and_observed_channels_report_lag_independently() {
|
||||
let bus = CompletionBroadcaster::new(COMPLETION_CHANNEL_CAPACITY);
|
||||
let mut legacy = bus.legacy.subscribe();
|
||||
let mut observed = bus.observed.subscribe();
|
||||
for index in 0..=COMPLETION_CHANNEL_CAPACITY {
|
||||
publish_heal_completion(HealCompletion {
|
||||
task_id: format!("task-{index}"),
|
||||
scan_mode: HealScanMode::Deep,
|
||||
dry_run: false,
|
||||
execution: Some(HealExecutionOutcome::Completed),
|
||||
object: None,
|
||||
});
|
||||
bus.publish(
|
||||
HealCompletion {
|
||||
task_id: format!("dual-lag-{index}"),
|
||||
scan_mode: HealScanMode::Normal,
|
||||
dry_run: false,
|
||||
execution: None,
|
||||
object: None,
|
||||
},
|
||||
Some(42),
|
||||
);
|
||||
}
|
||||
assert!(matches!(legacy.try_recv(), Err(broadcast::error::TryRecvError::Lagged(_))));
|
||||
assert!(matches!(observed.try_recv(), Err(broadcast::error::TryRecvError::Lagged(_))));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn completion_delivery_is_bounded_and_does_not_require_a_consumer() {
|
||||
let bus = CompletionBroadcaster::new(COMPLETION_CHANNEL_CAPACITY);
|
||||
assert!(!bus.has_observers());
|
||||
let mut receiver = bus.legacy.subscribe();
|
||||
assert!(bus.has_observers());
|
||||
for index in 0..=COMPLETION_CHANNEL_CAPACITY {
|
||||
bus.publish(
|
||||
HealCompletion {
|
||||
task_id: format!("task-{index}"),
|
||||
scan_mode: HealScanMode::Deep,
|
||||
dry_run: false,
|
||||
execution: Some(HealExecutionOutcome::Completed),
|
||||
object: None,
|
||||
},
|
||||
None,
|
||||
);
|
||||
}
|
||||
assert!(matches!(receiver.try_recv(), Err(broadcast::error::TryRecvError::Lagged(1))));
|
||||
while receiver.try_recv().is_ok() {}
|
||||
let mut oversized = String::with_capacity(MAX_COMPLETION_IDENTITY_BYTES + 1);
|
||||
oversized.push_str("short-but-large-allocation");
|
||||
publish_heal_completion(HealCompletion {
|
||||
task_id: oversized,
|
||||
scan_mode: HealScanMode::Deep,
|
||||
dry_run: false,
|
||||
execution: None,
|
||||
object: None,
|
||||
});
|
||||
let mut observed = bus.observed.subscribe();
|
||||
bus.publish(
|
||||
HealCompletion {
|
||||
task_id: oversized,
|
||||
scan_mode: HealScanMode::Deep,
|
||||
dry_run: false,
|
||||
execution: None,
|
||||
object: None,
|
||||
},
|
||||
None,
|
||||
);
|
||||
assert!(matches!(receiver.try_recv(), Err(broadcast::error::TryRecvError::Empty)));
|
||||
assert!(matches!(observed.try_recv(), Err(broadcast::error::TryRecvError::Empty)));
|
||||
drop(receiver);
|
||||
publish_heal_completion(HealCompletion {
|
||||
task_id: "no-consumer".into(),
|
||||
scan_mode: HealScanMode::Deep,
|
||||
dry_run: false,
|
||||
execution: Some(HealExecutionOutcome::Completed),
|
||||
object: None,
|
||||
});
|
||||
drop(observed);
|
||||
assert!(!bus.has_observers());
|
||||
bus.publish(
|
||||
HealCompletion {
|
||||
task_id: "no-consumer".into(),
|
||||
scan_mode: HealScanMode::Deep,
|
||||
dry_run: false,
|
||||
execution: Some(HealExecutionOutcome::Completed),
|
||||
object: None,
|
||||
},
|
||||
None,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -271,6 +271,39 @@ pub struct HealAdmissionReceipt {
|
||||
pub task_id: String,
|
||||
}
|
||||
|
||||
/// Optional process-local observation metadata for a canonical receipt.
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct ObservedHealAdmissionReceipt {
|
||||
pub receipt: HealAdmissionReceipt,
|
||||
/// Process-local owner identity; absent for remote or unproven owners.
|
||||
pub observation_id: Option<crate::completion::HealObservationId>,
|
||||
}
|
||||
|
||||
/// Errors from process-local observed admission and its channel initialization.
|
||||
#[derive(Debug, thiserror::Error)]
|
||||
pub enum HealObservationChannelError {
|
||||
#[error("Heal channel sender already initialized")]
|
||||
AlreadyInitialized,
|
||||
#[error("Heal channel not initialized")]
|
||||
NotInitialized,
|
||||
#[error("Heal receipt command channel closed")]
|
||||
LegacyCommandClosed,
|
||||
#[error("Failed to receive heal admission response: {0}")]
|
||||
LegacyResponseClosed(#[source] oneshot::error::RecvError),
|
||||
#[error("Failed to receive observed heal admission response: {0}")]
|
||||
ObservedResponseClosed(#[source] oneshot::error::RecvError),
|
||||
#[error("{0}")]
|
||||
AdmissionFailed(String),
|
||||
}
|
||||
|
||||
impl std::ops::Deref for ObservedHealAdmissionReceipt {
|
||||
type Target = HealAdmissionReceipt;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.receipt
|
||||
}
|
||||
}
|
||||
|
||||
impl HealAdmissionResult {
|
||||
pub fn result_label(self) -> &'static str {
|
||||
match self {
|
||||
@@ -447,9 +480,19 @@ pub struct HealReceiptCommand {
|
||||
/// Canonical-receipt command receiver.
|
||||
pub type HealReceiptReceiver = mpsc::UnboundedReceiver<HealReceiptCommand>;
|
||||
|
||||
/// Process-local admission command carrying an observed receipt.
|
||||
#[derive(Debug)]
|
||||
pub struct ObservedHealReceiptCommand {
|
||||
pub request: HealChannelRequest,
|
||||
pub response_tx: oneshot::Sender<Result<ObservedHealAdmissionReceipt, HealObservationChannelError>>,
|
||||
}
|
||||
|
||||
pub type ObservedHealReceiptReceiver = mpsc::UnboundedReceiver<ObservedHealReceiptCommand>;
|
||||
|
||||
struct HealChannelSenders {
|
||||
command: HealChannelSender,
|
||||
receipt: mpsc::UnboundedSender<HealReceiptCommand>,
|
||||
observed: Option<mpsc::UnboundedSender<ObservedHealReceiptCommand>>,
|
||||
}
|
||||
|
||||
/// Global heal channel sender
|
||||
@@ -469,12 +512,31 @@ pub fn init_heal_channel() -> Result<HealChannelReceiver, &'static str> {
|
||||
|
||||
/// Initialize the legacy command and canonical-receipt channels atomically.
|
||||
pub fn init_heal_channels() -> Result<(HealChannelReceiver, HealReceiptReceiver), &'static str> {
|
||||
let (command_receiver, receipt_receiver, _) =
|
||||
init_heal_channels_inner(false).map_err(|_| "Heal channel sender already initialized")?;
|
||||
Ok((command_receiver, receipt_receiver))
|
||||
}
|
||||
|
||||
/// Initialize an additional local observation channel while preserving the legacy channels.
|
||||
pub fn init_heal_channels_with_observations()
|
||||
-> Result<(HealChannelReceiver, HealReceiptReceiver, ObservedHealReceiptReceiver), HealObservationChannelError> {
|
||||
init_heal_channels_inner(true)
|
||||
}
|
||||
|
||||
fn init_heal_channels_inner(
|
||||
with_observations: bool,
|
||||
) -> Result<(HealChannelReceiver, HealReceiptReceiver, ObservedHealReceiptReceiver), HealObservationChannelError> {
|
||||
let (command, command_receiver) = mpsc::unbounded_channel();
|
||||
let (receipt, receipt_receiver) = mpsc::unbounded_channel();
|
||||
let (observed, observed_receiver) = mpsc::unbounded_channel();
|
||||
GLOBAL_HEAL_CHANNEL_SENDERS
|
||||
.set(HealChannelSenders { command, receipt })
|
||||
.map_err(|_| "Heal channel sender already initialized")?;
|
||||
Ok((command_receiver, receipt_receiver))
|
||||
.set(HealChannelSenders {
|
||||
command,
|
||||
receipt,
|
||||
observed: with_observations.then_some(observed),
|
||||
})
|
||||
.map_err(|_| HealObservationChannelError::AlreadyInitialized)?;
|
||||
Ok((command_receiver, receipt_receiver, observed_receiver))
|
||||
}
|
||||
|
||||
/// Get global heal channel sender
|
||||
@@ -515,10 +577,17 @@ pub fn subscribe_heal_responses() -> broadcast::Receiver<HealChannelResponse> {
|
||||
|
||||
/// Send heal start request and wait for structured admission feedback.
|
||||
pub async fn send_heal_request_with_receipt(request: HealChannelRequest) -> Result<HealAdmissionReceipt, String> {
|
||||
let (response_tx, response_rx) = oneshot::channel();
|
||||
let senders = GLOBAL_HEAL_CHANNEL_SENDERS
|
||||
.get()
|
||||
.ok_or_else(|| "Heal channel not initialized".to_string())?;
|
||||
send_heal_request_with_receipt_on(senders, request).await
|
||||
}
|
||||
|
||||
async fn send_heal_request_with_receipt_on(
|
||||
senders: &HealChannelSenders,
|
||||
request: HealChannelRequest,
|
||||
) -> Result<HealAdmissionReceipt, String> {
|
||||
let (response_tx, response_rx) = oneshot::channel();
|
||||
senders
|
||||
.receipt
|
||||
.send(HealReceiptCommand { request, response_tx })
|
||||
@@ -528,6 +597,46 @@ pub async fn send_heal_request_with_receipt(request: HealChannelRequest) -> Resu
|
||||
.map_err(|e| format!("Failed to receive heal admission response: {e}"))?
|
||||
}
|
||||
|
||||
/// A missing or closed observation channel falls back only before a command is accepted.
|
||||
pub async fn send_heal_request_with_observation(
|
||||
request: HealChannelRequest,
|
||||
) -> Result<ObservedHealAdmissionReceipt, HealObservationChannelError> {
|
||||
let senders = GLOBAL_HEAL_CHANNEL_SENDERS
|
||||
.get()
|
||||
.ok_or(HealObservationChannelError::NotInitialized)?;
|
||||
send_heal_request_with_observation_on(senders, request).await
|
||||
}
|
||||
|
||||
async fn send_heal_request_with_observation_on(
|
||||
senders: &HealChannelSenders,
|
||||
mut request: HealChannelRequest,
|
||||
) -> Result<ObservedHealAdmissionReceipt, HealObservationChannelError> {
|
||||
if let Some(observed) = &senders.observed {
|
||||
let (response_tx, response_rx) = oneshot::channel();
|
||||
match observed.send(ObservedHealReceiptCommand { request, response_tx }) {
|
||||
Ok(()) => {
|
||||
return response_rx
|
||||
.await
|
||||
.map_err(HealObservationChannelError::ObservedResponseClosed)?;
|
||||
}
|
||||
Err(error) => request = error.0.request,
|
||||
}
|
||||
}
|
||||
let (response_tx, response_rx) = oneshot::channel();
|
||||
senders
|
||||
.receipt
|
||||
.send(HealReceiptCommand { request, response_tx })
|
||||
.map_err(|_| HealObservationChannelError::LegacyCommandClosed)?;
|
||||
let receipt = response_rx
|
||||
.await
|
||||
.map_err(HealObservationChannelError::LegacyResponseClosed)?
|
||||
.map_err(HealObservationChannelError::AdmissionFailed)?;
|
||||
Ok(ObservedHealAdmissionReceipt {
|
||||
receipt,
|
||||
observation_id: None,
|
||||
})
|
||||
}
|
||||
|
||||
/// Send heal start request and wait for structured admission feedback.
|
||||
pub async fn send_heal_request_with_admission(request: HealChannelRequest) -> Result<HealAdmissionResult, String> {
|
||||
let (response_tx, response_rx) = oneshot::channel();
|
||||
@@ -775,6 +884,109 @@ mod auto_heal_disk_request_tests {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[tokio::test]
|
||||
async fn observed_receipt_falls_back_only_when_no_observed_command_was_accepted() {
|
||||
for closed in [false, true] {
|
||||
let (command, _command_rx) = mpsc::unbounded_channel();
|
||||
let (receipt, mut receipt_rx) = mpsc::unbounded_channel();
|
||||
let observed = if closed {
|
||||
let (sender, receiver) = mpsc::unbounded_channel();
|
||||
drop(receiver);
|
||||
Some(sender)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
let senders = HealChannelSenders {
|
||||
command,
|
||||
receipt,
|
||||
observed,
|
||||
};
|
||||
let request = HealChannelRequest::new();
|
||||
let task = tokio::spawn(async move { send_heal_request_with_observation_on(&senders, request).await });
|
||||
let command = receipt_rx.recv().await.expect("legacy receipt command");
|
||||
command
|
||||
.response_tx
|
||||
.send(Ok(HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Accepted,
|
||||
task_id: "owner".into(),
|
||||
}))
|
||||
.expect("caller waiting");
|
||||
let received = task.await.expect("sender task").expect("legacy admission");
|
||||
assert_eq!(received.task_id, "owner");
|
||||
assert_eq!(received.observation_id, None);
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn lost_observed_reply_never_resends_the_request() {
|
||||
let (command, _command_rx) = mpsc::unbounded_channel();
|
||||
let (receipt, mut receipt_rx) = mpsc::unbounded_channel();
|
||||
let keep_receipt_open = receipt.clone();
|
||||
let (observed, mut observed_rx) = mpsc::unbounded_channel();
|
||||
let senders = HealChannelSenders {
|
||||
command,
|
||||
receipt,
|
||||
observed: Some(observed),
|
||||
};
|
||||
let task = tokio::spawn(async move { send_heal_request_with_observation_on(&senders, HealChannelRequest::new()).await });
|
||||
let command = observed_rx.recv().await.expect("accepted observed command");
|
||||
drop(command.response_tx);
|
||||
let error = task
|
||||
.await
|
||||
.expect("sender task")
|
||||
.expect_err("lost response must remain an error");
|
||||
assert!(matches!(&error, HealObservationChannelError::ObservedResponseClosed(_)));
|
||||
assert!(std::error::Error::source(&error).is_some());
|
||||
assert!(matches!(receipt_rx.try_recv(), Err(mpsc::error::TryRecvError::Empty)));
|
||||
drop(keep_receipt_open);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn fallback_reports_a_typed_error_if_legacy_channel_is_closed() {
|
||||
let (command, _command_rx) = mpsc::unbounded_channel();
|
||||
let (receipt, receipt_rx) = mpsc::unbounded_channel();
|
||||
drop(receipt_rx);
|
||||
let senders = HealChannelSenders {
|
||||
command,
|
||||
receipt,
|
||||
observed: None,
|
||||
};
|
||||
let error = send_heal_request_with_observation_on(&senders, HealChannelRequest::new())
|
||||
.await
|
||||
.expect_err("closed legacy channel must not accept work");
|
||||
assert!(matches!(error, HealObservationChannelError::LegacyCommandClosed));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn observed_receipt_keeps_the_owner_token_from_the_processor() {
|
||||
let (command, _command_rx) = mpsc::unbounded_channel();
|
||||
let (receipt, mut receipt_rx) = mpsc::unbounded_channel();
|
||||
let keep_receipt_open = receipt.clone();
|
||||
let (observed, mut observed_rx) = mpsc::unbounded_channel();
|
||||
let senders = HealChannelSenders {
|
||||
command,
|
||||
receipt,
|
||||
observed: Some(observed),
|
||||
};
|
||||
let task = tokio::spawn(async move { send_heal_request_with_observation_on(&senders, HealChannelRequest::new()).await });
|
||||
let command = observed_rx.recv().await.expect("observed command");
|
||||
command
|
||||
.response_tx
|
||||
.send(Ok(ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Merged,
|
||||
task_id: "owner".into(),
|
||||
},
|
||||
observation_id: Some(37),
|
||||
}))
|
||||
.expect("caller waiting");
|
||||
let received = task.await.expect("sender task").expect("observed admission");
|
||||
assert_eq!(received.task_id, "owner");
|
||||
assert_eq!(received.observation_id, Some(37));
|
||||
assert!(matches!(receipt_rx.try_recv(), Err(mpsc::error::TryRecvError::Empty)));
|
||||
drop(keep_receipt_open);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn heal_request_source_labels_are_stable() {
|
||||
assert_eq!(HealRequestSource::Scanner.as_str(), "scanner");
|
||||
|
||||
@@ -16,7 +16,7 @@ use rustfs_io_metrics::internode_metrics::INTERNODE_OPERATION_PUT_FILE_STREAM;
|
||||
use rustfs_rio::{InternodeHttpError, InternodeHttpErrorKind};
|
||||
use thiserror::Error;
|
||||
|
||||
use super::heal::{DiskError, EcstoreError, storage_api::owner::EcstorePoolMetadataFailure};
|
||||
use super::heal::{DiskError, EcstoreError};
|
||||
|
||||
const HEAL_DANGLING_DELETE_GRACE_MESSAGE: &str = "dangling object deletion deferred by heal grace window";
|
||||
pub(crate) const MRF_MISSING_PROOF_PREFIX: &str = "Missing exact storage proof for durable MRF repair ";
|
||||
@@ -236,14 +236,6 @@ pub(crate) fn classify_heal_error(error: &Error) -> HealErrorClass {
|
||||
/// with object absence, the conflation that once let an offline drive be
|
||||
/// recorded as absent and skipped (backlog#856 / #799 B7).
|
||||
pub(crate) fn classify_storage_error(error: &EcstoreError) -> HealErrorClass {
|
||||
if let Some(failure) = error.pool_metadata_failure() {
|
||||
return match failure.kind {
|
||||
EcstorePoolMetadataFailure::ReadUnavailable | EcstorePoolMetadataFailure::TransactionUnknown => {
|
||||
HealErrorClass::Transient
|
||||
}
|
||||
EcstorePoolMetadataFailure::RecoveryRequired | EcstorePoolMetadataFailure::FenceLost => HealErrorClass::Permanent,
|
||||
};
|
||||
}
|
||||
if let EcstoreError::Lock(lock_error) = error {
|
||||
return if lock_error.is_fatal() {
|
||||
HealErrorClass::Permanent
|
||||
@@ -443,34 +435,6 @@ mod tests {
|
||||
use super::Error;
|
||||
use crate::heal::{DiskError, EcstoreError};
|
||||
|
||||
#[test]
|
||||
fn pool_metadata_failures_keep_their_typed_recovery_classification() {
|
||||
use crate::heal::storage_api::owner::{EcstorePoolMetadataError, EcstorePoolMetadataFailure};
|
||||
|
||||
for (kind, retryable) in [
|
||||
(EcstorePoolMetadataFailure::ReadUnavailable, true),
|
||||
(EcstorePoolMetadataFailure::TransactionUnknown, true),
|
||||
(EcstorePoolMetadataFailure::RecoveryRequired, false),
|
||||
(EcstorePoolMetadataFailure::FenceLost, false),
|
||||
] {
|
||||
let error = EcstoreError::other(EcstorePoolMetadataError {
|
||||
kind,
|
||||
operation: "bucket heal".to_owned(),
|
||||
phase: "native_heal",
|
||||
since: std::time::UNIX_EPOCH.into(),
|
||||
source: Some(std::sync::Arc::new(EcstoreError::SlowDown)),
|
||||
});
|
||||
let text = error.to_string();
|
||||
for error in [error.clone(), error] {
|
||||
assert_eq!(Error::Storage(error).is_recoverable_heal(), retryable, "{kind:?}");
|
||||
}
|
||||
assert!(
|
||||
!Error::Storage(EcstoreError::other(text)).is_recoverable_heal(),
|
||||
"display text must not grant recovery authority"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn namespace_lock_quorum_is_recoverable_across_io_error_conversions() {
|
||||
for (required, achieved) in [(2, 1), (1, 0)] {
|
||||
|
||||
@@ -21,8 +21,8 @@ use crate::heal::{
|
||||
use crate::{Error, Result};
|
||||
use rustfs_heal_contracts::heal_channel::{
|
||||
HealAdmissionReceipt, HealAdmissionResult, HealChannelCommand, HealChannelPriority, HealChannelReceiver, HealChannelRequest,
|
||||
HealChannelResponse, HealOpts, HealReceiptCommand, HealReceiptReceiver, HealRequestSource, HealScanMode,
|
||||
publish_heal_response,
|
||||
HealChannelResponse, HealObservationChannelError, HealOpts, HealReceiptCommand, HealReceiptReceiver, HealRequestSource,
|
||||
HealScanMode, ObservedHealAdmissionReceipt, ObservedHealReceiptCommand, ObservedHealReceiptReceiver, publish_heal_response,
|
||||
};
|
||||
use rustfs_madmin::heal_commands::HealResultItem;
|
||||
use serde::Serialize;
|
||||
@@ -30,6 +30,24 @@ use std::sync::Arc;
|
||||
use tokio::sync::{mpsc, oneshot};
|
||||
use tracing::{debug, error, info};
|
||||
|
||||
enum StartResponseSender {
|
||||
Legacy(oneshot::Sender<std::result::Result<HealAdmissionReceipt, String>>),
|
||||
Observed(oneshot::Sender<std::result::Result<ObservedHealAdmissionReceipt, HealObservationChannelError>>),
|
||||
}
|
||||
|
||||
impl StartResponseSender {
|
||||
fn send(self, result: std::result::Result<ObservedHealAdmissionReceipt, String>) {
|
||||
match self {
|
||||
Self::Legacy(sender) => {
|
||||
let _ = sender.send(result.map(|observed| observed.receipt));
|
||||
}
|
||||
Self::Observed(sender) => {
|
||||
let _ = sender.send(result.map_err(HealObservationChannelError::AdmissionFailed));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const LOG_COMPONENT_HEAL: &str = "heal";
|
||||
const LOG_SUBSYSTEM_CHANNEL: &str = "channel";
|
||||
const EVENT_HEAL_CHANNEL_STATE: &str = "heal_channel_state";
|
||||
@@ -215,9 +233,22 @@ impl HealChannelProcessor {
|
||||
|
||||
/// Start processing legacy and canonical-receipt heal channel requests.
|
||||
pub async fn start_with_receipts(
|
||||
&mut self,
|
||||
receiver: HealChannelReceiver,
|
||||
receipt_receiver: HealReceiptReceiver,
|
||||
) -> Result<()> {
|
||||
let (sender, receiver_observed) = mpsc::unbounded_channel();
|
||||
drop(sender);
|
||||
self.start_with_observed_receipts(receiver, receipt_receiver, receiver_observed)
|
||||
.await
|
||||
}
|
||||
|
||||
/// The three command channels are FIFO independently, with no ordering across channels.
|
||||
pub async fn start_with_observed_receipts(
|
||||
&mut self,
|
||||
mut receiver: HealChannelReceiver,
|
||||
mut receipt_receiver: HealReceiptReceiver,
|
||||
mut observed_receiver: ObservedHealReceiptReceiver,
|
||||
) -> Result<()> {
|
||||
info!(
|
||||
target: "rustfs::heal::channel",
|
||||
@@ -229,6 +260,7 @@ impl HealChannelProcessor {
|
||||
);
|
||||
|
||||
let mut receipt_channel_open = true;
|
||||
let mut observed_channel_open = true;
|
||||
loop {
|
||||
tokio::select! {
|
||||
command = receiver.recv() => {
|
||||
@@ -276,6 +308,23 @@ impl HealChannelProcessor {
|
||||
);
|
||||
}
|
||||
}
|
||||
command = observed_receiver.recv(), if observed_channel_open => {
|
||||
let Some(ObservedHealReceiptCommand { request, response_tx }) = command else {
|
||||
observed_channel_open = false;
|
||||
continue;
|
||||
};
|
||||
if let Err(e) = self.process_start_request_inner(request, false, true, StartResponseSender::Observed(response_tx)).await {
|
||||
error!(
|
||||
target: "rustfs::heal::channel",
|
||||
event = EVENT_HEAL_CHANNEL_REQUEST,
|
||||
component = LOG_COMPONENT_HEAL,
|
||||
subsystem = LOG_SUBSYSTEM_CHANNEL,
|
||||
state = "receipt_process_failed",
|
||||
error = %e,
|
||||
"Heal receipt request processing failed"
|
||||
);
|
||||
}
|
||||
}
|
||||
response = self.response_receiver.recv() => {
|
||||
if let Some(response) = response {
|
||||
// Handle response if needed
|
||||
@@ -344,10 +393,21 @@ impl HealChannelProcessor {
|
||||
/// Process start request
|
||||
async fn process_start_request(
|
||||
&self,
|
||||
mut request: HealChannelRequest,
|
||||
request: HealChannelRequest,
|
||||
preserve_alias: bool,
|
||||
publish_canonical_id: bool,
|
||||
response_tx: oneshot::Sender<std::result::Result<HealAdmissionReceipt, String>>,
|
||||
) -> Result<()> {
|
||||
self.process_start_request_inner(request, preserve_alias, publish_canonical_id, StartResponseSender::Legacy(response_tx))
|
||||
.await
|
||||
}
|
||||
|
||||
async fn process_start_request_inner(
|
||||
&self,
|
||||
mut request: HealChannelRequest,
|
||||
preserve_alias: bool,
|
||||
publish_canonical_id: bool,
|
||||
response_tx: StartResponseSender,
|
||||
) -> Result<()> {
|
||||
if request.id.is_empty() {
|
||||
request.id = uuid::Uuid::new_v4().to_string();
|
||||
@@ -369,7 +429,7 @@ impl HealChannelProcessor {
|
||||
Ok(heal_request) => heal_request,
|
||||
Err(err) => {
|
||||
let error_text = err.to_string();
|
||||
let _ = response_tx.send(Err(error_text.clone()));
|
||||
response_tx.send(Err(error_text.clone()));
|
||||
self.publish_response(HealChannelResponse {
|
||||
request_id: request.id,
|
||||
success: false,
|
||||
@@ -383,7 +443,7 @@ impl HealChannelProcessor {
|
||||
// Submit to heal manager
|
||||
match self
|
||||
.heal_manager
|
||||
.submit_heal_request_with_receipt_and_alias(heal_request, preserve_alias)
|
||||
.submit_heal_request_with_observation_and_alias(heal_request, preserve_alias)
|
||||
.await
|
||||
{
|
||||
Ok(receipt) => {
|
||||
@@ -405,7 +465,7 @@ impl HealChannelProcessor {
|
||||
request.id.clone()
|
||||
};
|
||||
self.publish_response(admission_response(response_id, receipt.result));
|
||||
let _ = response_tx.send(Ok(receipt));
|
||||
response_tx.send(Ok(receipt));
|
||||
}
|
||||
Err(e) => {
|
||||
let error_text = e.to_string();
|
||||
@@ -419,7 +479,7 @@ impl HealChannelProcessor {
|
||||
error = %error_text,
|
||||
"Heal start submission failed"
|
||||
);
|
||||
let _ = response_tx.send(Err(error_text.clone()));
|
||||
response_tx.send(Err(error_text.clone()));
|
||||
|
||||
// Send error response
|
||||
let response = HealChannelResponse {
|
||||
@@ -1748,6 +1808,84 @@ mod tests {
|
||||
.expect("legacy alias should cancel the canonical task");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn observed_and_legacy_channels_share_the_real_admission_owner() {
|
||||
let manager = create_test_heal_manager();
|
||||
let mut processor = HealChannelProcessor::new(manager);
|
||||
let (command_tx, command_rx) = mpsc::unbounded_channel();
|
||||
let (receipt_tx, receipt_rx) = mpsc::unbounded_channel();
|
||||
let (observed_tx, observed_rx) = mpsc::unbounded_channel();
|
||||
let task = tokio::spawn(async move {
|
||||
processor
|
||||
.start_with_observed_receipts(command_rx, receipt_rx, observed_rx)
|
||||
.await
|
||||
});
|
||||
let request = HealChannelRequest {
|
||||
id: "observed-owner".into(),
|
||||
bucket: "observed-owner-bucket".into(),
|
||||
object_prefix: Some("object".into()),
|
||||
source: HealRequestSource::Internal,
|
||||
..Default::default()
|
||||
};
|
||||
let (response_tx, response_rx) = oneshot::channel();
|
||||
observed_tx
|
||||
.send(ObservedHealReceiptCommand {
|
||||
request: request.clone(),
|
||||
response_tx,
|
||||
})
|
||||
.expect("observed command");
|
||||
let first = tokio::time::timeout(Duration::from_secs(1), response_rx)
|
||||
.await
|
||||
.expect("observed response")
|
||||
.expect("sender")
|
||||
.expect("admitted");
|
||||
assert_eq!(first.result, HealAdmissionResult::Accepted);
|
||||
assert!(first.observation_id.is_some());
|
||||
|
||||
let mut duplicate = request.clone();
|
||||
duplicate.id = "legacy-observed-duplicate".into();
|
||||
let (response_tx, response_rx) = oneshot::channel();
|
||||
receipt_tx
|
||||
.send(HealReceiptCommand {
|
||||
request: duplicate,
|
||||
response_tx,
|
||||
})
|
||||
.expect("legacy command");
|
||||
let legacy = tokio::time::timeout(Duration::from_secs(1), response_rx)
|
||||
.await
|
||||
.expect("legacy response")
|
||||
.expect("sender")
|
||||
.expect("merged");
|
||||
assert_eq!(legacy.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(legacy.task_id, first.task_id);
|
||||
|
||||
let mut duplicate = request;
|
||||
duplicate.id = "observed-duplicate".into();
|
||||
let (response_tx, response_rx) = oneshot::channel();
|
||||
observed_tx
|
||||
.send(ObservedHealReceiptCommand {
|
||||
request: duplicate,
|
||||
response_tx,
|
||||
})
|
||||
.expect("observed duplicate");
|
||||
let merged = tokio::time::timeout(Duration::from_secs(1), response_rx)
|
||||
.await
|
||||
.expect("observed response")
|
||||
.expect("sender")
|
||||
.expect("merged");
|
||||
assert_eq!(merged.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(merged.task_id, first.task_id);
|
||||
assert_eq!(merged.observation_id, first.observation_id);
|
||||
drop(command_tx);
|
||||
assert!(
|
||||
tokio::time::timeout(Duration::from_secs(1), task)
|
||||
.await
|
||||
.expect("processor stops")
|
||||
.expect("join")
|
||||
.is_ok()
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_public_legacy_start_processes_commands_with_receipt_channel_closed() {
|
||||
let manager = create_test_heal_manager();
|
||||
|
||||
+210
-113
@@ -29,7 +29,7 @@ use rustfs_concurrency::workload::{ForegroundPressure, foreground_pressure};
|
||||
#[cfg(test)]
|
||||
use rustfs_concurrency::{AdmissionState, WorkloadClass};
|
||||
use rustfs_heal_contracts::heal_channel::{
|
||||
HealAdmissionDropReason, HealAdmissionReceipt, HealAdmissionResult, HealRequestSource,
|
||||
HealAdmissionDropReason, HealAdmissionReceipt, HealAdmissionResult, HealRequestSource, ObservedHealAdmissionReceipt,
|
||||
};
|
||||
use rustfs_madmin::heal_commands::HealResultItem;
|
||||
#[cfg(test)]
|
||||
@@ -297,6 +297,7 @@ async fn publish_completed_heal(
|
||||
task_id: &str,
|
||||
completed: CompletedHealStatus,
|
||||
terminal: bool,
|
||||
observation_id: Option<rustfs_heal_contracts::completion::HealObservationId>,
|
||||
) {
|
||||
let completed = Arc::new(completed);
|
||||
completed.retained_bytes();
|
||||
@@ -328,13 +329,16 @@ async fn publish_completed_heal(
|
||||
identity: object.identity.clone(),
|
||||
disposition: object.disposition.clone(),
|
||||
});
|
||||
rustfs_heal_contracts::completion::publish_heal_completion(rustfs_heal_contracts::completion::HealCompletion {
|
||||
task_id: task_id.to_owned(),
|
||||
scan_mode: completed.options.scan_mode,
|
||||
dry_run: completed.options.dry_run,
|
||||
execution: outcome.map(|outcome| outcome.execution),
|
||||
object,
|
||||
});
|
||||
rustfs_heal_contracts::completion::publish_observed_heal_completion(
|
||||
rustfs_heal_contracts::completion::HealCompletion {
|
||||
task_id: task_id.to_owned(),
|
||||
scan_mode: completed.options.scan_mode,
|
||||
dry_run: completed.options.dry_run,
|
||||
execution: outcome.map(|outcome| outcome.execution),
|
||||
object,
|
||||
},
|
||||
observation_id,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -625,6 +629,38 @@ fn request_matches_request(request: &HealRequest, existing: &HealRequest) -> boo
|
||||
&& request.heal_endpoints == existing.heal_endpoints
|
||||
}
|
||||
|
||||
fn lookup_request_id_admission(
|
||||
request: &HealRequest,
|
||||
active_heals: &HashMap<String, Arc<HealTask>>,
|
||||
queue: &PriorityHealQueue,
|
||||
retrying_heals: &HashMap<String, RetryingHeal>,
|
||||
durable_owners: &[HealRequest],
|
||||
) -> Option<(bool, &'static str, Option<rustfs_heal_contracts::completion::HealObservationId>)> {
|
||||
active_heals
|
||||
.get(&request.id)
|
||||
.map(|task| (request_matches_task(request, task), "active", task.observation_id))
|
||||
.or_else(|| {
|
||||
// A request ID can name multiple queued sequences; the token is unknown.
|
||||
queue
|
||||
.requests()
|
||||
.find(|queued| queued.id == request.id)
|
||||
.map(|queued| (request_matches_request(request, queued), "queued", None))
|
||||
})
|
||||
.or_else(|| {
|
||||
retrying_heals
|
||||
.get(&request.id)
|
||||
.map(|retrying| (request_matches_request(request, &retrying.request), "retrying", retrying.observation_id))
|
||||
})
|
||||
// A durable-only owner must be resumed by recovery, not overwritten
|
||||
// with a new execution budget by a replay before recovery completes.
|
||||
.or_else(|| {
|
||||
durable_owners
|
||||
.iter()
|
||||
.find(|owner| owner.id == request.id)
|
||||
.map(|_| (false, "durable", None))
|
||||
})
|
||||
}
|
||||
|
||||
fn retrying_heal_for_dedup_key(retrying_heals: &HashMap<String, RetryingHeal>, key: &str) -> Option<(String, HealType)> {
|
||||
retrying_heals
|
||||
.iter()
|
||||
@@ -1292,6 +1328,7 @@ impl HealManager {
|
||||
config: &HealConfig,
|
||||
context: &'static str,
|
||||
replacement_targets_frozen: bool,
|
||||
observation_id: Option<rustfs_heal_contracts::completion::HealObservationId>,
|
||||
) -> HealAdmissionDecision {
|
||||
let replacement_targets_frozen = replacement_targets_frozen || request.retry_attempts != 0;
|
||||
let queue_len = queue.len();
|
||||
@@ -1328,7 +1365,7 @@ impl HealManager {
|
||||
let priority = request.priority;
|
||||
let source = request.source;
|
||||
if let Some(displaced) =
|
||||
queue.push_displacing_lower_priority_where(request, Self::queued_request_can_be_displaced)
|
||||
queue.push_displacing_lower_priority_where(request, Self::queued_request_can_be_displaced, observation_id)
|
||||
{
|
||||
publish_heal_queue_length(queue);
|
||||
Self::record_admission_metric(source, HealAdmissionResult::Accepted, context);
|
||||
@@ -1479,7 +1516,7 @@ impl HealManager {
|
||||
let priority = request.priority;
|
||||
let source = request.source;
|
||||
|
||||
match queue.push_with_replacement_scope(request, replacement_targets_frozen) {
|
||||
match queue.push_with_replacement_scope(request, replacement_targets_frozen, observation_id) {
|
||||
QueuePushOutcome::Accepted => {
|
||||
publish_heal_queue_length(queue);
|
||||
Self::record_admission_metric(source, HealAdmissionResult::Accepted, context);
|
||||
@@ -1951,6 +1988,17 @@ impl HealManager {
|
||||
request: HealRequest,
|
||||
preserve_alias: bool,
|
||||
) -> Result<HealAdmissionReceipt> {
|
||||
Ok(self
|
||||
.submit_heal_request_with_observation_and_alias(request, preserve_alias)
|
||||
.await?
|
||||
.receipt)
|
||||
}
|
||||
|
||||
pub(crate) async fn submit_heal_request_with_observation_and_alias(
|
||||
&self,
|
||||
request: HealRequest,
|
||||
preserve_alias: bool,
|
||||
) -> Result<ObservedHealAdmissionReceipt> {
|
||||
self.submit_heal_request_with_receipt_alias_and_mrf_notice(request, preserve_alias, true, None)
|
||||
.await
|
||||
}
|
||||
@@ -1991,8 +2039,10 @@ impl HealManager {
|
||||
mrf_notice_target: MrfRepairNoticeTarget,
|
||||
) -> Result<HealAdmissionReceipt> {
|
||||
let preserve_alias = !mrf_notice_target.kind.is_durable();
|
||||
self.submit_heal_request_with_receipt_alias_and_mrf_notice(request, preserve_alias, true, Some(mrf_notice_target))
|
||||
.await
|
||||
Ok(self
|
||||
.submit_heal_request_with_receipt_alias_and_mrf_notice(request, preserve_alias, true, Some(mrf_notice_target))
|
||||
.await?
|
||||
.receipt)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -2058,7 +2108,7 @@ impl HealManager {
|
||||
preserve_alias: bool,
|
||||
accept_same_request_id_replay: bool,
|
||||
mrf_notice_target: Option<MrfRepairNoticeTarget>,
|
||||
) -> Result<HealAdmissionReceipt> {
|
||||
) -> Result<ObservedHealAdmissionReceipt> {
|
||||
let admission_start = Instant::now();
|
||||
if request.id.is_empty() {
|
||||
request.id = uuid::Uuid::new_v4().to_string();
|
||||
@@ -2119,77 +2169,10 @@ impl HealManager {
|
||||
let mut queue = self.heal_queue.lock().await;
|
||||
let mut retrying_heals = self.retrying_heals.lock().await;
|
||||
|
||||
let request_id_admission = active_heals
|
||||
.get(&request.id)
|
||||
.map(|task| (request_matches_task(&request, task), "active"))
|
||||
.or_else(|| {
|
||||
queue
|
||||
.requests()
|
||||
.find(|queued| queued.id == request.id)
|
||||
.map(|queued| (request_matches_request(&request, queued), "queued"))
|
||||
})
|
||||
.or_else(|| {
|
||||
retrying_heals
|
||||
.get(&request.id)
|
||||
.map(|retrying| (request_matches_request(&request, &retrying.request), "retrying"))
|
||||
})
|
||||
// A durable-only owner must be resumed by recovery, not overwritten
|
||||
// with a new execution budget by a replay before recovery completes.
|
||||
.or_else(|| {
|
||||
durable_owners
|
||||
.iter()
|
||||
.find(|owner| owner.id == request.id)
|
||||
.map(|_| (false, "durable"))
|
||||
});
|
||||
if let Some((matches_existing, duplicate_state)) = request_id_admission {
|
||||
let admission = if matches_existing {
|
||||
if accept_same_request_id_replay {
|
||||
HealAdmissionResult::Accepted
|
||||
} else {
|
||||
Self::duplicate_admission_for_request(&request, &config)
|
||||
}
|
||||
} else {
|
||||
HealAdmissionResult::Dropped(HealAdmissionDropReason::AlreadyRunning)
|
||||
};
|
||||
if matches!(admission, HealAdmissionResult::Accepted | HealAdmissionResult::Merged)
|
||||
&& let Some(target) = mrf_notice_target
|
||||
{
|
||||
let mut targets = lock_mrf_repair_notice_targets(&self.mrf_repair_notice_targets);
|
||||
Self::insert_mrf_repair_notice_target(&mut targets, &request.id, target);
|
||||
}
|
||||
drop(retrying_heals);
|
||||
drop(queue);
|
||||
drop(active_heals);
|
||||
let lock_timing =
|
||||
HealAdmissionLockTiming::finish(lock_phase_start, active_lock_acquired, active_lock_wait, active_lock_hold);
|
||||
Self::record_admission_metric(request.source, admission, "duplicate");
|
||||
self.record_admission_observation(HealAdmissionObservation {
|
||||
source,
|
||||
result: admission,
|
||||
context: "duplicate",
|
||||
force_start,
|
||||
displaced: false,
|
||||
start_duration: admission_start.elapsed(),
|
||||
lock_timing,
|
||||
});
|
||||
debug!(
|
||||
target: "rustfs::heal::manager",
|
||||
event = EVENT_HEAL_QUEUE_ADMISSION,
|
||||
component = LOG_COMPONENT_HEAL,
|
||||
subsystem = LOG_SUBSYSTEM_MANAGER,
|
||||
request_id = %request.id,
|
||||
duplicate_state,
|
||||
result = admission.result_label(),
|
||||
reason = admission.reason_label(),
|
||||
"Heal queue admission reused an existing request id"
|
||||
);
|
||||
return Ok(HealAdmissionReceipt {
|
||||
result: admission,
|
||||
task_id: request.id,
|
||||
});
|
||||
}
|
||||
let mut request_id_admission =
|
||||
lookup_request_id_admission(&request, &active_heals, &queue, &retrying_heals, &durable_owners);
|
||||
|
||||
if source == HealRequestSource::Admin && force_start {
|
||||
if request_id_admission.is_none() && source == HealRequestSource::Admin && force_start {
|
||||
let overlapping = active_heals
|
||||
.values()
|
||||
.map(|task| (&task.id, &task.heal_type, &task.options, task.source))
|
||||
@@ -2235,6 +2218,59 @@ impl HealManager {
|
||||
active_lock_wait += active_lock_acquired.duration_since(reacquire_start);
|
||||
queue = self.heal_queue.lock().await;
|
||||
retrying_heals = self.retrying_heals.lock().await;
|
||||
// Non-admin admission can claim this id while cancellation drops the state locks.
|
||||
request_id_admission = lookup_request_id_admission(&request, &active_heals, &queue, &retrying_heals, &durable_owners);
|
||||
}
|
||||
|
||||
if let Some((matches_existing, duplicate_state, observation_id)) = request_id_admission {
|
||||
let admission = if matches_existing {
|
||||
if accept_same_request_id_replay {
|
||||
HealAdmissionResult::Accepted
|
||||
} else {
|
||||
Self::duplicate_admission_for_request(&request, &config)
|
||||
}
|
||||
} else {
|
||||
HealAdmissionResult::Dropped(HealAdmissionDropReason::AlreadyRunning)
|
||||
};
|
||||
if matches!(admission, HealAdmissionResult::Accepted | HealAdmissionResult::Merged)
|
||||
&& let Some(target) = mrf_notice_target
|
||||
{
|
||||
let mut targets = lock_mrf_repair_notice_targets(&self.mrf_repair_notice_targets);
|
||||
Self::insert_mrf_repair_notice_target(&mut targets, &request.id, target);
|
||||
}
|
||||
drop(retrying_heals);
|
||||
drop(queue);
|
||||
drop(active_heals);
|
||||
let lock_timing =
|
||||
HealAdmissionLockTiming::finish(lock_phase_start, active_lock_acquired, active_lock_wait, active_lock_hold);
|
||||
Self::record_admission_metric(request.source, admission, "duplicate");
|
||||
self.record_admission_observation(HealAdmissionObservation {
|
||||
source,
|
||||
result: admission,
|
||||
context: "duplicate",
|
||||
force_start,
|
||||
displaced: false,
|
||||
start_duration: admission_start.elapsed(),
|
||||
lock_timing,
|
||||
});
|
||||
debug!(
|
||||
target: "rustfs::heal::manager",
|
||||
event = EVENT_HEAL_QUEUE_ADMISSION,
|
||||
component = LOG_COMPONENT_HEAL,
|
||||
subsystem = LOG_SUBSYSTEM_MANAGER,
|
||||
request_id = %request.id,
|
||||
duplicate_state,
|
||||
result = admission.result_label(),
|
||||
reason = admission.reason_label(),
|
||||
"Heal queue admission reused an existing request id"
|
||||
);
|
||||
return Ok(ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result: admission,
|
||||
task_id: request.id,
|
||||
},
|
||||
observation_id,
|
||||
});
|
||||
}
|
||||
|
||||
let rejection = if source == HealRequestSource::Admin {
|
||||
@@ -2282,26 +2318,45 @@ impl HealManager {
|
||||
None
|
||||
};
|
||||
|
||||
let scanner_queued_owner_required = request.source == HealRequestSource::Scanner
|
||||
&& mrf_notice_target.is_none()
|
||||
&& request.expected_mrf_bucket_incarnation_id.is_none();
|
||||
let duplicate = (!request.force_start && rejection.is_none()).then(|| {
|
||||
active_heal_for_dedup_key(&active_heals, &dedup_key)
|
||||
.map(|(task_id, _)| (task_id, "active"))
|
||||
.or_else(|| {
|
||||
queue
|
||||
.queued_request_id_for_dedup_key(&dedup_key)
|
||||
.map(|queued_id| (queued_id.to_string(), "queued"))
|
||||
.map(|(task_id, _)| {
|
||||
let observation_id = active_heals.get(&task_id).and_then(|task| task.observation_id);
|
||||
(task_id, "active", observation_id)
|
||||
})
|
||||
.or_else(|| {
|
||||
let owner = if scanner_queued_owner_required {
|
||||
queue.queued_scanner_owner_for_dedup_key(&dedup_key)
|
||||
} else {
|
||||
queue.queued_legacy_owner_for_dedup_key(&dedup_key)
|
||||
};
|
||||
owner
|
||||
.map(|(id, observation_id)| (id.to_string(), "queued", observation_id))
|
||||
.or_else(|| {
|
||||
(scanner_queued_owner_required && queue.dedup_keys.contains_key(&dedup_key))
|
||||
.then(|| (request.id.clone(), "queued_owner_unknown", None))
|
||||
})
|
||||
})
|
||||
.or_else(|| {
|
||||
retrying_heal_for_dedup_key(&retrying_heals, &dedup_key).map(|(task_id, _)| {
|
||||
let observation_id = retrying_heals.get(&task_id).and_then(|retry| retry.observation_id);
|
||||
(task_id, "retrying", observation_id)
|
||||
})
|
||||
})
|
||||
.or_else(|| retrying_heal_for_dedup_key(&retrying_heals, &dedup_key).map(|(task_id, _)| (task_id, "retrying")))
|
||||
});
|
||||
if let Some((merged_task_id, duplicate_state)) = duplicate.flatten() {
|
||||
if let Some((merged_task_id, duplicate_state, observation_id)) = duplicate.flatten() {
|
||||
// HS-06: under the minio_error overlap policy an exact duplicate
|
||||
// admin start reports the typed AlreadyRunning rejection instead
|
||||
// of the silent merge (MinIO's ErrHealAlreadyRunning).
|
||||
let mut admission = if (request.source == HealRequestSource::Admin
|
||||
&& config.overlap_policy == HealOverlapPolicy::MinioError)
|
||||
let mut admission = if duplicate_state == "queued_owner_unknown"
|
||||
|| (request.source == HealRequestSource::Admin && config.overlap_policy == HealOverlapPolicy::MinioError)
|
||||
|| (duplicate_state != "queued" && mrf_notice_target.as_ref().is_some_and(|target| target.kind.is_durable()))
|
||||
{
|
||||
// A running/retrying task may have observed the object before
|
||||
// this write committed. Its receipt cannot prove the new lease.
|
||||
// An unknown queued owner cannot certify a receipt. A running or
|
||||
// retrying task may have observed the object before this write.
|
||||
HealAdmissionResult::Dropped(HealAdmissionDropReason::AlreadyRunning)
|
||||
} else {
|
||||
Self::duplicate_admission_for_request(&request, &config)
|
||||
@@ -2400,9 +2455,12 @@ impl HealManager {
|
||||
HealAdmissionResult::Accepted | HealAdmissionResult::Full => {}
|
||||
}
|
||||
|
||||
return Ok(HealAdmissionReceipt {
|
||||
result: admission,
|
||||
task_id: merged_task_id,
|
||||
return Ok(ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result: admission,
|
||||
task_id: merged_task_id,
|
||||
},
|
||||
observation_id,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -2433,9 +2491,12 @@ impl HealManager {
|
||||
result = "overlap_rejected",
|
||||
"Admin heal start rejected by overlap policy"
|
||||
);
|
||||
return Ok(HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Dropped(reason),
|
||||
task_id: overlap_task_id,
|
||||
return Ok(ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Dropped(reason),
|
||||
task_id: overlap_task_id,
|
||||
},
|
||||
observation_id: None,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -2477,9 +2538,12 @@ impl HealManager {
|
||||
result = "dropped_by_disposition",
|
||||
"Heal queue admission answered from the disposition memory"
|
||||
);
|
||||
return Ok(HealAdmissionReceipt {
|
||||
result: admission,
|
||||
task_id: recorded_task_id,
|
||||
return Ok(ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result: admission,
|
||||
task_id: recorded_task_id,
|
||||
},
|
||||
observation_id: None,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -2507,17 +2571,31 @@ impl HealManager {
|
||||
.lock()
|
||||
.unwrap_or_else(|poisoned| poisoned.into_inner())
|
||||
.contains_key(&request.id);
|
||||
let admission_decision = Self::admit_request_to_queue(&mut queue, request, &config, "submit", recovered_replacement);
|
||||
let mut observation_id = rustfs_heal_contracts::completion::new_heal_observation_id();
|
||||
let admission_decision =
|
||||
Self::admit_request_to_queue(&mut queue, request, &config, "submit", recovered_replacement, observation_id);
|
||||
let admission = admission_decision.result;
|
||||
if durable_handoff_required && !admission.is_admitted() {
|
||||
self.root_recovery
|
||||
.remove(&request_id, &request_heal_type, request_source)
|
||||
.await?;
|
||||
}
|
||||
if admission == HealAdmissionResult::Merged
|
||||
&& let Some(queued_id) = queue.queued_request_id_for_dedup_key(&dedup_key)
|
||||
{
|
||||
task_id = queued_id.to_owned();
|
||||
if admission == HealAdmissionResult::Merged {
|
||||
observation_id = None;
|
||||
let owner = if scanner_queued_owner_required {
|
||||
queue.queued_scanner_owner_for_dedup_key(&dedup_key)
|
||||
} else {
|
||||
queue.queued_legacy_owner_for_dedup_key(&dedup_key)
|
||||
};
|
||||
if let Some((id, owner_observation_id)) = owner {
|
||||
task_id = id.to_owned();
|
||||
observation_id = owner_observation_id;
|
||||
} else if scanner_queued_owner_required {
|
||||
return Err(Error::Other("Scanner queued owner is unavailable".to_owned()));
|
||||
}
|
||||
}
|
||||
if !admission.is_admitted() {
|
||||
observation_id = None;
|
||||
}
|
||||
let should_notify = matches!(admission, HealAdmissionResult::Accepted) && config.event_driven_scheduler_enable;
|
||||
let displaced_task_id = admission_decision.displaced_task_id().map(ToOwned::to_owned);
|
||||
@@ -2563,9 +2641,12 @@ impl HealManager {
|
||||
lock_timing,
|
||||
});
|
||||
|
||||
Ok(HealAdmissionReceipt {
|
||||
result: admission,
|
||||
task_id,
|
||||
Ok(ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result: admission,
|
||||
task_id,
|
||||
},
|
||||
observation_id,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -2887,7 +2968,15 @@ impl HealManager {
|
||||
.await?;
|
||||
self.root_recovery.remove(&task.id, &task.heal_type, task.source).await?;
|
||||
task.cancel().await?;
|
||||
publish_completed_heal(&self.completed_heals, &self.task_aliases, &canonical_task_id, completed, true).await;
|
||||
publish_completed_heal(
|
||||
&self.completed_heals,
|
||||
&self.task_aliases,
|
||||
&canonical_task_id,
|
||||
completed,
|
||||
true,
|
||||
task.observation_id,
|
||||
)
|
||||
.await;
|
||||
active_heals.remove(&canonical_task_id);
|
||||
publish_active_heal_count(&active_heals);
|
||||
info!(
|
||||
@@ -2998,7 +3087,15 @@ impl HealManager {
|
||||
.await?;
|
||||
self.root_recovery.remove(&task.id, &task.heal_type, task.source).await?;
|
||||
task.cancel().await?;
|
||||
publish_completed_heal(&self.completed_heals, &self.task_aliases, task_id, completed, true).await;
|
||||
publish_completed_heal(
|
||||
&self.completed_heals,
|
||||
&self.task_aliases,
|
||||
task_id,
|
||||
completed,
|
||||
true,
|
||||
task.observation_id,
|
||||
)
|
||||
.await;
|
||||
}
|
||||
active_heals.remove(task_id);
|
||||
cancelled += 1;
|
||||
|
||||
@@ -693,7 +693,7 @@ impl HealManager {
|
||||
let config = config.read().await;
|
||||
let mut queue = heal_queue.lock().await;
|
||||
let admission_decision =
|
||||
Self::admit_request_to_queue(&mut queue, req, &config, "auto_scan", recovered_replacement);
|
||||
Self::admit_request_to_queue(&mut queue, req, &config, "auto_scan", recovered_replacement, rustfs_heal_contracts::completion::new_heal_observation_id());
|
||||
let admission = admission_decision.result;
|
||||
let should_notify =
|
||||
matches!(admission, HealAdmissionResult::Accepted) && config.event_driven_scheduler_enable;
|
||||
|
||||
@@ -13,15 +13,31 @@
|
||||
// limitations under the License.
|
||||
/// The priority heal queue and its per-key dedup index.
|
||||
use super::*;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
/// Per-key bookkeeping for the queued-request dedup index: how many queued
|
||||
/// requests hold the key, and the id of the first request that opened it —
|
||||
/// the O(1) stand-in for the former heap scan when a merge receipt needs to
|
||||
/// name a queued representative.
|
||||
/// Per-key bookkeeping for the queued-request dedup index. The legacy
|
||||
/// representative is retained for existing non-scanner callers; scanner
|
||||
/// receipts use the separately tracked queued holders.
|
||||
#[derive(Debug)]
|
||||
pub(super) struct DedupKeyEntry {
|
||||
pub(super) refcount: usize,
|
||||
pub(super) representative_request_id: String,
|
||||
representative_sequence: u64,
|
||||
representative_observation_id: Option<rustfs_heal_contracts::completion::HealObservationId>,
|
||||
pub(super) scanner_queued_owners: ScannerQueuedOwners,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(super) struct QueuedOwner {
|
||||
request_id: String,
|
||||
observation_id: Option<rustfs_heal_contracts::completion::HealObservationId>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(super) enum ScannerQueuedOwners {
|
||||
Single(u64),
|
||||
// Once a key has forced duplicates, keep every live holder until it is released.
|
||||
Indexed(BTreeMap<u64, QueuedOwner>),
|
||||
}
|
||||
|
||||
/// Priority queue wrapper for heal requests
|
||||
@@ -70,10 +86,25 @@ pub(super) struct PriorityQueueItem {
|
||||
pub(super) sequence: u64,
|
||||
pub(super) dedup_key: String,
|
||||
pub(super) request: HealRequest,
|
||||
observation_id: Option<rustfs_heal_contracts::completion::HealObservationId>,
|
||||
/// Execution or durable recovery fixed these targets; grace waits can have zero retries.
|
||||
pub(super) replacement_targets_frozen: bool,
|
||||
}
|
||||
|
||||
/// The in-process identity moves with the queue item, including forced duplicates.
|
||||
pub(super) struct QueuedHeal {
|
||||
pub(super) request: HealRequest,
|
||||
pub(super) observation_id: Option<rustfs_heal_contracts::completion::HealObservationId>,
|
||||
}
|
||||
|
||||
impl std::ops::Deref for QueuedHeal {
|
||||
type Target = HealRequest;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.request
|
||||
}
|
||||
}
|
||||
|
||||
impl Eq for PriorityQueueItem {}
|
||||
|
||||
impl PartialEq for PriorityQueueItem {
|
||||
@@ -283,6 +314,7 @@ pub(super) struct HealTaskAlias {
|
||||
#[derive(Debug, Clone)]
|
||||
pub(super) struct RetryingHeal {
|
||||
pub(super) request: HealRequest,
|
||||
pub(super) observation_id: Option<rustfs_heal_contracts::completion::HealObservationId>,
|
||||
pub(super) error: String,
|
||||
pub(super) cancel_token: CancellationToken,
|
||||
}
|
||||
@@ -306,11 +338,7 @@ impl PriorityHealQueue {
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn pop_next(&mut self) -> Option<HealRequest> {
|
||||
self.heap.pop().map(|item| {
|
||||
Self::decrement_or_remove_dedup_key(&mut self.dedup_keys, &item.dedup_key);
|
||||
self.remove_best_effort_count(item.request.source);
|
||||
item.request
|
||||
})
|
||||
self.heap.pop().map(|item| self.remove_queued_item(item).request)
|
||||
}
|
||||
|
||||
pub(super) fn is_empty(&self) -> bool {
|
||||
@@ -318,10 +346,15 @@ impl PriorityHealQueue {
|
||||
}
|
||||
|
||||
pub(super) fn push(&mut self, request: HealRequest) -> QueuePushOutcome {
|
||||
self.push_with_replacement_scope(request, false)
|
||||
self.push_with_replacement_scope(request, false, rustfs_heal_contracts::completion::new_heal_observation_id())
|
||||
}
|
||||
|
||||
pub(super) fn push_with_replacement_scope(&mut self, request: HealRequest, frozen: bool) -> QueuePushOutcome {
|
||||
pub(super) fn push_with_replacement_scope(
|
||||
&mut self,
|
||||
request: HealRequest,
|
||||
frozen: bool,
|
||||
observation_id: Option<rustfs_heal_contracts::completion::HealObservationId>,
|
||||
) -> QueuePushOutcome {
|
||||
let key = Self::make_dedup_key(&request);
|
||||
|
||||
// Check for duplicates unless the caller explicitly forces admission.
|
||||
@@ -332,20 +365,60 @@ impl PriorityHealQueue {
|
||||
// also reserves the dedup key for later non-forced duplicates. The first
|
||||
// request that opens the key becomes the named representative for merge
|
||||
// receipts (taken before `request` moves into the heap).
|
||||
self.dedup_keys
|
||||
.entry(key.clone())
|
||||
.or_insert_with(|| DedupKeyEntry {
|
||||
refcount: 0,
|
||||
representative_request_id: request.id.clone(),
|
||||
})
|
||||
.refcount += 1;
|
||||
self.sequence += 1;
|
||||
let sequence = self.sequence;
|
||||
if let Some(entry) = self.dedup_keys.get_mut(&key) {
|
||||
match &mut entry.scanner_queued_owners {
|
||||
ScannerQueuedOwners::Single(first_sequence) => {
|
||||
let mut owners = BTreeMap::new();
|
||||
if entry.refcount == 1 && entry.representative_sequence == *first_sequence {
|
||||
owners.insert(
|
||||
*first_sequence,
|
||||
QueuedOwner {
|
||||
request_id: entry.representative_request_id.clone(),
|
||||
observation_id: entry.representative_observation_id,
|
||||
},
|
||||
);
|
||||
}
|
||||
owners.insert(
|
||||
sequence,
|
||||
QueuedOwner {
|
||||
request_id: request.id.clone(),
|
||||
observation_id,
|
||||
},
|
||||
);
|
||||
entry.scanner_queued_owners = ScannerQueuedOwners::Indexed(owners);
|
||||
}
|
||||
ScannerQueuedOwners::Indexed(owners) => {
|
||||
owners.insert(
|
||||
sequence,
|
||||
QueuedOwner {
|
||||
request_id: request.id.clone(),
|
||||
observation_id,
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
entry.refcount += 1;
|
||||
} else {
|
||||
self.dedup_keys.insert(
|
||||
key.clone(),
|
||||
DedupKeyEntry {
|
||||
refcount: 1,
|
||||
representative_request_id: request.id.clone(),
|
||||
representative_sequence: sequence,
|
||||
representative_observation_id: observation_id,
|
||||
scanner_queued_owners: ScannerQueuedOwners::Single(sequence),
|
||||
},
|
||||
);
|
||||
}
|
||||
let source = request.source;
|
||||
self.heap.push(PriorityQueueItem {
|
||||
priority: request.priority,
|
||||
sequence: self.sequence,
|
||||
dedup_key: key,
|
||||
request,
|
||||
observation_id,
|
||||
replacement_targets_frozen: frozen,
|
||||
});
|
||||
if is_best_effort_source(source) {
|
||||
@@ -371,7 +444,12 @@ impl PriorityHealQueue {
|
||||
self.can_displace_lower_priority_where(priority, |_| true)
|
||||
}
|
||||
|
||||
pub(super) fn push_displacing_lower_priority_where<F>(&mut self, request: HealRequest, can_displace: F) -> Option<HealRequest>
|
||||
pub(super) fn push_displacing_lower_priority_where<F>(
|
||||
&mut self,
|
||||
request: HealRequest,
|
||||
can_displace: F,
|
||||
observation_id: Option<rustfs_heal_contracts::completion::HealObservationId>,
|
||||
) -> Option<HealRequest>
|
||||
where
|
||||
F: Fn(&HealRequest) -> bool,
|
||||
{
|
||||
@@ -402,7 +480,7 @@ impl PriorityHealQueue {
|
||||
self.heap = retained;
|
||||
|
||||
let displaced = displaced.map(|item| {
|
||||
Self::decrement_or_remove_dedup_key(&mut self.dedup_keys, &item.dedup_key);
|
||||
Self::decrement_or_remove_dedup_key(&mut self.dedup_keys, &item);
|
||||
self.remove_best_effort_count(item.request.source);
|
||||
self.refresh_dedup_representative(&item.dedup_key);
|
||||
item.request
|
||||
@@ -413,7 +491,7 @@ impl PriorityHealQueue {
|
||||
// into `debug_assert_eq!` — in release builds (`debug_assertions` off) the whole
|
||||
// macro, including its argument expression, is compiled out, which would silently
|
||||
// drop the new high-priority request after having already evicted a queued item.
|
||||
let outcome = self.push(request);
|
||||
let outcome = self.push_with_replacement_scope(request, false, observation_id);
|
||||
debug_assert_eq!(outcome, QueuePushOutcome::Accepted);
|
||||
}
|
||||
|
||||
@@ -422,7 +500,7 @@ impl PriorityHealQueue {
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn push_displacing_lower_priority(&mut self, request: HealRequest) -> Option<HealRequest> {
|
||||
self.push_displacing_lower_priority_where(request, |_| true)
|
||||
self.push_displacing_lower_priority_where(request, |_| true, rustfs_heal_contracts::completion::new_heal_observation_id())
|
||||
}
|
||||
|
||||
/// Get statistics about queue contents by priority
|
||||
@@ -446,14 +524,10 @@ impl PriorityHealQueue {
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn pop(&mut self) -> Option<HealRequest> {
|
||||
self.heap.pop().map(|item| {
|
||||
Self::decrement_or_remove_dedup_key(&mut self.dedup_keys, &item.dedup_key);
|
||||
self.remove_best_effort_count(item.request.source);
|
||||
item.request
|
||||
})
|
||||
self.heap.pop().map(|item| self.remove_queued_item(item).request)
|
||||
}
|
||||
|
||||
pub(super) fn pop_runnable_with_skips<F, G>(&mut self, can_run: F, skip_label: G) -> (Option<HealRequest>, Vec<String>)
|
||||
pub(super) fn pop_runnable_with_skips<F, G>(&mut self, can_run: F, skip_label: G) -> (Option<QueuedHeal>, Vec<String>)
|
||||
where
|
||||
F: Fn(&HealRequest) -> bool,
|
||||
G: Fn(&HealRequest) -> Option<String>,
|
||||
@@ -475,17 +549,10 @@ impl PriorityHealQueue {
|
||||
|
||||
self.restore_deferred_items(deferred);
|
||||
|
||||
(
|
||||
selected.map(|item| {
|
||||
Self::decrement_or_remove_dedup_key(&mut self.dedup_keys, &item.dedup_key);
|
||||
self.remove_best_effort_count(item.request.source);
|
||||
item.request
|
||||
}),
|
||||
skipped,
|
||||
)
|
||||
(selected.map(|item| self.remove_queued_item(item)), skipped)
|
||||
}
|
||||
|
||||
pub(super) fn pop_runnable_with_fairness<F, G>(&mut self, can_run: F, skip_label: G) -> (Option<HealRequest>, Vec<String>)
|
||||
pub(super) fn pop_runnable_with_fairness<F, G>(&mut self, can_run: F, skip_label: G) -> (Option<QueuedHeal>, Vec<String>)
|
||||
where
|
||||
F: Fn(&HealRequest) -> bool,
|
||||
G: Fn(&HealRequest) -> Option<String>,
|
||||
@@ -554,15 +621,22 @@ impl PriorityHealQueue {
|
||||
self.heap = BinaryHeap::from(items);
|
||||
|
||||
let chosen = chosen.map(|item| {
|
||||
let request = item.request;
|
||||
Self::decrement_or_remove_dedup_key(&mut self.dedup_keys, &item.dedup_key);
|
||||
self.remove_best_effort_count(request.source);
|
||||
let request = self.remove_queued_item(item);
|
||||
self.record_dispatch(&request);
|
||||
request
|
||||
});
|
||||
(chosen, skipped)
|
||||
}
|
||||
|
||||
fn remove_queued_item(&mut self, item: PriorityQueueItem) -> QueuedHeal {
|
||||
Self::decrement_or_remove_dedup_key(&mut self.dedup_keys, &item);
|
||||
self.remove_best_effort_count(item.request.source);
|
||||
QueuedHeal {
|
||||
request: item.request,
|
||||
observation_id: item.observation_id,
|
||||
}
|
||||
}
|
||||
|
||||
fn record_dispatch(&mut self, request: &HealRequest) {
|
||||
if is_best_effort_source(request.source) {
|
||||
self.mrf_normal_dispatches_since_best_effort = 0;
|
||||
@@ -667,12 +741,34 @@ impl PriorityHealQueue {
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn decrement_or_remove_dedup_key(dedup_keys: &mut HashMap<String, DedupKeyEntry>, key: &str) {
|
||||
if let Some(entry) = dedup_keys.get_mut(key) {
|
||||
fn decrement_or_remove_dedup_key(dedup_keys: &mut HashMap<String, DedupKeyEntry>, item: &PriorityQueueItem) {
|
||||
if let Some(entry) = dedup_keys.get_mut(&item.dedup_key) {
|
||||
match &mut entry.scanner_queued_owners {
|
||||
ScannerQueuedOwners::Single(sequence) if entry.refcount != 1 || *sequence != item.sequence => {
|
||||
entry.scanner_queued_owners = ScannerQueuedOwners::Indexed(BTreeMap::new());
|
||||
entry.representative_observation_id = None;
|
||||
}
|
||||
ScannerQueuedOwners::Single(_) => {}
|
||||
ScannerQueuedOwners::Indexed(owners) => {
|
||||
let matches_holder = owners.len() == entry.refcount
|
||||
&& owners.get(&item.sequence).is_some_and(|owner| {
|
||||
owner.request_id == item.request.id && owner.observation_id == item.observation_id
|
||||
});
|
||||
if matches_holder {
|
||||
owners.remove(&item.sequence);
|
||||
} else {
|
||||
owners.clear();
|
||||
entry.representative_observation_id = None;
|
||||
}
|
||||
}
|
||||
}
|
||||
if entry.refcount <= 1 {
|
||||
dedup_keys.remove(key);
|
||||
dedup_keys.remove(&item.dedup_key);
|
||||
} else {
|
||||
entry.refcount -= 1;
|
||||
if entry.representative_sequence == item.sequence {
|
||||
entry.representative_observation_id = None;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -744,18 +840,59 @@ impl PriorityHealQueue {
|
||||
}
|
||||
|
||||
pub(super) fn queued_request_id_for_dedup_key(&self, key: &str) -> Option<&str> {
|
||||
self.dedup_keys.get(key).map(|entry| entry.representative_request_id.as_str())
|
||||
self.queued_legacy_owner_for_dedup_key(key).map(|(id, _)| id)
|
||||
}
|
||||
|
||||
/// Re-elect the representative for `key` from the queue entries holding
|
||||
/// it. Needed after a holder leaves the queue *without* becoming active
|
||||
/// (canceled by id, or displaced): the former opener may be the request
|
||||
/// that just left, and a merge receipt must never name an id that
|
||||
/// resolves nowhere. The scheduler pop path does not need this — the
|
||||
/// popped request surfaces in `active_heals` under the same id and the
|
||||
/// duplicate pre-check consults active heals before the queue. No-op for
|
||||
/// released keys; the survivor scan only runs when a key still has
|
||||
/// holders, which under forced duplicates is the rare admin path.
|
||||
pub(super) fn queued_legacy_owner_for_dedup_key(
|
||||
&self,
|
||||
key: &str,
|
||||
) -> Option<(&str, Option<rustfs_heal_contracts::completion::HealObservationId>)> {
|
||||
let entry = self.dedup_keys.get(key)?;
|
||||
Some((entry.representative_request_id.as_str(), entry.representative_observation_id))
|
||||
}
|
||||
|
||||
pub(super) fn queued_scanner_owner_for_dedup_key(
|
||||
&self,
|
||||
key: &str,
|
||||
) -> Option<(&str, Option<rustfs_heal_contracts::completion::HealObservationId>)> {
|
||||
let entry = self.dedup_keys.get(key)?;
|
||||
match &entry.scanner_queued_owners {
|
||||
ScannerQueuedOwners::Single(sequence) if entry.refcount == 1 && entry.representative_sequence == *sequence => {
|
||||
Some((entry.representative_request_id.as_str(), entry.representative_observation_id))
|
||||
}
|
||||
ScannerQueuedOwners::Indexed(owners) if owners.len() == entry.refcount => owners
|
||||
.first_key_value()
|
||||
.map(|(_, owner)| (owner.request_id.as_str(), owner.observation_id)),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn scanner_queued_request_id_for_dedup_key(&self, key: &str) -> Option<&str> {
|
||||
self.queued_scanner_owner_for_dedup_key(key).map(|(id, _)| id)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn queued_observation_for_dedup_key(
|
||||
&self,
|
||||
key: &str,
|
||||
) -> Option<rustfs_heal_contracts::completion::HealObservationId> {
|
||||
self.queued_legacy_owner_for_dedup_key(key)
|
||||
.and_then(|(_, observation_id)| observation_id)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub(super) fn queued_observation_for_request_id(
|
||||
&self,
|
||||
id: &str,
|
||||
) -> Option<rustfs_heal_contracts::completion::HealObservationId> {
|
||||
let mut matching = self.heap.iter().filter(|item| item.request.id == id);
|
||||
let observation_id = matching.next()?.observation_id;
|
||||
if matching.next().is_some() { None } else { observation_id }
|
||||
}
|
||||
|
||||
/// Re-elect the legacy representative from the heap after cancellation or
|
||||
/// displacement. Dequeue leaves it unchanged for existing callers.
|
||||
pub(super) fn refresh_dedup_representative(&mut self, key: &str) {
|
||||
if !self.dedup_keys.contains_key(key) {
|
||||
return;
|
||||
@@ -764,10 +901,12 @@ impl PriorityHealQueue {
|
||||
.heap
|
||||
.iter()
|
||||
.find(|item| item.dedup_key == key)
|
||||
.map(|item| item.request.id.clone())
|
||||
.map(|item| (item.request.id.clone(), item.sequence, item.observation_id))
|
||||
&& let Some(entry) = self.dedup_keys.get_mut(key)
|
||||
{
|
||||
entry.representative_request_id = id;
|
||||
entry.representative_request_id = id.0;
|
||||
entry.representative_sequence = id.1;
|
||||
entry.representative_observation_id = id.2;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -786,7 +925,7 @@ impl PriorityHealQueue {
|
||||
while let Some(item) = self.heap.pop() {
|
||||
if removed.is_none() && item.request.id == request_id {
|
||||
let key = item.dedup_key.clone();
|
||||
Self::decrement_or_remove_dedup_key(&mut self.dedup_keys, &key);
|
||||
Self::decrement_or_remove_dedup_key(&mut self.dedup_keys, &item);
|
||||
self.remove_best_effort_count(item.request.source);
|
||||
affected_key = Some(key);
|
||||
removed = Some(item.request);
|
||||
@@ -812,7 +951,7 @@ impl PriorityHealQueue {
|
||||
|
||||
while let Some(item) = self.heap.pop() {
|
||||
if should_remove(&item.request) {
|
||||
Self::decrement_or_remove_dedup_key(&mut self.dedup_keys, &item.dedup_key);
|
||||
Self::decrement_or_remove_dedup_key(&mut self.dedup_keys, &item);
|
||||
self.remove_best_effort_count(item.request.source);
|
||||
affected_keys.push(item.dedup_key);
|
||||
removed.push(item.request);
|
||||
|
||||
@@ -15,6 +15,27 @@ use super::disposition::record_task_disposition;
|
||||
/// The heal scheduler: queue consumption loop and its skip/metric helpers.
|
||||
use super::*;
|
||||
|
||||
pub(super) fn current_task_observation_id(
|
||||
active: &HashMap<String, Arc<HealTask>>,
|
||||
task: &Arc<HealTask>,
|
||||
) -> Option<rustfs_heal_contracts::completion::HealObservationId> {
|
||||
active
|
||||
.get(&task.id)
|
||||
.filter(|owner| Arc::ptr_eq(owner, task))
|
||||
.and_then(|_| task.observation_id)
|
||||
}
|
||||
|
||||
pub(super) fn current_retry_observation_id(
|
||||
retrying: &HashMap<String, RetryingHeal>,
|
||||
task_id: &str,
|
||||
cancel_token: &CancellationToken,
|
||||
) -> Option<rustfs_heal_contracts::completion::HealObservationId> {
|
||||
retrying
|
||||
.get(task_id)
|
||||
.filter(|owner| &owner.cancel_token == cancel_token)
|
||||
.and_then(|owner| owner.observation_id)
|
||||
}
|
||||
|
||||
pub(super) fn retry_admission_delay(
|
||||
grace_deadline: Option<u64>,
|
||||
ordinary_delay: Duration,
|
||||
@@ -211,7 +232,9 @@ impl HealManager {
|
||||
queue.pop_runnable_with_fairness(|_| true, |_| None).0
|
||||
};
|
||||
|
||||
if let Some(mut request) = selected_request {
|
||||
if let Some(queued) = selected_request {
|
||||
let observation_id = queued.observation_id;
|
||||
let mut request = queued.request;
|
||||
request.options.timeout.get_or_insert(config.task_timeout);
|
||||
let task_priority = request.priority;
|
||||
let task_type_label = heal_request_type_label(&request).to_string();
|
||||
@@ -229,6 +252,7 @@ impl HealManager {
|
||||
let mainline_pacer = running_mainline_pacer(&request, &config, workload_provider);
|
||||
let task = Arc::new(
|
||||
HealTask::from_replacement_recovery_request(request, storage.clone(), replacement_resume_endpoint)
|
||||
.with_observation_id(observation_id)
|
||||
.with_mainline_pacer(mainline_pacer)
|
||||
.with_admin_recovery(root_recovery.clone()),
|
||||
);
|
||||
@@ -336,6 +360,9 @@ impl HealManager {
|
||||
tests::pause_completed_retention_before_publish(&task_id, &completed_status).await;
|
||||
let mut active_heals_guard = active_heals_clone.lock().await;
|
||||
let owns_completion = active_heals_guard.contains_key(&task_id);
|
||||
// The legacy scheduler checks only the ID; observation needs the
|
||||
// actual task object because IDs can be reused concurrently.
|
||||
let observation_id = current_task_observation_id(&active_heals_guard, &task);
|
||||
let cancelled_snapshot = if owns_completion {
|
||||
None
|
||||
} else {
|
||||
@@ -428,6 +455,7 @@ impl HealManager {
|
||||
request.id.clone(),
|
||||
RetryingHeal {
|
||||
request: request.clone(),
|
||||
observation_id,
|
||||
error: error.clone(),
|
||||
cancel_token: cancel_token.clone(),
|
||||
},
|
||||
@@ -446,6 +474,7 @@ impl HealManager {
|
||||
&task_id,
|
||||
completed_status_entry,
|
||||
terminal_completion,
|
||||
observation_id,
|
||||
)
|
||||
.await;
|
||||
}
|
||||
@@ -593,8 +622,18 @@ impl HealManager {
|
||||
if retry_cancel_token.is_cancelled() || !retrying.contains_key(&retry_request_id) {
|
||||
return;
|
||||
}
|
||||
let admission_decision =
|
||||
Self::admit_request_to_queue(&mut queue, retry_request.clone(), &retry_config, "retry", true);
|
||||
// A later retry can reuse the ID. Only the same
|
||||
// cancellation token proves this is its owner.
|
||||
let retry_observation_id =
|
||||
current_retry_observation_id(&retrying, &retry_request_id, &retry_cancel_token);
|
||||
let admission_decision = Self::admit_request_to_queue(
|
||||
&mut queue,
|
||||
retry_request.clone(),
|
||||
&retry_config,
|
||||
"retry",
|
||||
true,
|
||||
retry_observation_id,
|
||||
);
|
||||
let admission = admission_decision.result;
|
||||
let should_notify = matches!(admission, HealAdmissionResult::Accepted)
|
||||
&& retry_config.event_driven_scheduler_enable;
|
||||
|
||||
@@ -34,6 +34,7 @@ mod auto_scan;
|
||||
mod completion;
|
||||
mod disposition;
|
||||
mod legacy_ambiguity_logging;
|
||||
mod queued_representative;
|
||||
mod running_mainline;
|
||||
|
||||
use super::super::{DiskOption, DiskStore, Endpoint, new_disk, storage_api::status::BucketInfo};
|
||||
@@ -935,6 +936,7 @@ async fn heal_start_retry_scheduler_carries_explicit_budget_and_identity() {
|
||||
|
||||
#[tokio::test]
|
||||
async fn heal_start_retry_scheduler_carries_explicit_budget_across_retries() {
|
||||
let mut terminals = rustfs_heal_contracts::completion::subscribe_observed_heal_completions();
|
||||
let manager = HealManager::new_without_root_recovery_for_test(
|
||||
Arc::new(MockStorage),
|
||||
Some(HealConfig {
|
||||
@@ -948,10 +950,11 @@ async fn heal_start_retry_scheduler_carries_explicit_budget_across_retries() {
|
||||
request.options.timeout = Some(Duration::from_secs(60));
|
||||
let task_id = request.id.clone();
|
||||
let created_at = request.created_at;
|
||||
manager
|
||||
.submit_heal_request(request)
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_observation_and_alias(request, false)
|
||||
.await
|
||||
.expect("admit explicit-budget task");
|
||||
let observation_id = receipt.observation_id.expect("accepted owner has an observation identity");
|
||||
|
||||
let mut previous_remaining = Duration::from_secs(60);
|
||||
for expected_attempt in 1..=3 {
|
||||
@@ -967,7 +970,9 @@ async fn heal_start_retry_scheduler_carries_explicit_budget_across_retries() {
|
||||
.await
|
||||
.expect("recoverable executor failure should enter retry backoff");
|
||||
|
||||
let retry = manager.retrying_heals.lock().await[&task_id].request.clone();
|
||||
let retry_owner = manager.retrying_heals.lock().await[&task_id].clone();
|
||||
assert_eq!(retry_owner.observation_id, Some(observation_id));
|
||||
let retry = retry_owner.request;
|
||||
assert_eq!(retry.id, task_id);
|
||||
assert_eq!(retry.created_at, created_at);
|
||||
assert_eq!(retry.source, HealRequestSource::Admin);
|
||||
@@ -993,6 +998,10 @@ async fn heal_start_retry_scheduler_carries_explicit_budget_across_retries() {
|
||||
.await
|
||||
.expect("retry backoff should requeue the same task id");
|
||||
assert_eq!(manager.operations_snapshot().await.queue_length, 1);
|
||||
assert_eq!(
|
||||
manager.heal_queue.lock().await.queued_observation_for_request_id(&task_id),
|
||||
Some(observation_id)
|
||||
);
|
||||
}
|
||||
|
||||
process_manager_queue_once(&manager).await;
|
||||
@@ -1013,6 +1022,17 @@ async fn heal_start_retry_scheduler_carries_explicit_budget_across_retries() {
|
||||
);
|
||||
assert_eq!(manager.operations_snapshot().await.queue_length, 0);
|
||||
assert_eq!(manager.operations_snapshot().await.retrying_tasks, 0);
|
||||
let terminal = tokio::time::timeout(Duration::from_secs(5), async {
|
||||
loop {
|
||||
let terminal = terminals.recv().await.expect("terminal channel remains open");
|
||||
if terminal.task_id == task_id {
|
||||
break terminal;
|
||||
}
|
||||
}
|
||||
})
|
||||
.await
|
||||
.expect("retry exhaustion emits one terminal");
|
||||
assert_eq!(terminal.observation_id, Some(observation_id));
|
||||
}
|
||||
|
||||
struct ManagerRecoveryTestHook {
|
||||
@@ -1206,6 +1226,32 @@ fn test_push_displacing_lower_priority_actually_enqueues_new_request() {
|
||||
assert_eq!(queue.len(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn queued_observation_tracks_the_holder_sequence_when_ids_repeat() {
|
||||
let mut queue = PriorityHealQueue::new();
|
||||
let first = bucket_request("same-owner-key", HealPriority::Normal, HealRequestSource::Internal);
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let mut second = first.clone();
|
||||
second.force_start = true;
|
||||
assert_eq!(queue.push_with_replacement_scope(first, false, Some(11)), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.push_with_replacement_scope(second, false, Some(12)), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.queued_observation_for_dedup_key(&key), Some(11));
|
||||
assert_eq!(
|
||||
queue.queued_observation_for_request_id(&queue.heap.peek().expect("holder").request.id),
|
||||
None
|
||||
);
|
||||
|
||||
let (first, _) = queue.pop_runnable_with_fairness(|_| true, |_| None);
|
||||
assert_eq!(first.expect("first holder").observation_id, Some(11));
|
||||
assert_eq!(
|
||||
queue.queued_observation_for_dedup_key(&key),
|
||||
None,
|
||||
"a departed representative is unproven"
|
||||
);
|
||||
let (second, _) = queue.pop_runnable_with_fairness(|_| true, |_| None);
|
||||
assert_eq!(second.expect("second holder").observation_id, Some(12));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn queued_request_id_for_dedup_key_tracks_the_representative() {
|
||||
let mut queue = PriorityHealQueue::new();
|
||||
@@ -1214,6 +1260,7 @@ fn queued_request_id_for_dedup_key_tracks_the_representative() {
|
||||
let first_id = first.id.clone();
|
||||
let first_key = PriorityHealQueue::make_dedup_key(&first);
|
||||
assert_eq!(queue.push(first), QueuePushOutcome::Accepted);
|
||||
assert!(queue.queued_observation_for_dedup_key(&first_key).is_some());
|
||||
|
||||
// A forced duplicate of the same target opens a second entry under
|
||||
// the same key; the representative stays the request that opened it.
|
||||
@@ -1341,6 +1388,7 @@ async fn durable_mrf_anchor_snapshot_follows_live_owners_and_ignores_stale_notic
|
||||
manager.retrying_heals.lock().await.insert(
|
||||
"retry-merged-active".into(),
|
||||
RetryingHeal {
|
||||
observation_id: None,
|
||||
request: retry_request,
|
||||
error: "retry pending".into(),
|
||||
cancel_token: CancellationToken::new(),
|
||||
@@ -2590,6 +2638,7 @@ async fn automatic_replacement_frozen_targets_reject_late_disks_but_cover_duplic
|
||||
manager.retrying_heals.lock().await.insert(
|
||||
owner_id.clone(),
|
||||
RetryingHeal {
|
||||
observation_id: None,
|
||||
request: owner,
|
||||
error: "target unavailable".to_string(),
|
||||
cancel_token: CancellationToken::new(),
|
||||
@@ -2601,7 +2650,7 @@ async fn automatic_replacement_frozen_targets_reject_late_disks_but_cover_duplic
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
let context = if state == "grace" { "retry" } else { "auto_scan" };
|
||||
assert_eq!(
|
||||
HealManager::admit_request_to_queue(&mut queue, owner, &config, context, true).result,
|
||||
HealManager::admit_request_to_queue(&mut queue, owner, &config, context, true, None).result,
|
||||
HealAdmissionResult::Accepted
|
||||
);
|
||||
assert!(
|
||||
@@ -2725,7 +2774,7 @@ fn automatic_replacement_direct_admission_checks_frozen_targets_before_capacity(
|
||||
let owner_id = owner.id.clone();
|
||||
assert_eq!(queue.push(owner), QueuePushOutcome::Accepted);
|
||||
let admit = |queue: &mut PriorityHealQueue, request, frozen| {
|
||||
HealManager::admit_request_to_queue(queue, request, &config, "auto_scan", frozen).result
|
||||
HealManager::admit_request_to_queue(queue, request, &config, "auto_scan", frozen, None).result
|
||||
};
|
||||
assert_eq!(
|
||||
admit(&mut queue, automatic_replacement_request(&["replacement-b"]), false),
|
||||
@@ -3958,6 +4007,7 @@ async fn insert_retrying_request(manager: &HealManager, request: HealRequest) ->
|
||||
manager.retrying_heals.lock().await.insert(
|
||||
task_id.clone(),
|
||||
RetryingHeal {
|
||||
observation_id: None,
|
||||
request: request.clone(),
|
||||
error: "Lock acquisition timeout".to_string(),
|
||||
cancel_token: cancel_token.clone(),
|
||||
@@ -4510,6 +4560,7 @@ async fn test_operations_snapshot_counts_retry_backoff_as_owned_work() {
|
||||
manager.retrying_heals.lock().await.insert(
|
||||
task_id,
|
||||
RetryingHeal {
|
||||
observation_id: None,
|
||||
request,
|
||||
error: "transient".to_string(),
|
||||
cancel_token: CancellationToken::new(),
|
||||
@@ -4789,6 +4840,7 @@ async fn test_get_task_report_preserves_retrying_options() {
|
||||
manager.retrying_heals.lock().await.insert(
|
||||
task_id.clone(),
|
||||
RetryingHeal {
|
||||
observation_id: None,
|
||||
request,
|
||||
error: "transient".to_string(),
|
||||
cancel_token: CancellationToken::new(),
|
||||
|
||||
@@ -37,6 +37,7 @@ async fn install_owner(manager: &HealManager, request: HealRequest, state: Owner
|
||||
manager.retrying_heals.lock().await.insert(
|
||||
id.clone(),
|
||||
RetryingHeal {
|
||||
observation_id: None,
|
||||
request,
|
||||
error: "recoverable fixture error".to_string(),
|
||||
cancel_token: CancellationToken::new(),
|
||||
@@ -450,6 +451,177 @@ async fn admin_overlap_normal_start_cannot_enter_force_start_cancellation_window
|
||||
assert_eq!(manager.heal_queue.lock().await.len(), 1);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn admin_force_start_rechecks_request_id_after_cancelling_overlaps() {
|
||||
for source in [HealRequestSource::Scanner, HealRequestSource::Internal] {
|
||||
let manager = manager_with_policy(HealOverlapPolicy::Merge);
|
||||
let previous_id = install_owner(&manager, admin_prefix_request("bucket", "scope/child/"), OwnerState::Active).await;
|
||||
let aliases = manager.task_aliases.lock().await;
|
||||
let mut replacement = admin_prefix_request("bucket", "scope/");
|
||||
replacement.force_start = true;
|
||||
let request_id = replacement.id.clone();
|
||||
let mut forced = Box::pin(manager.submit_heal_request_with_receipt(replacement));
|
||||
|
||||
tokio::time::timeout(
|
||||
Duration::from_secs(5),
|
||||
std::future::poll_fn(|cx| {
|
||||
assert!(
|
||||
std::pin::pin!(tokio::task::unconstrained(forced.as_mut()))
|
||||
.poll(cx)
|
||||
.is_pending()
|
||||
);
|
||||
if manager.active_heals.try_lock().is_ok() {
|
||||
Poll::Ready(())
|
||||
} else {
|
||||
cx.waker().wake_by_ref();
|
||||
Poll::Pending
|
||||
}
|
||||
}),
|
||||
)
|
||||
.await
|
||||
.expect("forceStart reaches cancellation with registry locks released");
|
||||
|
||||
let mut competing = HealRequest::object("other-bucket".to_string(), "object".to_string(), None);
|
||||
competing.id = request_id.clone();
|
||||
competing.source = source;
|
||||
competing.options.recreate_missing = false;
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_receipt(competing)
|
||||
.await
|
||||
.expect("non-admin admission during forceStart cancellation");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Accepted);
|
||||
assert_eq!(receipt.task_id, request_id);
|
||||
|
||||
drop(aliases);
|
||||
let receipt = forced.await.expect("forceStart returns a conflict");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Dropped(HealAdmissionDropReason::AlreadyRunning));
|
||||
assert_eq!(receipt.task_id, request_id);
|
||||
let queue = manager.heal_queue.lock().await;
|
||||
let same_id: Vec<_> = queue.requests().filter(|request| request.id == request_id).collect();
|
||||
assert_eq!(same_id.len(), 1, "conflicting requests must not share an id");
|
||||
assert_eq!(same_id[0].source, source);
|
||||
drop(queue);
|
||||
assert!(
|
||||
matches!(manager.get_task_status(&previous_id).await, Ok(HealTaskStatus::Cancelled)),
|
||||
"overlapping admin cancellation precedes the conflict recheck"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn forced_id_conflict_preserves_scanner_queued_owner() {
|
||||
for competing_source in [HealRequestSource::Scanner, HealRequestSource::Internal] {
|
||||
let manager = manager_with_policy(HealOverlapPolicy::Merge);
|
||||
let previous_id = install_owner(&manager, admin_object_request("object"), OwnerState::Active).await;
|
||||
let mut queued_ids = Vec::new();
|
||||
for source in [
|
||||
HealRequestSource::Scanner,
|
||||
HealRequestSource::Internal,
|
||||
HealRequestSource::Scanner,
|
||||
] {
|
||||
let mut request = HealRequest::object("bucket".to_string(), "object".to_string(), None);
|
||||
request.source = source;
|
||||
request.force_start = true;
|
||||
let id = request.id.clone();
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_receipt(request)
|
||||
.await
|
||||
.expect("queue forced work");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Accepted);
|
||||
assert_eq!(receipt.task_id, id);
|
||||
queued_ids.push(id);
|
||||
}
|
||||
|
||||
// The first holder leaves the queue, leaving two forced tasks queued.
|
||||
let selected = {
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
let (selected, skipped) = queue.pop_runnable_with_skips(|_| true, |_| None);
|
||||
assert!(skipped.is_empty());
|
||||
let selected = selected.expect("first queued task should run");
|
||||
assert_eq!(selected.id, queued_ids[0]);
|
||||
assert_eq!(queue.len(), 2);
|
||||
selected
|
||||
};
|
||||
let QueuedHeal { request, observation_id } = selected;
|
||||
let completed_task = HealTask::from_request(request, manager.storage.clone()).with_observation_id(observation_id);
|
||||
let mut completed = CompletedHealStatus::snapshot(&completed_task, HealTaskStatus::Completed).await;
|
||||
Arc::make_mut(completed.outcome.as_mut().expect("completed task outcome")).finish(None);
|
||||
manager
|
||||
.completed_heals
|
||||
.lock()
|
||||
.await
|
||||
.insert(queued_ids[0].clone(), Arc::new(completed));
|
||||
|
||||
let aliases = manager.task_aliases.lock().await;
|
||||
let mut replacement = admin_object_request("object");
|
||||
replacement.force_start = true;
|
||||
let competing_id = replacement.id.clone();
|
||||
let mut forced = Box::pin(manager.submit_heal_request_with_receipt(replacement));
|
||||
tokio::time::timeout(
|
||||
Duration::from_secs(5),
|
||||
std::future::poll_fn(|cx| {
|
||||
assert!(
|
||||
std::pin::pin!(tokio::task::unconstrained(forced.as_mut()))
|
||||
.poll(cx)
|
||||
.is_pending()
|
||||
);
|
||||
if manager.active_heals.try_lock().is_ok() {
|
||||
Poll::Ready(())
|
||||
} else {
|
||||
cx.waker().wake_by_ref();
|
||||
Poll::Pending
|
||||
}
|
||||
}),
|
||||
)
|
||||
.await
|
||||
.expect("forceStart reaches cancellation with registry locks released");
|
||||
|
||||
let mut competing = HealRequest::object("bucket".to_string(), "object".to_string(), None);
|
||||
competing.id = competing_id.clone();
|
||||
competing.source = competing_source;
|
||||
competing.force_start = true;
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_receipt(competing)
|
||||
.await
|
||||
.expect("competing same-key forced work");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Accepted);
|
||||
assert_eq!(receipt.task_id, competing_id);
|
||||
|
||||
drop(aliases);
|
||||
let receipt = forced.await.expect("forceStart returns an ID conflict");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Dropped(HealAdmissionDropReason::AlreadyRunning));
|
||||
assert_eq!(receipt.task_id, competing_id);
|
||||
assert!(!manager.active_heals.lock().await.contains_key(&competing_id));
|
||||
assert!(!manager.retrying_heals.lock().await.contains_key(&competing_id));
|
||||
assert!(matches!(manager.get_task_status(&previous_id).await, Ok(HealTaskStatus::Cancelled)));
|
||||
{
|
||||
let queue = manager.heal_queue.lock().await;
|
||||
let same_id: Vec<_> = queue.requests().filter(|request| request.id == competing_id).collect();
|
||||
assert_eq!(same_id.len(), 1, "the competing ID must have one live owner");
|
||||
assert_eq!(same_id[0].source, competing_source);
|
||||
assert_eq!(queue.len(), 3);
|
||||
}
|
||||
|
||||
let mut scanner = HealRequest::object("bucket".to_string(), "object".to_string(), None);
|
||||
scanner.source = HealRequestSource::Scanner;
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_receipt(scanner)
|
||||
.await
|
||||
.expect("scanner should merge into queued work");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Merged);
|
||||
assert_ne!(receipt.task_id, queued_ids[0], "the completed holder cannot own a queued receipt");
|
||||
assert!(
|
||||
manager
|
||||
.heal_queue
|
||||
.lock()
|
||||
.await
|
||||
.requests()
|
||||
.any(|request| request.id == receipt.task_id),
|
||||
"the canonical receipt must name a live queued task"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn admin_overlap_cancel_cannot_miss_a_queued_to_active_transition() {
|
||||
let manager = manager_with_policy(HealOverlapPolicy::Merge);
|
||||
|
||||
@@ -1,6 +1,208 @@
|
||||
use super::*;
|
||||
use crate::heal::outcome::{HealObjectIdentity, HealObjectKind, HealObjectOutcome};
|
||||
use rustfs_heal_contracts::{completion::subscribe_heal_completions, heal_channel::HealScanMode};
|
||||
use rustfs_heal_contracts::{
|
||||
completion::{subscribe_heal_completions, subscribe_observed_heal_completions},
|
||||
heal_channel::HealScanMode,
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn observation_requires_the_current_task_or_retry_object() {
|
||||
let request = bucket_request("observation-object-owner", HealPriority::Normal, HealRequestSource::Internal);
|
||||
let id = request.id.clone();
|
||||
let stale = Arc::new(HealTask::from_request(request.clone(), Arc::new(MockStorage)).with_observation_id(Some(301)));
|
||||
let current = Arc::new(HealTask::from_request(request.clone(), Arc::new(MockStorage)).with_observation_id(Some(302)));
|
||||
let active = HashMap::from([(id.clone(), Arc::clone(¤t))]);
|
||||
assert_eq!(current_task_observation_id(&active, &stale), None);
|
||||
assert_eq!(current_task_observation_id(&active, ¤t), Some(302));
|
||||
|
||||
let current_token = CancellationToken::new();
|
||||
let stale_token = CancellationToken::new();
|
||||
let retrying = HashMap::from([(
|
||||
id.clone(),
|
||||
RetryingHeal {
|
||||
request,
|
||||
observation_id: Some(303),
|
||||
error: "retrying".into(),
|
||||
cancel_token: current_token.clone(),
|
||||
},
|
||||
)]);
|
||||
assert_eq!(current_retry_observation_id(&retrying, &id, &stale_token), None);
|
||||
assert_eq!(current_retry_observation_id(&retrying, &id, ¤t_token), Some(303));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn queued_same_id_replay_is_unknown_but_canonical_merge_retains_owner_identity() {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(Arc::new(MockStorage), None);
|
||||
let request = bucket_request("queued-id-replay-observation", HealPriority::Normal, HealRequestSource::Internal);
|
||||
let first = manager
|
||||
.submit_heal_request_with_observation_and_alias(request.clone(), false)
|
||||
.await
|
||||
.expect("first owner");
|
||||
assert!(first.observation_id.is_some());
|
||||
let replay = manager
|
||||
.submit_heal_request_with_observation_and_alias(request, false)
|
||||
.await
|
||||
.expect("same ID replay");
|
||||
assert_eq!(replay.result, HealAdmissionResult::Accepted);
|
||||
assert_eq!(replay.task_id, first.task_id);
|
||||
assert_eq!(replay.observation_id, None);
|
||||
|
||||
let duplicate = bucket_request("queued-id-replay-observation", HealPriority::Normal, HealRequestSource::Scanner);
|
||||
let merged = manager
|
||||
.submit_heal_request_with_observation_and_alias(duplicate, false)
|
||||
.await
|
||||
.expect("canonical merge");
|
||||
assert_eq!(merged.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(merged.task_id, first.task_id);
|
||||
assert_eq!(merged.observation_id, first.observation_id);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn merged_receipt_uses_live_active_or_retrying_owner_identity() {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(Arc::new(MockStorage), None);
|
||||
let request = bucket_request("owner-observation-states", HealPriority::Normal, HealRequestSource::Internal);
|
||||
let id = request.id.clone();
|
||||
manager.active_heals.lock().await.insert(
|
||||
id.clone(),
|
||||
Arc::new(HealTask::from_request(request.clone(), Arc::new(MockStorage)).with_observation_id(Some(201))),
|
||||
);
|
||||
let scanner = bucket_request("owner-observation-states", HealPriority::Normal, HealRequestSource::Scanner);
|
||||
let active = manager
|
||||
.submit_heal_request_with_observation_and_alias(scanner.clone(), false)
|
||||
.await
|
||||
.expect("active merge");
|
||||
assert_eq!(active.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(active.task_id, id);
|
||||
assert_eq!(active.observation_id, Some(201));
|
||||
manager.active_heals.lock().await.remove(&id);
|
||||
manager.retrying_heals.lock().await.insert(
|
||||
id.clone(),
|
||||
RetryingHeal {
|
||||
request,
|
||||
observation_id: Some(202),
|
||||
error: "retrying".into(),
|
||||
cancel_token: CancellationToken::new(),
|
||||
},
|
||||
);
|
||||
let mut scanner_retry = scanner;
|
||||
scanner_retry.id = Uuid::new_v4().to_string();
|
||||
let retrying = manager
|
||||
.submit_heal_request_with_observation_and_alias(scanner_retry, false)
|
||||
.await
|
||||
.expect("retry merge");
|
||||
assert_eq!(retrying.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(retrying.task_id, id);
|
||||
assert_eq!(retrying.observation_id, Some(202));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn cancelled_or_displaced_queue_owner_does_not_reuse_its_observation_identity() {
|
||||
for displace in [false, true] {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(
|
||||
Arc::new(MockStorage),
|
||||
Some(HealConfig {
|
||||
queue_size: 1,
|
||||
event_driven_scheduler_enable: false,
|
||||
..Default::default()
|
||||
}),
|
||||
);
|
||||
let request = bucket_request("removed-observation-owner", HealPriority::Low, HealRequestSource::Scanner);
|
||||
let old = manager
|
||||
.submit_heal_request_with_observation_and_alias(request.clone(), false)
|
||||
.await
|
||||
.expect("first owner");
|
||||
assert_eq!(old.result, HealAdmissionResult::Accepted);
|
||||
assert!(old.observation_id.is_some());
|
||||
if displace {
|
||||
let urgent = bucket_request("displacing-owner", HealPriority::Urgent, HealRequestSource::Internal);
|
||||
let urgent_id = urgent.id.clone();
|
||||
let admitted = manager
|
||||
.submit_heal_request_with_observation_and_alias(urgent, false)
|
||||
.await
|
||||
.expect("displacing owner");
|
||||
assert_eq!(admitted.result, HealAdmissionResult::Accepted);
|
||||
assert!(
|
||||
manager
|
||||
.heal_queue
|
||||
.lock()
|
||||
.await
|
||||
.requests()
|
||||
.all(|queued| queued.id != old.task_id)
|
||||
);
|
||||
manager.cancel_task(&urgent_id).await.expect("free queue after displacement");
|
||||
} else {
|
||||
manager.cancel_task(&old.task_id).await.expect("cancel queued owner");
|
||||
}
|
||||
let next = manager
|
||||
.submit_heal_request_with_observation_and_alias(request, false)
|
||||
.await
|
||||
.expect("readmit same id");
|
||||
assert_eq!(next.result, HealAdmissionResult::Accepted);
|
||||
assert_eq!(next.task_id, old.task_id);
|
||||
assert!(next.observation_id.is_some());
|
||||
assert_ne!(next.observation_id, old.observation_id);
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn reused_id_has_distinct_owner_generations_in_receipts_and_terminals() {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(Arc::new(MockStorage), None);
|
||||
let mut receiver = subscribe_observed_heal_completions();
|
||||
let request = bucket_request("observation-id-reuse", HealPriority::Normal, HealRequestSource::Internal);
|
||||
|
||||
let first = manager
|
||||
.submit_heal_request_with_observation_and_alias(request.clone(), false)
|
||||
.await
|
||||
.expect("first owner");
|
||||
let mut scanner = bucket_request("observation-id-reuse", HealPriority::Normal, HealRequestSource::Scanner);
|
||||
let merged = manager
|
||||
.submit_heal_request_with_observation_and_alias(scanner.clone(), false)
|
||||
.await
|
||||
.expect("first merge");
|
||||
assert_eq!(merged.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(merged.task_id, first.task_id);
|
||||
assert!(first.observation_id.is_some());
|
||||
assert_eq!(merged.observation_id, first.observation_id);
|
||||
process_manager_queue_once(&manager).await;
|
||||
let first_terminal = tokio::time::timeout(Duration::from_secs(5), async {
|
||||
loop {
|
||||
let terminal = receiver.recv().await.expect("terminal channel");
|
||||
if terminal.task_id == first.task_id {
|
||||
break terminal;
|
||||
}
|
||||
}
|
||||
})
|
||||
.await
|
||||
.expect("first terminal");
|
||||
assert_eq!(first_terminal.observation_id, first.observation_id);
|
||||
|
||||
let second = manager
|
||||
.submit_heal_request_with_observation_and_alias(request, false)
|
||||
.await
|
||||
.expect("reused id");
|
||||
assert_eq!(second.result, HealAdmissionResult::Accepted);
|
||||
assert_eq!(second.task_id, first.task_id);
|
||||
assert_ne!(second.observation_id, first.observation_id);
|
||||
scanner.id = Uuid::new_v4().to_string();
|
||||
let merged_again = manager
|
||||
.submit_heal_request_with_observation_and_alias(scanner, false)
|
||||
.await
|
||||
.expect("second merge");
|
||||
assert_eq!(merged_again.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(merged_again.observation_id, second.observation_id);
|
||||
process_manager_queue_once(&manager).await;
|
||||
let second_terminal = tokio::time::timeout(Duration::from_secs(5), async {
|
||||
loop {
|
||||
let terminal = receiver.recv().await.expect("terminal channel");
|
||||
if terminal.task_id == second.task_id && terminal.observation_id == second.observation_id {
|
||||
break terminal;
|
||||
}
|
||||
}
|
||||
})
|
||||
.await
|
||||
.expect("second terminal");
|
||||
assert_eq!(second_terminal.observation_id, second.observation_id);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn canonical_completion_publishes_typed_objects_only_for_terminal_untruncated_results() {
|
||||
@@ -43,12 +245,12 @@ async fn canonical_completion_publishes_typed_objects_only_for_terminal_untrunca
|
||||
error: "retry".into(),
|
||||
retry_attempt: 1,
|
||||
};
|
||||
publish_completed_heal(&completed_heals, &aliases, &id, completed.clone(), false).await;
|
||||
publish_completed_heal(&completed_heals, &aliases, &id, completed.clone(), false, Some(1)).await;
|
||||
while let Ok(observed) = receiver.try_recv() {
|
||||
assert_ne!(observed.task_id, id, "a retry attempt must not publish a terminal");
|
||||
}
|
||||
completed.status = HealTaskStatus::Completed;
|
||||
publish_completed_heal(&completed_heals, &aliases, &id, completed.clone(), true).await;
|
||||
publish_completed_heal(&completed_heals, &aliases, &id, completed.clone(), true, Some(1)).await;
|
||||
let observed = tokio::time::timeout(Duration::from_secs(1), async {
|
||||
loop {
|
||||
let event = receiver.recv().await.expect("terminal broadcaster stays open");
|
||||
@@ -73,7 +275,7 @@ async fn canonical_completion_publishes_typed_objects_only_for_terminal_untrunca
|
||||
outcome.objects_truncated = true;
|
||||
completed.outcome = Some(Arc::new(outcome));
|
||||
let truncated_id = Uuid::new_v4().to_string();
|
||||
publish_completed_heal(&completed_heals, &aliases, &truncated_id, completed, true).await;
|
||||
publish_completed_heal(&completed_heals, &aliases, &truncated_id, completed, true, Some(1)).await;
|
||||
let truncated = tokio::time::timeout(Duration::from_secs(1), async {
|
||||
loop {
|
||||
let event = receiver.recv().await.expect("terminal broadcaster stays open");
|
||||
|
||||
@@ -0,0 +1,653 @@
|
||||
// Copyright 2026 RustFS Team
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
use super::*;
|
||||
|
||||
fn object_request(source: HealRequestSource, priority: HealPriority, force_start: bool) -> HealRequest {
|
||||
let mut request = HealRequest::new(
|
||||
HealType::Object {
|
||||
bucket: "canonical-owner".to_owned(),
|
||||
object: "object".to_owned(),
|
||||
version_id: None,
|
||||
},
|
||||
HealOptions::default(),
|
||||
priority,
|
||||
);
|
||||
request.source = source;
|
||||
request.force_start = force_start;
|
||||
request
|
||||
}
|
||||
|
||||
fn scoped_object_request(
|
||||
source: HealRequestSource,
|
||||
version_id: &str,
|
||||
pool_index: Option<usize>,
|
||||
set_index: Option<usize>,
|
||||
force_start: bool,
|
||||
) -> HealRequest {
|
||||
let mut request = object_request(source, HealPriority::Low, force_start);
|
||||
let HealType::Object { version_id: version, .. } = &mut request.heal_type else {
|
||||
unreachable!("object_request always constructs an object heal")
|
||||
};
|
||||
*version = Some(version_id.to_owned());
|
||||
request.options.pool_index = pool_index;
|
||||
request.options.set_index = set_index;
|
||||
request.options.recreate_missing = source != HealRequestSource::Scanner;
|
||||
request
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn scanner_receipt_tracks_scoped_read_repair_forced_holders() {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(
|
||||
Arc::new(MockStorage),
|
||||
Some(HealConfig {
|
||||
queue_size: 16,
|
||||
low_priority_merge_enable: true,
|
||||
..HealConfig::default()
|
||||
}),
|
||||
);
|
||||
let version = "00000000-0000-4000-8000-000000000001";
|
||||
let original = scoped_object_request(HealRequestSource::ReadRepair, version, Some(0), Some(1), false);
|
||||
let original_id = original.id.clone();
|
||||
let key = PriorityHealQueue::make_dedup_key(&original);
|
||||
let admitted = manager
|
||||
.submit_heal_request_with_receipt(original)
|
||||
.await
|
||||
.expect("admit read-repair owner");
|
||||
assert_eq!(admitted.result, HealAdmissionResult::Accepted);
|
||||
assert_eq!(admitted.task_id, original_id);
|
||||
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_receipt(scoped_object_request(HealRequestSource::Scanner, version, Some(0), Some(1), false))
|
||||
.await
|
||||
.expect("scanner merges into the scoped read-repair owner");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(receipt.task_id, original_id);
|
||||
|
||||
let first_forced = scoped_object_request(HealRequestSource::Internal, version, Some(0), Some(1), true);
|
||||
let first_forced_id = first_forced.id.clone();
|
||||
let second_forced = scoped_object_request(HealRequestSource::Internal, version, Some(0), Some(1), true);
|
||||
let second_forced_id = second_forced.id.clone();
|
||||
{
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
assert_eq!(queue.push(first_forced), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.push(second_forced), QueuePushOutcome::Accepted);
|
||||
let (selected, skipped) = queue.pop_runnable_with_skips(|_| true, |_| None);
|
||||
assert!(skipped.is_empty());
|
||||
assert_eq!(selected.expect("read-repair owner should leave first").id, original_id);
|
||||
assert_eq!(queue.queued_request_id_for_dedup_key(&key), Some(original_id.as_str()));
|
||||
}
|
||||
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_receipt(scoped_object_request(HealRequestSource::Scanner, version, Some(0), Some(1), false))
|
||||
.await
|
||||
.expect("scanner merges into the remaining owner");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(receipt.task_id, first_forced_id);
|
||||
|
||||
{
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
let (selected, _) = queue.pop_runnable_with_skips(|request| request.id == first_forced_id, |_| None);
|
||||
assert_eq!(selected.expect("first forced holder should leave").id, first_forced_id);
|
||||
assert!(queue.contains_request_id(&second_forced_id));
|
||||
}
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_receipt(scoped_object_request(HealRequestSource::Scanner, version, Some(0), Some(1), false))
|
||||
.await
|
||||
.expect("scanner merges into the last queued holder");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(receipt.task_id, second_forced_id);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn scanner_receipt_does_not_merge_read_repair_with_a_different_scope_or_version() {
|
||||
let version = "00000000-0000-4000-8000-000000000001";
|
||||
let other_version = "00000000-0000-4000-8000-000000000002";
|
||||
for (candidate_version, pool, set) in [
|
||||
(version, None, None),
|
||||
(version, Some(1), Some(1)),
|
||||
(version, Some(0), Some(2)),
|
||||
(other_version, Some(0), Some(1)),
|
||||
] {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(
|
||||
Arc::new(MockStorage),
|
||||
Some(HealConfig {
|
||||
queue_size: 16,
|
||||
low_priority_merge_enable: true,
|
||||
..HealConfig::default()
|
||||
}),
|
||||
);
|
||||
let original = scoped_object_request(HealRequestSource::ReadRepair, version, Some(0), Some(1), false);
|
||||
let original_id = original.id.clone();
|
||||
let initial = manager
|
||||
.submit_heal_request_with_receipt(original)
|
||||
.await
|
||||
.expect("admit read-repair owner");
|
||||
assert_eq!(initial.result, HealAdmissionResult::Accepted);
|
||||
assert_eq!(initial.task_id, original_id);
|
||||
|
||||
let candidate = scoped_object_request(HealRequestSource::Scanner, candidate_version, pool, set, false);
|
||||
let candidate_id = candidate.id.clone();
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_receipt(candidate)
|
||||
.await
|
||||
.expect("admit scanner with a distinct scope or version");
|
||||
assert_eq!(
|
||||
receipt.result,
|
||||
HealAdmissionResult::Accepted,
|
||||
"version={candidate_version}, pool={pool:?}, set={set:?}"
|
||||
);
|
||||
assert_eq!(receipt.task_id, candidate_id);
|
||||
let queue = manager.heal_queue.lock().await;
|
||||
assert!(queue.contains_request_id(&original_id));
|
||||
assert!(queue.contains_request_id(&candidate_id));
|
||||
}
|
||||
}
|
||||
|
||||
async fn scanner_receipt_tracks_queued_owner(use_fairness: bool) {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(
|
||||
Arc::new(MockStorage),
|
||||
Some(HealConfig {
|
||||
queue_size: 16,
|
||||
low_priority_merge_enable: true,
|
||||
overlap_policy: HealOverlapPolicy::Merge,
|
||||
..HealConfig::default()
|
||||
}),
|
||||
);
|
||||
|
||||
if use_fairness {
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
for index in 0..4 {
|
||||
let request = bucket_request(&format!("internal-{index}"), HealPriority::Normal, HealRequestSource::Internal);
|
||||
assert_eq!(queue.push(request), QueuePushOutcome::Accepted);
|
||||
}
|
||||
for _ in 0..4 {
|
||||
let (request, _) = queue.pop_runnable_with_fairness(|_| true, |_| None);
|
||||
assert_eq!(request.expect("internal work should run").source, HealRequestSource::Internal);
|
||||
}
|
||||
}
|
||||
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let first_id = first.id.clone();
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let second = object_request(HealRequestSource::Admin, HealPriority::High, true);
|
||||
let second_id = second.id.clone();
|
||||
for request in [first, second] {
|
||||
assert_eq!(
|
||||
manager
|
||||
.submit_heal_request_with_receipt(request)
|
||||
.await
|
||||
.expect("admit task")
|
||||
.result,
|
||||
HealAdmissionResult::Accepted
|
||||
);
|
||||
}
|
||||
|
||||
let first = {
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
let (selected, skipped) = if use_fairness {
|
||||
queue.pop_runnable_with_fairness(|_| true, |_| None)
|
||||
} else {
|
||||
queue.pop_runnable_with_skips(|_| true, |_| None)
|
||||
};
|
||||
assert!(skipped.is_empty());
|
||||
let selected = selected.expect("the first same-priority task should run");
|
||||
assert_eq!(selected.id, first_id);
|
||||
assert!(queue.contains_request_id(&second_id));
|
||||
assert_eq!(
|
||||
queue.queued_request_id_for_dedup_key(&key),
|
||||
Some(first_id.as_str()),
|
||||
"the existing representative for other sources must remain unchanged"
|
||||
);
|
||||
selected
|
||||
};
|
||||
let QueuedHeal { request, observation_id } = first;
|
||||
manager.active_heals.lock().await.insert(
|
||||
first_id.clone(),
|
||||
Arc::new(HealTask::from_request(request, Arc::new(MockStorage)).with_observation_id(observation_id)),
|
||||
);
|
||||
|
||||
let active = manager
|
||||
.submit_heal_request_with_receipt(object_request(HealRequestSource::Scanner, HealPriority::Low, false))
|
||||
.await
|
||||
.expect("scanner admission while the first task is active");
|
||||
assert_eq!(active.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(active.task_id, first_id, "active ownership keeps precedence");
|
||||
|
||||
let completed_task = manager
|
||||
.active_heals
|
||||
.lock()
|
||||
.await
|
||||
.remove(&first_id)
|
||||
.expect("first task should leave active ownership");
|
||||
let mut retained = CompletedHealStatus::snapshot(&completed_task, HealTaskStatus::Completed).await;
|
||||
Arc::make_mut(retained.outcome.as_mut().expect("retained task outcome")).finish(None);
|
||||
manager
|
||||
.completed_heals
|
||||
.lock()
|
||||
.await
|
||||
.insert(first_id.clone(), Arc::new(retained));
|
||||
let queued = manager
|
||||
.submit_heal_request_with_receipt(object_request(HealRequestSource::Scanner, HealPriority::Low, false))
|
||||
.await
|
||||
.expect("scanner admission after the first task leaves active state");
|
||||
assert_eq!(queued.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(queued.task_id, second_id, "the receipt must name the remaining queued task");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn scanner_receipt_tracks_queued_owner_after_normal_dequeue() {
|
||||
scanner_receipt_tracks_queued_owner(false).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn scanner_receipt_tracks_queued_owner_after_fair_dequeue() {
|
||||
scanner_receipt_tracks_queued_owner(true).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn scanner_receipt_keeps_queued_owner_when_a_different_forced_task_runs() {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(Arc::new(MockStorage), None);
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::Low, false);
|
||||
let first_id = first.id.clone();
|
||||
let second = object_request(HealRequestSource::Admin, HealPriority::High, true);
|
||||
let second_id = second.id.clone();
|
||||
{
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
assert_eq!(queue.push(first), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.push(second), QueuePushOutcome::Accepted);
|
||||
let (selected, _) = queue.pop_runnable_with_skips(|_| true, |_| None);
|
||||
assert_eq!(selected.expect("higher-priority forced task should run").id, second_id);
|
||||
}
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_receipt(object_request(HealRequestSource::Scanner, HealPriority::High, false))
|
||||
.await
|
||||
.expect("scanner admission after a non-representative task leaves the queue");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(receipt.task_id, first_id);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn scanner_receipt_reselects_after_the_queued_owner_is_cancelled() {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(Arc::new(MockStorage), None);
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let first_id = first.id.clone();
|
||||
let second = object_request(HealRequestSource::Admin, HealPriority::High, true);
|
||||
let second_id = second.id.clone();
|
||||
let third = object_request(HealRequestSource::Internal, HealPriority::High, true);
|
||||
let third_id = third.id.clone();
|
||||
{
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
for request in [first, second, third] {
|
||||
assert_eq!(queue.push(request), QueuePushOutcome::Accepted);
|
||||
}
|
||||
let (selected, _) = queue.pop_runnable_with_skips(|_| true, |_| None);
|
||||
assert_eq!(selected.expect("first task should run").id, first_id);
|
||||
}
|
||||
let first_receipt = manager
|
||||
.submit_heal_request_with_receipt(object_request(HealRequestSource::Scanner, HealPriority::High, false))
|
||||
.await
|
||||
.expect("first scanner admission");
|
||||
assert_eq!(first_receipt.result, HealAdmissionResult::Merged);
|
||||
assert!(first_receipt.task_id == second_id || first_receipt.task_id == third_id);
|
||||
let remaining = if first_receipt.task_id == second_id {
|
||||
third_id
|
||||
} else {
|
||||
second_id
|
||||
};
|
||||
manager.heal_queue.lock().await.remove_request_id(&first_receipt.task_id);
|
||||
|
||||
let next_receipt = manager
|
||||
.submit_heal_request_with_receipt(object_request(HealRequestSource::Scanner, HealPriority::High, false))
|
||||
.await
|
||||
.expect("scanner admission after the queued owner is removed");
|
||||
assert_eq!(next_receipt.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(next_receipt.task_id, remaining);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn scanner_receipt_reselects_after_multiple_forced_dequeues() {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(Arc::new(MockStorage), None);
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let first_id = first.id.clone();
|
||||
let second = object_request(HealRequestSource::Admin, HealPriority::High, true);
|
||||
let second_id = second.id.clone();
|
||||
let third = object_request(HealRequestSource::Internal, HealPriority::High, true);
|
||||
let third_id = third.id.clone();
|
||||
{
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
for request in [first, second, third] {
|
||||
assert_eq!(queue.push(request), QueuePushOutcome::Accepted);
|
||||
}
|
||||
let (selected, _) = queue.pop_runnable_with_skips(|_| true, |_| None);
|
||||
assert_eq!(selected.expect("first task should run").id, first_id);
|
||||
}
|
||||
let first_receipt = manager
|
||||
.submit_heal_request_with_receipt(object_request(HealRequestSource::Scanner, HealPriority::High, false))
|
||||
.await
|
||||
.expect("first scanner admission");
|
||||
assert_eq!(first_receipt.result, HealAdmissionResult::Merged);
|
||||
assert!(first_receipt.task_id == second_id || first_receipt.task_id == third_id);
|
||||
let remaining = if first_receipt.task_id == second_id {
|
||||
third_id
|
||||
} else {
|
||||
second_id
|
||||
};
|
||||
{
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
let (selected, _) = queue.pop_runnable_with_skips(|request| request.id == first_receipt.task_id, |_| None);
|
||||
assert_eq!(selected.expect("selected queued owner should run").id, first_receipt.task_id);
|
||||
}
|
||||
let next_receipt = manager
|
||||
.submit_heal_request_with_receipt(object_request(HealRequestSource::Scanner, HealPriority::High, false))
|
||||
.await
|
||||
.expect("scanner admission after another queued owner starts");
|
||||
assert_eq!(next_receipt.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(next_receipt.task_id, remaining);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scanner_owner_index_survives_a_single_remaining_holder_and_new_forced_work() {
|
||||
let mut queue = PriorityHealQueue::new();
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let first_id = first.id.clone();
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let second = object_request(HealRequestSource::Admin, HealPriority::High, true);
|
||||
let second_id = second.id.clone();
|
||||
let third = object_request(HealRequestSource::Internal, HealPriority::High, true);
|
||||
let third_id = third.id.clone();
|
||||
|
||||
assert_eq!(queue.push(first), QueuePushOutcome::Accepted);
|
||||
assert!(matches!(&queue.dedup_keys[&key].scanner_queued_owners, ScannerQueuedOwners::Single(_)));
|
||||
assert_eq!(queue.push(second), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.pop().expect("first queued task").id, first_id);
|
||||
assert_eq!(queue.queued_request_id_for_dedup_key(&key), Some(first_id.as_str()));
|
||||
assert_eq!(queue.scanner_queued_request_id_for_dedup_key(&key), Some(second_id.as_str()));
|
||||
|
||||
assert_eq!(queue.push(third), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.scanner_queued_request_id_for_dedup_key(&key), Some(second_id.as_str()));
|
||||
assert_eq!(queue.pop().expect("second queued task").id, second_id);
|
||||
assert_eq!(queue.scanner_queued_request_id_for_dedup_key(&key), Some(third_id.as_str()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scanner_owner_index_distinguishes_holders_with_the_same_request_id() {
|
||||
let mut queue = PriorityHealQueue::new();
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let shared_id = first.id.clone();
|
||||
let mut second = object_request(HealRequestSource::Admin, HealPriority::High, true);
|
||||
second.id.clone_from(&shared_id);
|
||||
let third = object_request(HealRequestSource::Internal, HealPriority::High, true);
|
||||
let third_id = third.id.clone();
|
||||
for request in [first, second, third] {
|
||||
assert_eq!(queue.push(request), QueuePushOutcome::Accepted);
|
||||
}
|
||||
|
||||
assert_eq!(queue.pop().expect("first holder").id, shared_id);
|
||||
assert_eq!(queue.scanner_queued_request_id_for_dedup_key(&key), Some(shared_id.as_str()));
|
||||
assert_eq!(queue.remove_request_id(&shared_id).expect("second holder").id, shared_id);
|
||||
assert_eq!(queue.scanner_queued_request_id_for_dedup_key(&key), Some(third_id.as_str()));
|
||||
assert_eq!(queue.queued_request_id_for_dedup_key(&key), Some(third_id.as_str()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scanner_owner_index_tracks_bulk_removal_and_key_release() {
|
||||
let mut queue = PriorityHealQueue::new();
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let first_id = first.id.clone();
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let second = object_request(HealRequestSource::Admin, HealPriority::Normal, true);
|
||||
let second_id = second.id.clone();
|
||||
let third = object_request(HealRequestSource::Internal, HealPriority::Low, true);
|
||||
let third_id = third.id.clone();
|
||||
for request in [first, second, third] {
|
||||
assert_eq!(queue.push(request), QueuePushOutcome::Accepted);
|
||||
}
|
||||
|
||||
let removed = queue.remove_matching(|request| request.id == first_id || request.id == second_id);
|
||||
assert_eq!(removed.len(), 2);
|
||||
assert_eq!(queue.scanner_queued_request_id_for_dedup_key(&key), Some(third_id.as_str()));
|
||||
assert_eq!(queue.queued_request_id_for_dedup_key(&key), Some(third_id.as_str()));
|
||||
assert_eq!(queue.remove_matching(|request| request.id == third_id).len(), 1);
|
||||
assert!(!queue.dedup_keys.contains_key(&key));
|
||||
|
||||
let next = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let next_id = next.id.clone();
|
||||
assert_eq!(queue.push(next), QueuePushOutcome::Accepted);
|
||||
assert!(matches!(&queue.dedup_keys[&key].scanner_queued_owners, ScannerQueuedOwners::Single(_)));
|
||||
assert_eq!(queue.scanner_queued_request_id_for_dedup_key(&key), Some(next_id.as_str()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scanner_owner_index_tracks_displacement_without_changing_legacy_reselection() {
|
||||
let mut queue = PriorityHealQueue::new();
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::Low, false);
|
||||
let first_id = first.id.clone();
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let second = object_request(HealRequestSource::Admin, HealPriority::Normal, true);
|
||||
let second_id = second.id.clone();
|
||||
assert_eq!(queue.push(first), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.push(second), QueuePushOutcome::Accepted);
|
||||
|
||||
let incoming = bucket_request("displacement", HealPriority::Urgent, HealRequestSource::Internal);
|
||||
let displaced = queue
|
||||
.push_displacing_lower_priority(incoming)
|
||||
.expect("lower priority task should be displaced");
|
||||
assert_eq!(displaced.id, first_id);
|
||||
assert_eq!(queue.scanner_queued_request_id_for_dedup_key(&key), Some(second_id.as_str()));
|
||||
assert_eq!(queue.queued_request_id_for_dedup_key(&key), Some(second_id.as_str()));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn scanner_receipt_rejects_a_missing_or_empty_holder_index() {
|
||||
for missing in [true, false] {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(Arc::new(MockStorage), None);
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let second = object_request(HealRequestSource::Admin, HealPriority::High, true);
|
||||
{
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
assert_eq!(queue.push(first), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.push(second), QueuePushOutcome::Accepted);
|
||||
let entry = queue.dedup_keys.get_mut(&key).expect("dedup key should exist");
|
||||
entry.scanner_queued_owners = if missing {
|
||||
ScannerQueuedOwners::Single(0)
|
||||
} else {
|
||||
ScannerQueuedOwners::Indexed(std::collections::BTreeMap::new())
|
||||
};
|
||||
}
|
||||
|
||||
for leave_one in [false, true] {
|
||||
if leave_one {
|
||||
manager.heal_queue.lock().await.pop().expect("one holder should leave");
|
||||
}
|
||||
let request = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let request_id = request.id.clone();
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_receipt(request)
|
||||
.await
|
||||
.expect("admission should fail closed");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Dropped(HealAdmissionDropReason::AlreadyRunning));
|
||||
assert_eq!(receipt.task_id, request_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scanner_and_legacy_owners_keep_their_distinct_reselection_orders() {
|
||||
let mut queue = PriorityHealQueue::new();
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let first_id = first.id.clone();
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let second = object_request(HealRequestSource::Admin, HealPriority::Low, true);
|
||||
let second_id = second.id.clone();
|
||||
let third = object_request(HealRequestSource::Internal, HealPriority::Normal, true);
|
||||
let third_id = third.id.clone();
|
||||
for request in [first, second, third] {
|
||||
assert_eq!(queue.push(request), QueuePushOutcome::Accepted);
|
||||
}
|
||||
|
||||
assert_eq!(queue.remove_request_id(&first_id).expect("first holder should be removed").id, first_id);
|
||||
assert_eq!(queue.scanner_queued_request_id_for_dedup_key(&key), Some(second_id.as_str()));
|
||||
assert_eq!(queue.queued_request_id_for_dedup_key(&key), Some(third_id.as_str()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn scanner_owner_index_tracks_a_series_of_forced_holders() {
|
||||
let mut queue = PriorityHealQueue::new();
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let mut ids = vec![first.id.clone()];
|
||||
assert_eq!(queue.push(first), QueuePushOutcome::Accepted);
|
||||
for _ in 0..128 {
|
||||
let request = object_request(HealRequestSource::Internal, HealPriority::High, true);
|
||||
ids.push(request.id.clone());
|
||||
assert_eq!(queue.push(request), QueuePushOutcome::Accepted);
|
||||
}
|
||||
for id in &ids {
|
||||
assert_eq!(queue.scanner_queued_request_id_for_dedup_key(&key), Some(id.as_str()));
|
||||
assert_eq!(&queue.pop().expect("indexed holder should remain queued").id, id);
|
||||
}
|
||||
assert!(!queue.dedup_keys.contains_key(&key));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn observed_scanner_and_legacy_receipts_pair_their_own_reselected_holders() {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(Arc::new(MockStorage), None);
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let first_id = first.id.clone();
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let second = object_request(HealRequestSource::Internal, HealPriority::Low, true);
|
||||
let second_id = second.id.clone();
|
||||
let third = object_request(HealRequestSource::Internal, HealPriority::Normal, true);
|
||||
let third_id = third.id.clone();
|
||||
{
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
for (request, observation_id) in [(first, 11), (second, 12), (third, 13)] {
|
||||
assert_eq!(
|
||||
queue.push_with_replacement_scope(request, false, Some(observation_id)),
|
||||
QueuePushOutcome::Accepted
|
||||
);
|
||||
}
|
||||
assert_eq!(queue.remove_request_id(&first_id).expect("remove first holder").id, first_id);
|
||||
assert_eq!(queue.queued_scanner_owner_for_dedup_key(&key), Some((second_id.as_str(), Some(12))));
|
||||
assert_eq!(queue.queued_legacy_owner_for_dedup_key(&key), Some((third_id.as_str(), Some(13))));
|
||||
}
|
||||
|
||||
for (source, expected_id, expected_observation) in [
|
||||
(HealRequestSource::Scanner, &second_id, 12),
|
||||
(HealRequestSource::Internal, &third_id, 13),
|
||||
] {
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_observation_and_alias(object_request(source, HealPriority::High, false), false)
|
||||
.await
|
||||
.expect("merge into queued owner");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(&receipt.task_id, expected_id);
|
||||
assert_eq!(receipt.observation_id, Some(expected_observation));
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn observed_same_id_holders_use_the_selected_sequence_not_the_id() {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(Arc::new(MockStorage), None);
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let id = first.id.clone();
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let mut second = object_request(HealRequestSource::Internal, HealPriority::High, true);
|
||||
second.id.clone_from(&id);
|
||||
{
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
assert_eq!(queue.push_with_replacement_scope(first, false, Some(21)), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.push_with_replacement_scope(second, false, Some(22)), QueuePushOutcome::Accepted);
|
||||
let (selected, _) = queue.pop_runnable_with_skips(|_| true, |_| None);
|
||||
let selected = selected.expect("first holder should run");
|
||||
assert_eq!(selected.id, id);
|
||||
assert_eq!(selected.observation_id, Some(21));
|
||||
assert_eq!(queue.queued_scanner_owner_for_dedup_key(&key), Some((id.as_str(), Some(22))));
|
||||
assert_eq!(queue.queued_legacy_owner_for_dedup_key(&key), Some((id.as_str(), None)));
|
||||
}
|
||||
|
||||
for (source, expected_observation) in [(HealRequestSource::Scanner, Some(22)), (HealRequestSource::Internal, None)] {
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_observation_and_alias(object_request(source, HealPriority::High, false), false)
|
||||
.await
|
||||
.expect("merge into the selected holder");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(receipt.task_id, id);
|
||||
assert_eq!(receipt.observation_id, expected_observation);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn displaced_holder_reselects_the_remaining_id_and_observation_together() {
|
||||
let mut queue = PriorityHealQueue::new();
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::Low, false);
|
||||
let first_id = first.id.clone();
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let second = object_request(HealRequestSource::Internal, HealPriority::Normal, true);
|
||||
let second_id = second.id.clone();
|
||||
assert_eq!(queue.push_with_replacement_scope(first, false, Some(31)), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.push_with_replacement_scope(second, false, Some(32)), QueuePushOutcome::Accepted);
|
||||
let incoming = bucket_request("observation-displacement", HealPriority::Urgent, HealRequestSource::Internal);
|
||||
let displaced = queue
|
||||
.push_displacing_lower_priority_where(incoming, |_| true, Some(33))
|
||||
.expect("lower-priority holder should be displaced");
|
||||
assert_eq!(displaced.id, first_id);
|
||||
assert_eq!(queue.queued_scanner_owner_for_dedup_key(&key), Some((second_id.as_str(), Some(32))));
|
||||
assert_eq!(queue.queued_legacy_owner_for_dedup_key(&key), Some((second_id.as_str(), Some(32))));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn missing_selected_token_or_inconsistent_index_stays_unknown() {
|
||||
let manager = HealManager::new_without_root_recovery_for_test(Arc::new(MockStorage), None);
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let second = object_request(HealRequestSource::Internal, HealPriority::High, true);
|
||||
let second_id = second.id.clone();
|
||||
{
|
||||
let mut queue = manager.heal_queue.lock().await;
|
||||
assert_eq!(queue.push_with_replacement_scope(first, false, Some(41)), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.push_with_replacement_scope(second, false, None), QueuePushOutcome::Accepted);
|
||||
queue.pop().expect("first holder should leave");
|
||||
assert_eq!(queue.queued_scanner_owner_for_dedup_key(&key), Some((second_id.as_str(), None)));
|
||||
}
|
||||
let receipt = manager
|
||||
.submit_heal_request_with_observation_and_alias(
|
||||
object_request(HealRequestSource::Scanner, HealPriority::High, false),
|
||||
false,
|
||||
)
|
||||
.await
|
||||
.expect("merge into owner without an observation token");
|
||||
assert_eq!(receipt.result, HealAdmissionResult::Merged);
|
||||
assert_eq!(receipt.task_id, second_id);
|
||||
assert_eq!(receipt.observation_id, None);
|
||||
|
||||
let mut queue = PriorityHealQueue::new();
|
||||
let first = object_request(HealRequestSource::Scanner, HealPriority::High, false);
|
||||
let key = PriorityHealQueue::make_dedup_key(&first);
|
||||
let second = object_request(HealRequestSource::Internal, HealPriority::High, true);
|
||||
assert_eq!(queue.push_with_replacement_scope(first, false, Some(51)), QueuePushOutcome::Accepted);
|
||||
assert_eq!(queue.push_with_replacement_scope(second, false, Some(52)), QueuePushOutcome::Accepted);
|
||||
let ScannerQueuedOwners::Indexed(owners) = &mut queue.dedup_keys.get_mut(&key).expect("key").scanner_queued_owners else {
|
||||
panic!("forced holder should create an index");
|
||||
};
|
||||
let first_sequence = *owners.first_key_value().expect("first indexed holder").0;
|
||||
assert!(owners.remove(&first_sequence).is_some());
|
||||
assert_eq!(queue.queued_scanner_owner_for_dedup_key(&key), None);
|
||||
queue.pop().expect("first holder should leave");
|
||||
assert_eq!(queue.queued_scanner_owner_for_dedup_key(&key), None);
|
||||
assert_eq!(queue.queued_legacy_owner_for_dedup_key(&key).and_then(|(_, token)| token), None);
|
||||
}
|
||||
@@ -448,6 +448,7 @@ async fn root_recovery_retry_cancellation_preserves_previous_attempt_outcome() {
|
||||
manager.retrying_heals.lock().await.insert(
|
||||
request.id.clone(),
|
||||
RetryingHeal {
|
||||
observation_id: None,
|
||||
request: request.clone(),
|
||||
error: "retryable".to_string(),
|
||||
cancel_token: CancellationToken::new(),
|
||||
@@ -2153,6 +2154,30 @@ async fn root_recovery_cluster_rejects_inventory_without_checkpoint_headroom() {
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn root_recovery_replayed_queue_owner_gets_a_fresh_in_process_observation_identity() {
|
||||
let (_temp, disk) = recovery_disk().await;
|
||||
let manager = recovery_manager(vec![disk.clone()]);
|
||||
let request = root_request();
|
||||
let first = manager
|
||||
.submit_heal_request_with_observation_and_alias(request.clone(), false)
|
||||
.await
|
||||
.expect("persisted admission");
|
||||
assert_eq!(first.result, HealAdmissionResult::Accepted);
|
||||
assert!(first.observation_id.is_some());
|
||||
drop(manager);
|
||||
|
||||
let replayed = recovery_manager(vec![disk]);
|
||||
replayed.replay_root_heals().await.expect("replay persisted root");
|
||||
let recovered_id = replayed
|
||||
.heal_queue
|
||||
.lock()
|
||||
.await
|
||||
.queued_observation_for_request_id(&request.id);
|
||||
assert!(recovered_id.is_some());
|
||||
assert_ne!(recovered_id, first.observation_id);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn root_recovery_queued_owner_is_not_priority_displaced() {
|
||||
let (_temp, disk) = recovery_disk().await;
|
||||
|
||||
@@ -26,11 +26,7 @@ pub(crate) use rustfs_ecstore::api::disk::{
|
||||
RUSTFS_META_BUCKET as ECSTORE_RUSTFS_META_BUCKET, ReplacementExecutionLease as EcstoreReplacementExecutionLease,
|
||||
};
|
||||
pub(crate) use rustfs_ecstore::api::disk::{DiskOption as EcstoreDiskOption, new_disk as ecstore_new_disk};
|
||||
#[cfg(test)]
|
||||
pub(crate) use rustfs_ecstore::api::error::PoolMetadataError as EcstorePoolMetadataError;
|
||||
pub(crate) use rustfs_ecstore::api::error::{
|
||||
Error as EcstoreErrorType, PoolMetadataFailure as EcstorePoolMetadataFailure, StorageError as EcstoreStorageError,
|
||||
};
|
||||
pub(crate) use rustfs_ecstore::api::error::{Error as EcstoreErrorType, StorageError as EcstoreStorageError};
|
||||
#[cfg(test)]
|
||||
pub(crate) use rustfs_ecstore::api::layout::{
|
||||
EndpointServerPools as EcstoreEndpointServerPools, Endpoints as EcstoreEndpoints, PoolEndpoints as EcstorePoolEndpoints,
|
||||
@@ -57,9 +53,6 @@ pub(crate) use rustfs_ecstore::api::storage::{
|
||||
use rustfs_storage_api as storage_contracts;
|
||||
|
||||
pub(crate) mod owner {
|
||||
#[cfg(test)]
|
||||
pub(crate) use super::EcstorePoolMetadataError;
|
||||
pub(crate) use super::EcstorePoolMetadataFailure;
|
||||
pub(crate) use super::storage_contracts::{ObjectIO, ObjectOperations};
|
||||
|
||||
pub(crate) use super::{
|
||||
|
||||
@@ -413,6 +413,8 @@ pub struct HealResultWindow {
|
||||
pub struct HealTask {
|
||||
/// Task ID
|
||||
pub id: String,
|
||||
/// Process-local diagnostic identity; never persisted or part of a request.
|
||||
pub(crate) observation_id: Option<rustfs_heal_contracts::completion::HealObservationId>,
|
||||
/// Heal type
|
||||
pub heal_type: HealType,
|
||||
pub bucket_incarnation_id: Option<Uuid>,
|
||||
@@ -494,6 +496,7 @@ impl HealTask {
|
||||
pub fn from_request(request: HealRequest, storage: Arc<dyn HealStorageAPI>) -> Self {
|
||||
Self {
|
||||
id: request.id,
|
||||
observation_id: None,
|
||||
heal_type: request.heal_type,
|
||||
bucket_incarnation_id: request.bucket_incarnation_id,
|
||||
expected_mrf_bucket_incarnation_id: request.expected_mrf_bucket_incarnation_id,
|
||||
@@ -529,6 +532,14 @@ impl HealTask {
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn with_observation_id(
|
||||
mut self,
|
||||
observation_id: Option<rustfs_heal_contracts::completion::HealObservationId>,
|
||||
) -> Self {
|
||||
self.observation_id = observation_id;
|
||||
self
|
||||
}
|
||||
|
||||
pub fn retry_request(&self) -> HealRequest {
|
||||
HealRequest {
|
||||
id: self.id.clone(),
|
||||
|
||||
@@ -306,7 +306,9 @@ impl HealTask {
|
||||
let mut progress = self.progress.write().await;
|
||||
progress.update_stage(3, 3);
|
||||
}
|
||||
Err(e)
|
||||
Err(Error::TaskExecutionFailed {
|
||||
message: format!("Failed to heal bucket {bucket}: {e}"),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -518,7 +520,9 @@ impl HealTask {
|
||||
error = %err,
|
||||
"Heal cluster pool metadata failed"
|
||||
);
|
||||
Err(err)
|
||||
Err(Error::TaskExecutionFailed {
|
||||
message: format!("Failed to heal cluster pool metadata: {err}"),
|
||||
})
|
||||
}
|
||||
Err(Error::TaskCancelled) => Err(Error::TaskCancelled),
|
||||
Err(Error::TaskTimeout) => Err(Error::TaskTimeout),
|
||||
@@ -535,7 +539,9 @@ impl HealTask {
|
||||
error = %err,
|
||||
"Heal cluster pool metadata failed"
|
||||
);
|
||||
Err(err)
|
||||
Err(Error::TaskExecutionFailed {
|
||||
message: format!("Failed to heal cluster pool metadata: {err}"),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,6 @@ use super::super::{DiskOption, DiskStore, Endpoint, new_disk};
|
||||
use super::*;
|
||||
use crate::heal::EcstoreError;
|
||||
use crate::heal::storage::HealStorageObjectResult;
|
||||
use crate::heal::storage_api::owner::{EcstorePoolMetadataError, EcstorePoolMetadataFailure};
|
||||
|
||||
mod absent_verdict;
|
||||
mod concurrent_delete;
|
||||
@@ -785,10 +784,7 @@ mod canonical_outcome {
|
||||
async fn untraversable_bucket_does_not_claim_complete_cluster_coverage() {
|
||||
let storage = Arc::new(MockStorage {
|
||||
listed_buckets: Mutex::new(Some(vec!["bucket-a".to_string(), "bucket-b".to_string()])),
|
||||
bucket_heal_errors: Mutex::new(HashMap::from([(
|
||||
"bucket-a".to_string(),
|
||||
VecDeque::from([Error::other("metadata unavailable")]),
|
||||
)])),
|
||||
bucket_heal_errors: Mutex::new(HashMap::from([("bucket-a".to_string(), VecDeque::from(["metadata unavailable"]))])),
|
||||
..Default::default()
|
||||
});
|
||||
let task = HealTask::from_request(
|
||||
@@ -1570,7 +1566,7 @@ struct MockStorage {
|
||||
include_object_dir_candidate: Mutex<bool>,
|
||||
listed_buckets: Mutex<Option<Vec<String>>>,
|
||||
bucket_discovery_incomplete: bool,
|
||||
bucket_heal_errors: Mutex<HashMap<String, VecDeque<Error>>>,
|
||||
bucket_heal_errors: Mutex<HashMap<String, VecDeque<&'static str>>>,
|
||||
bucket_heal_calls: Mutex<Vec<String>>,
|
||||
delete_recovery_results: Mutex<HashMap<String, Result<Option<HealResultItem>>>>,
|
||||
delete_recovery_calls: Mutex<Vec<String>>,
|
||||
@@ -1994,7 +1990,6 @@ fn replacement_identity(
|
||||
|
||||
#[derive(Clone)]
|
||||
enum MockHealObjectOutcome {
|
||||
PoolMetadata { kind: EcstorePoolMetadataFailure, outer: bool },
|
||||
LegacyAmbiguous { outer: bool },
|
||||
MissingObject { outer: bool },
|
||||
MissingVersion,
|
||||
@@ -2014,16 +2009,6 @@ enum MockHealObjectOutcome {
|
||||
PermanentOther(&'static str),
|
||||
}
|
||||
|
||||
fn pool_metadata_error(kind: EcstorePoolMetadataFailure) -> Error {
|
||||
Error::Storage(EcstoreError::other(EcstorePoolMetadataError {
|
||||
kind,
|
||||
operation: "bucket heal".to_owned(),
|
||||
phase: "native_heal",
|
||||
since: std::time::UNIX_EPOCH.into(),
|
||||
source: None,
|
||||
}))
|
||||
}
|
||||
|
||||
fn unavailable_drive_heal_result(state: DriveState) -> (HealResultItem, Option<Error>) {
|
||||
(
|
||||
HealResultItem {
|
||||
@@ -2195,14 +2180,6 @@ impl HealStorageAPI for MockStorage {
|
||||
.and_then(VecDeque::pop_front)
|
||||
{
|
||||
return match outcome {
|
||||
MockHealObjectOutcome::PoolMetadata { kind, outer } => {
|
||||
let error = pool_metadata_error(kind);
|
||||
if outer {
|
||||
Err(error)
|
||||
} else {
|
||||
Ok((HealResultItem::default(), Some(error)))
|
||||
}
|
||||
}
|
||||
MockHealObjectOutcome::LegacyAmbiguous { outer } => {
|
||||
let error = Error::Storage(EcstoreError::DeleteRecoveryLegacyAmbiguous);
|
||||
if outer {
|
||||
@@ -2279,14 +2256,6 @@ impl HealStorageAPI for MockStorage {
|
||||
}
|
||||
if let Some(outcome) = self.heal_object_outcome.lock().unwrap().take() {
|
||||
return match outcome {
|
||||
MockHealObjectOutcome::PoolMetadata { kind, outer } => {
|
||||
let error = pool_metadata_error(kind);
|
||||
if outer {
|
||||
Err(error)
|
||||
} else {
|
||||
Ok((HealResultItem::default(), Some(error)))
|
||||
}
|
||||
}
|
||||
MockHealObjectOutcome::LegacyAmbiguous { outer } => {
|
||||
let error = Error::Storage(EcstoreError::DeleteRecoveryLegacyAmbiguous);
|
||||
if outer {
|
||||
@@ -2418,14 +2387,14 @@ impl HealStorageAPI for MockStorage {
|
||||
async fn heal_bucket(&self, bucket: &str, opts: &HealOpts) -> Result<HealResultItem> {
|
||||
self.bucket_heal_calls.lock().unwrap().push(bucket.to_string());
|
||||
self.bucket_heal_opts.lock().unwrap().push(*opts);
|
||||
if let Some(error) = self
|
||||
if let Some(message) = self
|
||||
.bucket_heal_errors
|
||||
.lock()
|
||||
.unwrap()
|
||||
.get_mut(bucket)
|
||||
.and_then(VecDeque::pop_front)
|
||||
{
|
||||
return Err(error);
|
||||
return Err(Error::other(message));
|
||||
}
|
||||
Ok(HealResultItem::default())
|
||||
}
|
||||
@@ -3460,70 +3429,13 @@ async fn cluster_recreate_fails_when_pool_metadata_heal_fails() {
|
||||
.await
|
||||
.expect_err("cluster recreate heal must not hide pool metadata failure");
|
||||
|
||||
assert!(matches!(err, Error::Other(ref message) if message == "pool metadata missing"));
|
||||
assert!(matches!(err, Error::TaskExecutionFailed { .. }));
|
||||
assert_eq!(
|
||||
storage.heal_object_calls.lock().expect("object calls").as_slice(),
|
||||
["object-a".to_string(), "object-b".to_string(), POOL_META_NAME.to_string()]
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn cluster_pool_metadata_failures_preserve_recovery_classification_in_both_response_shapes() {
|
||||
for outer in [false, true] {
|
||||
for (kind, retryable) in [
|
||||
(EcstorePoolMetadataFailure::ReadUnavailable, true),
|
||||
(EcstorePoolMetadataFailure::TransactionUnknown, true),
|
||||
(EcstorePoolMetadataFailure::RecoveryRequired, false),
|
||||
(EcstorePoolMetadataFailure::FenceLost, false),
|
||||
] {
|
||||
let storage = Arc::new(MockStorage {
|
||||
listed_buckets: Mutex::new(Some(Vec::new())),
|
||||
..Default::default()
|
||||
});
|
||||
storage.heal_object_outcomes.lock().expect("object outcomes").insert(
|
||||
POOL_META_NAME.to_string(),
|
||||
VecDeque::from([MockHealObjectOutcome::PoolMetadata { kind, outer }]),
|
||||
);
|
||||
let mut request = HealRequest::new(
|
||||
HealType::Cluster,
|
||||
HealOptions {
|
||||
recreate_missing: true,
|
||||
timeout: None,
|
||||
..Default::default()
|
||||
},
|
||||
HealPriority::Normal,
|
||||
);
|
||||
request.source = HealRequestSource::Admin;
|
||||
let task = HealTask::from_request(request, storage.clone());
|
||||
let error = task
|
||||
.execute()
|
||||
.await
|
||||
.expect_err("pool metadata failure must reach the scheduler");
|
||||
assert!(
|
||||
matches!(&error, Error::Storage(error) if error.pool_metadata_failure().is_some_and(|failure| failure.kind == kind)),
|
||||
"the original typed pool metadata state must survive either response shape: {error}"
|
||||
);
|
||||
assert_eq!(error.is_recoverable_heal(), retryable, "{kind:?}, outer={outer}");
|
||||
assert_eq!(storage.heal_object_calls.lock().expect("object calls").as_slice(), [POOL_META_NAME]);
|
||||
if retryable {
|
||||
let retry = task
|
||||
.retry_request_with_remaining_timeout()
|
||||
.await
|
||||
.expect("existing retry request");
|
||||
assert_eq!(retry.id, task.id, "recovery retains the accepted task token");
|
||||
HealTask::from_request(retry, storage.clone())
|
||||
.execute()
|
||||
.await
|
||||
.expect("the same task should complete after pool metadata recovery");
|
||||
assert_eq!(
|
||||
storage.heal_object_calls.lock().expect("object calls").as_slice(),
|
||||
[POOL_META_NAME, POOL_META_NAME]
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn cluster_dry_run_does_not_heal_pool_metadata() {
|
||||
let storage = Arc::new(MockStorage::default());
|
||||
@@ -3887,10 +3799,7 @@ async fn test_recursive_bucket_heal_reports_typed_exhausted_and_permanent_failur
|
||||
async fn test_cluster_heal_continues_after_bucket_failure() {
|
||||
let storage = Arc::new(MockStorage {
|
||||
listed_buckets: Mutex::new(Some(vec!["bucket-a".to_string(), "bucket-b".to_string()])),
|
||||
bucket_heal_errors: Mutex::new(HashMap::from([(
|
||||
"bucket-a".to_string(),
|
||||
VecDeque::from([Error::other("metadata unavailable")]),
|
||||
)])),
|
||||
bucket_heal_errors: Mutex::new(HashMap::from([("bucket-a".to_string(), VecDeque::from(["metadata unavailable"]))])),
|
||||
..Default::default()
|
||||
});
|
||||
let request = HealRequest::new(
|
||||
@@ -3922,10 +3831,7 @@ async fn test_cluster_heal_continues_after_bucket_failure() {
|
||||
async fn test_cluster_heal_retries_only_recoverable_bucket() {
|
||||
let storage = Arc::new(MockStorage {
|
||||
listed_buckets: Mutex::new(Some(vec!["bucket-a".to_string(), "bucket-b".to_string()])),
|
||||
bucket_heal_errors: Mutex::new(HashMap::from([(
|
||||
"bucket-a".to_string(),
|
||||
VecDeque::from([Error::other("lock acquisition timeout")]),
|
||||
)])),
|
||||
bucket_heal_errors: Mutex::new(HashMap::from([("bucket-a".to_string(), VecDeque::from(["lock acquisition timeout"]))])),
|
||||
..Default::default()
|
||||
});
|
||||
let request = HealRequest::new(
|
||||
@@ -3949,47 +3855,6 @@ async fn test_cluster_heal_retries_only_recoverable_bucket() {
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test(start_paused = true)]
|
||||
async fn cluster_bucket_heal_retries_only_recoverable_pool_metadata_failures() {
|
||||
for (kind, retryable) in [
|
||||
(EcstorePoolMetadataFailure::ReadUnavailable, true),
|
||||
(EcstorePoolMetadataFailure::TransactionUnknown, true),
|
||||
(EcstorePoolMetadataFailure::RecoveryRequired, false),
|
||||
(EcstorePoolMetadataFailure::FenceLost, false),
|
||||
] {
|
||||
let storage = Arc::new(MockStorage {
|
||||
bucket_incarnation_id: Mutex::new(Some(Uuid::new_v4())),
|
||||
bucket_heal_errors: Mutex::new(HashMap::from([("bucket-a".to_owned(), VecDeque::from([pool_metadata_error(kind)]))])),
|
||||
..Default::default()
|
||||
});
|
||||
let mut request = HealRequest::new(
|
||||
HealType::Cluster,
|
||||
HealOptions {
|
||||
recursive: true,
|
||||
timeout: None,
|
||||
..Default::default()
|
||||
},
|
||||
HealPriority::Normal,
|
||||
);
|
||||
request.source = HealRequestSource::Admin;
|
||||
let task = HealTask::from_request(request, storage.clone());
|
||||
let result = task.execute().await;
|
||||
if retryable {
|
||||
result.expect("a recoverable pool metadata state must not terminate the root heal");
|
||||
assert_eq!(task.get_status().await, HealTaskStatus::Completed);
|
||||
assert_eq!(
|
||||
storage.bucket_heal_calls.lock().expect("bucket calls").as_slice(),
|
||||
["bucket-a", "bucket-a"]
|
||||
);
|
||||
} else {
|
||||
result.expect_err("operator recovery and lost fences must remain terminal");
|
||||
let failure = task.take_batch_failure().await.expect("permanent cluster failure");
|
||||
assert_eq!((failure.retryable, failure.permanent), (0, 1));
|
||||
assert_eq!(storage.bucket_heal_calls.lock().expect("bucket calls").as_slice(), ["bucket-a"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_recursive_bucket_heal_does_not_remove_bucket_metadata() {
|
||||
let storage = Arc::new(MockStorage::default());
|
||||
@@ -4752,7 +4617,7 @@ async fn erasure_set_bucket_prepass_failure_stops_before_object_heal() {
|
||||
let storage = Arc::new(MockStorage {
|
||||
bucket_heal_errors: Mutex::new(HashMap::from([(
|
||||
"bucket-a".to_string(),
|
||||
VecDeque::from([Error::other("injected bucket prepass failure")]),
|
||||
VecDeque::from(["injected bucket prepass failure"]),
|
||||
)])),
|
||||
resume_disk: Mutex::new(Some(disk)),
|
||||
..Default::default()
|
||||
|
||||
+10
-7
@@ -280,12 +280,12 @@ pub async fn init_heal_manager_with_workload_provider(
|
||||
.is_some_and(|hook| hook.fail_channel_init.load(Ordering::SeqCst));
|
||||
#[cfg(not(test))]
|
||||
let force_channel_failure = false;
|
||||
let channel_receiver = if force_channel_failure {
|
||||
Err("forced heal channel initialization failure")
|
||||
} else {
|
||||
rustfs_heal_contracts::heal_channel::init_heal_channels()
|
||||
};
|
||||
let (receiver, receipt_receiver) = match channel_receiver {
|
||||
if force_channel_failure {
|
||||
stop_initializing_manager(&heal_manager).await?;
|
||||
return Err(Error::Config("forced heal channel initialization failure".to_string()));
|
||||
}
|
||||
let channel_receiver = rustfs_heal_contracts::heal_channel::init_heal_channels_with_observations();
|
||||
let (receiver, receipt_receiver, observed_receiver) = match channel_receiver {
|
||||
Ok(receivers) => receivers,
|
||||
Err(err) => {
|
||||
stop_initializing_manager(&heal_manager).await?;
|
||||
@@ -302,7 +302,10 @@ pub async fn init_heal_manager_with_workload_provider(
|
||||
|
||||
tokio::spawn(async move {
|
||||
let mut processor = channel_processor.lock().await;
|
||||
if let Err(e) = processor.start_with_receipts(receiver, receipt_receiver).await {
|
||||
if let Err(e) = processor
|
||||
.start_with_observed_receipts(receiver, receipt_receiver, observed_receiver)
|
||||
.await
|
||||
{
|
||||
error!(
|
||||
target: "rustfs::heal",
|
||||
event = EVENT_HEAL_RUNTIME_STATE,
|
||||
|
||||
@@ -1,313 +0,0 @@
|
||||
// Copyright 2026 RustFS Team
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
//! Durable restrictions owned by an authenticated user. A record is not an IAM
|
||||
//! grant or credential; issuing credentials still requires current IAM checks.
|
||||
use crate::{error::is_err_config_not_found, store::Store};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
const PREFIX: &str = "config/iam/plugin-delegations/v1";
|
||||
|
||||
#[derive(Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct Restrictions {
|
||||
#[serde(default, skip_serializing_if = "Option::is_none", deserialize_with = "present_value")]
|
||||
pub version: Option<u32>,
|
||||
#[serde(default, skip_serializing_if = "Option::is_none", deserialize_with = "present_value")]
|
||||
pub output_bucket: Option<String>,
|
||||
pub deployment: String,
|
||||
pub bucket: String,
|
||||
pub input_prefix: String,
|
||||
pub output_prefix: String,
|
||||
pub expires_at_unix_seconds: u64,
|
||||
}
|
||||
|
||||
// An absent v1 field is compatible; an explicitly null v2 field is invalid.
|
||||
fn present_value<'de, T: Deserialize<'de>, D: serde::Deserializer<'de>>(deserializer: D) -> Result<Option<T>, D::Error> {
|
||||
T::deserialize(deserializer).map(Some)
|
||||
}
|
||||
|
||||
impl Restrictions {
|
||||
pub fn output_bucket(&self) -> Result<&str, DelegationError> {
|
||||
match (self.version, self.output_bucket.as_deref()) {
|
||||
(None, None) => Ok(&self.bucket),
|
||||
(Some(2), Some(output)) => Ok(output),
|
||||
_ => Err(DelegationError::Invalid),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn validate(&self, now: u64) -> Result<(), DelegationError> {
|
||||
let output_bucket = self.output_bucket()?;
|
||||
let names: [&str; 5] = [
|
||||
&self.deployment,
|
||||
&self.bucket,
|
||||
&self.input_prefix,
|
||||
&self.output_prefix,
|
||||
output_bucket,
|
||||
];
|
||||
if names
|
||||
.iter()
|
||||
.any(|s| s.is_empty() || s.len() > 1024 || s.contains("${") || s.chars().any(char::is_control))
|
||||
|| self.bucket.contains('/')
|
||||
|| self.bucket.contains('*')
|
||||
|| self.bucket.contains('?')
|
||||
|| output_bucket.contains('/')
|
||||
|| output_bucket.contains('*')
|
||||
|| output_bucket.contains('?')
|
||||
|| self.input_prefix.contains('*')
|
||||
|| self.input_prefix.contains('?')
|
||||
|| self.output_prefix.contains('*')
|
||||
|| self.output_prefix.contains('?')
|
||||
|| self.expires_at_unix_seconds <= now
|
||||
|| self.expires_at_unix_seconds.saturating_sub(now) > 86400
|
||||
{
|
||||
return Err(DelegationError::Invalid);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct Delegation {
|
||||
pub version: u32,
|
||||
pub id: String,
|
||||
pub revision: String,
|
||||
pub owner_access_key: String,
|
||||
pub created_at_unix_seconds: u64,
|
||||
pub restrictions: Restrictions,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct Tombstone {
|
||||
version: u32,
|
||||
id: String,
|
||||
revision: String,
|
||||
owner_access_key: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, thiserror::Error)]
|
||||
pub enum DelegationError {
|
||||
#[error("invalid delegation restriction")]
|
||||
Invalid,
|
||||
#[error("delegation not found")]
|
||||
NotFound,
|
||||
#[error("delegation owner rejected")]
|
||||
OwnerRejected,
|
||||
#[error("delegation unavailable")]
|
||||
Unavailable,
|
||||
#[error("delegation revoked")]
|
||||
Revoked,
|
||||
#[error("delegation expired")]
|
||||
Expired,
|
||||
}
|
||||
|
||||
fn record_path(id: &str) -> Result<String, DelegationError> {
|
||||
if id.len() != 32 || !id.bytes().all(|c| c.is_ascii_hexdigit()) {
|
||||
return Err(DelegationError::Invalid);
|
||||
}
|
||||
Ok(format!("{PREFIX}/{id}/record.json"))
|
||||
}
|
||||
|
||||
async fn load<T: Store>(store: &T, id: &str) -> Result<Delegation, DelegationError> {
|
||||
let record: Delegation = store.load_iam_config_strict(record_path(id)?).await.map_err(|error| {
|
||||
if is_err_config_not_found(&error) {
|
||||
DelegationError::NotFound
|
||||
} else {
|
||||
DelegationError::Unavailable
|
||||
}
|
||||
})?;
|
||||
if !matches!(record.version, 1 | 2)
|
||||
|| record.version != record.restrictions.version.unwrap_or(1)
|
||||
|| record.id != id
|
||||
|| record.revision != id
|
||||
|| record.owner_access_key.is_empty()
|
||||
{
|
||||
return Err(DelegationError::Unavailable);
|
||||
}
|
||||
record
|
||||
.restrictions
|
||||
.validate(record.created_at_unix_seconds)
|
||||
.map_err(|_| DelegationError::Unavailable)?;
|
||||
Ok(record)
|
||||
}
|
||||
|
||||
pub(crate) async fn create<T: Store>(
|
||||
store: &T,
|
||||
owner: &str,
|
||||
restrictions: Restrictions,
|
||||
now: u64,
|
||||
) -> Result<Delegation, DelegationError> {
|
||||
restrictions.validate(now)?;
|
||||
if owner.is_empty() {
|
||||
return Err(DelegationError::OwnerRejected);
|
||||
}
|
||||
// IDs are generated exclusively here; no update operation accepts an ID.
|
||||
let id = format!("{:032x}", rand::random::<u128>());
|
||||
let path = record_path(&id)?;
|
||||
match store.load_iam_config_strict::<Delegation>(&path).await {
|
||||
Err(error) if is_err_config_not_found(&error) => {}
|
||||
_ => return Err(DelegationError::Unavailable),
|
||||
}
|
||||
let record = Delegation {
|
||||
version: restrictions.version.unwrap_or(1),
|
||||
revision: id.clone(),
|
||||
id,
|
||||
owner_access_key: owner.to_owned(),
|
||||
created_at_unix_seconds: now,
|
||||
restrictions,
|
||||
};
|
||||
store
|
||||
.save_iam_config(&record, path)
|
||||
.await
|
||||
.map_err(|_| DelegationError::Unavailable)?;
|
||||
if load(store, &record.id).await? != record {
|
||||
return Err(DelegationError::Unavailable);
|
||||
}
|
||||
Ok(record)
|
||||
}
|
||||
|
||||
pub(crate) async fn revoke<T: Store>(store: &T, owner: &str, id: &str) -> Result<(), DelegationError> {
|
||||
let record = load(store, id).await?;
|
||||
if record.owner_access_key != owner {
|
||||
return Err(DelegationError::OwnerRejected);
|
||||
}
|
||||
let tombstone = Tombstone {
|
||||
version: 1,
|
||||
id: record.id,
|
||||
revision: record.revision,
|
||||
owner_access_key: record.owner_access_key,
|
||||
};
|
||||
let path = format!("{PREFIX}/{id}/revoked.json");
|
||||
// Every retry writes exactly the same revocation; active records never change.
|
||||
store
|
||||
.save_iam_config(&tombstone, &path)
|
||||
.await
|
||||
.map_err(|_| DelegationError::Unavailable)?;
|
||||
let saved: Tombstone = store
|
||||
.load_iam_config_strict(path)
|
||||
.await
|
||||
.map_err(|_| DelegationError::Unavailable)?;
|
||||
if saved != tombstone {
|
||||
return Err(DelegationError::Unavailable);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) async fn read_active<T: Store>(store: &T, owner: &str, id: &str, now: u64) -> Result<Delegation, DelegationError> {
|
||||
let record = load(store, id).await?;
|
||||
if record.owner_access_key != owner {
|
||||
return Err(DelegationError::OwnerRejected);
|
||||
}
|
||||
check_active(store, record, now).await
|
||||
}
|
||||
|
||||
pub(crate) async fn read_owned<T: Store>(store: &T, owner: &str, id: &str) -> Result<Delegation, DelegationError> {
|
||||
let record = load(store, id).await?;
|
||||
if record.owner_access_key != owner {
|
||||
return Err(DelegationError::OwnerRejected);
|
||||
}
|
||||
Ok(record)
|
||||
}
|
||||
|
||||
pub(crate) async fn read_active_for_broker<T: Store>(store: &T, id: &str, now: u64) -> Result<Delegation, DelegationError> {
|
||||
let record = load(store, id).await?;
|
||||
check_active(store, record, now).await
|
||||
}
|
||||
async fn check_active<T: Store>(store: &T, record: Delegation, now: u64) -> Result<Delegation, DelegationError> {
|
||||
let id = &record.id;
|
||||
match store
|
||||
.load_iam_config_strict::<Tombstone>(format!("{PREFIX}/{id}/revoked.json"))
|
||||
.await
|
||||
{
|
||||
Ok(_) => return Err(DelegationError::Revoked),
|
||||
Err(error) if is_err_config_not_found(&error) => {}
|
||||
Err(_) => return Err(DelegationError::Unavailable),
|
||||
}
|
||||
if now >= record.restrictions.expires_at_unix_seconds {
|
||||
return Err(DelegationError::Expired);
|
||||
}
|
||||
Ok(record)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn delegation_v1_json_remains_compatible() {
|
||||
let legacy = serde_json::json!({"deployment":"runner-a","bucket":"photos",
|
||||
"input_prefix":"inputs/","output_prefix":"outputs/","expires_at_unix_seconds":200});
|
||||
let restriction: Restrictions = serde_json::from_value(legacy.clone()).expect("legacy restriction");
|
||||
restriction.validate(100).expect("legacy validation");
|
||||
assert_eq!(restriction.output_bucket().expect("v1 output"), "photos");
|
||||
assert_eq!(serde_json::to_value(restriction).expect("legacy serialization"), legacy);
|
||||
let record = serde_json::json!({"version":1,"id":"a".repeat(32),"revision":"a".repeat(32),
|
||||
"owner_access_key":"owner","created_at_unix_seconds":100,"restrictions":legacy});
|
||||
let decoded: Delegation = serde_json::from_value(record.clone()).expect("legacy record");
|
||||
assert_eq!(serde_json::to_value(decoded).expect("legacy record serialization"), record);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn delegation_v2_requires_explicit_output_bucket() {
|
||||
let valid = serde_json::json!({"version":2,"deployment":"runner-a","bucket":"photos",
|
||||
"input_prefix":"inputs/","output_bucket":"artifacts","output_prefix":"outputs/",
|
||||
"expires_at_unix_seconds":200});
|
||||
let restriction: Restrictions = serde_json::from_value(valid.clone()).expect("v2 restriction");
|
||||
restriction.validate(100).expect("explicit output bucket");
|
||||
assert_eq!(restriction.output_bucket().expect("v2 output"), "artifacts");
|
||||
assert_eq!(serde_json::to_value(restriction).expect("v2 serialization"), valid);
|
||||
for key in ["version", "output_bucket"] {
|
||||
let mut bad = valid.clone();
|
||||
bad.as_object_mut().expect("object").remove(key);
|
||||
assert!(
|
||||
serde_json::from_value::<Restrictions>(bad).map_or(true, |r| r.validate(100).is_err()),
|
||||
"v2 required {key}"
|
||||
);
|
||||
}
|
||||
for (key, value) in [
|
||||
("version", serde_json::json!(1)),
|
||||
("version", serde_json::json!(3)),
|
||||
("version", serde_json::Value::Null),
|
||||
("output_bucket", serde_json::Value::Null),
|
||||
("output_bucket", serde_json::json!("")),
|
||||
("output_bucket", serde_json::json!("other/*")),
|
||||
("output_bucket", serde_json::json!("${aws:username}")),
|
||||
("output_bucket", serde_json::json!("other?")),
|
||||
("output_bucket", serde_json::json!("other\n")),
|
||||
("unknown", serde_json::json!(true)),
|
||||
] {
|
||||
let mut bad = valid.clone();
|
||||
bad[key] = value;
|
||||
assert!(
|
||||
serde_json::from_value::<Restrictions>(bad).map_or(true, |r| r.validate(100).is_err()),
|
||||
"invalid v2 {key}"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn restrictions_are_literal_bounded_and_expiring() {
|
||||
let mut restriction = Restrictions {
|
||||
version: None,
|
||||
output_bucket: None,
|
||||
deployment: "runner-a".into(),
|
||||
bucket: "photos".into(),
|
||||
input_prefix: "inputs/".into(),
|
||||
output_prefix: "outputs/".into(),
|
||||
expires_at_unix_seconds: 200,
|
||||
};
|
||||
assert!(restriction.validate(100).is_ok());
|
||||
restriction.output_prefix = "outputs/*".into();
|
||||
assert!(matches!(restriction.validate(100), Err(DelegationError::Invalid)));
|
||||
restriction.output_prefix = "outputs/".into();
|
||||
assert!(matches!(restriction.validate(200), Err(DelegationError::Invalid)));
|
||||
restriction.expires_at_unix_seconds = 200;
|
||||
restriction.input_prefix = "inputs/${aws:username}/".into();
|
||||
assert!(
|
||||
matches!(restriction.validate(100), Err(DelegationError::Invalid)),
|
||||
"C07_LITERAL_SCOPE_BOUND: policy variables are not literal restrictions"
|
||||
);
|
||||
assert!(record_path("../../users").is_err());
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,6 @@ pub(crate) const EVENT_OIDC_DIAGNOSTICS: &str = "oidc_diagnostics";
|
||||
const EVENT_OIDC_STATE: &str = "oidc_state";
|
||||
|
||||
pub mod cache;
|
||||
pub mod delegation;
|
||||
pub mod error;
|
||||
pub mod federation;
|
||||
pub mod keyring;
|
||||
|
||||
@@ -91,7 +91,6 @@ pub(crate) mod crate_boundary {
|
||||
|
||||
pub(crate) mod object_store {
|
||||
pub(crate) use super::storage_contracts::{HTTPPreconditions, ListOperations, ObjectInfoOrErr, ObjectOperations};
|
||||
pub(crate) use rustfs_ecstore::api::config::com::read_config_preserve_empty_with_metadata_opts;
|
||||
}
|
||||
|
||||
pub(crate) mod runtime {
|
||||
|
||||
@@ -26,11 +26,6 @@ pub trait Store: Clone + Send + Sync + 'static {
|
||||
fn has_watcher(&self) -> bool;
|
||||
async fn save_iam_config<Item: Serialize + Send>(&self, item: Item, path: impl AsRef<str> + Send) -> Result<()>;
|
||||
async fn load_iam_config<Item: DeserializeOwned>(&self, path: impl AsRef<str> + Send) -> Result<Item>;
|
||||
/// Only confirmed storage absence may return ConfigNotFound. Corrupt or
|
||||
/// undecryptable objects must remain errors, especially for revocations.
|
||||
async fn load_iam_config_strict<Item: DeserializeOwned>(&self, _path: impl AsRef<str> + Send) -> Result<Item> {
|
||||
Err(crate::error::Error::IamSysNotInitialized)
|
||||
}
|
||||
async fn delete_iam_config(&self, path: impl AsRef<str> + Send) -> Result<()>;
|
||||
|
||||
async fn save_user_identity(&self, name: &str, user_type: UserType, item: UserIdentity, ttl: Option<usize>) -> Result<()>;
|
||||
|
||||
@@ -42,7 +42,6 @@ use tracing::{debug, error, warn};
|
||||
|
||||
use crate::storage_api::object_store::{
|
||||
HTTPPreconditions, ListOperations, ObjectInfoOrErr as StorageObjectInfoOrErr, ObjectOperations,
|
||||
read_config_preserve_empty_with_metadata_opts,
|
||||
};
|
||||
|
||||
pub static IAM_CONFIG_PREFIX: LazyLock<String> = LazyLock::new(|| format!("{IAM_CONFIG_ROOT_PREFIX}/iam"));
|
||||
@@ -612,11 +611,6 @@ impl ObjectStore {
|
||||
Ok(serde_json::from_slice(&outcome.plain)?)
|
||||
}
|
||||
|
||||
fn decode_iam_config_strict<Item: DeserializeOwned>(data: &[u8]) -> Result<Item> {
|
||||
let outcome = Self::decrypt_data_with_source(data)?;
|
||||
Ok(serde_json::from_slice(&outcome.plain)?)
|
||||
}
|
||||
|
||||
/// Parameterized core of [`Store::load_user_identity`].
|
||||
async fn load_user_identity_with(&self, name: &str, user_type: UserType, mode: LoadMode) -> Result<UserIdentity> {
|
||||
let mut u: UserIdentity = self
|
||||
@@ -830,12 +824,6 @@ impl Store for ObjectStore {
|
||||
async fn load_iam_config<Item: DeserializeOwned>(&self, path: impl AsRef<str> + Send) -> Result<Item> {
|
||||
self.load_iam_config_with(path, LoadMode::Locked).await
|
||||
}
|
||||
async fn load_iam_config_strict<Item: DeserializeOwned>(&self, path: impl AsRef<str> + Send) -> Result<Item> {
|
||||
let (data, _) =
|
||||
read_config_preserve_empty_with_metadata_opts(self.object_api.clone(), path.as_ref(), &LoadMode::Locked.read_opts())
|
||||
.await?;
|
||||
Self::decode_iam_config_strict(&data)
|
||||
}
|
||||
/// Saves IAM configuration with a retry mechanism on failure.
|
||||
///
|
||||
/// Attempts to save the IAM configuration up to 5 times if the storage layer is not ready,
|
||||
@@ -1470,40 +1458,6 @@ mod tests {
|
||||
assert!(result.is_err(), "corrupt stream_io data should fail decrypt");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn strict_revocation_load_keeps_real_crypto_failure_distinct_from_absence() {
|
||||
let cred = test_cred();
|
||||
let key = format!("{}:{}", cred.access_key, cred.secret_key);
|
||||
let plain = br#"{"version":1,"id":"revoked"}"#;
|
||||
let mut encrypted = rustfs_crypto::encrypt_stream_io(key.as_bytes(), plain).expect("real stored ciphertext");
|
||||
// Exercise the exact decoder used after the actual object read.
|
||||
assert!(ObjectStore::decode_iam_config_strict::<serde_json::Value>(&encrypted).is_ok());
|
||||
encrypted[50] ^= 0xFF;
|
||||
let error = ObjectStore::decode_iam_config_strict::<serde_json::Value>(&encrypted)
|
||||
.expect_err("corrupt tombstone must not become missing");
|
||||
assert!(
|
||||
matches!(error, Error::CryptoError(_)),
|
||||
"C07_REVOCATION_FAIL_CLOSED: preserve actual crypto error"
|
||||
);
|
||||
assert!(
|
||||
!crate::error::is_err_config_not_found(&error),
|
||||
"C07_REVOCATION_FAIL_CLOSED: corrupted revocation is not absence"
|
||||
);
|
||||
// The preserve-empty reader keeps an existing zero-byte object as
|
||||
// Ok(empty); ecstore's read_config_preserve_empty_distinguishes_empty_object
|
||||
// covers that storage boundary. Its payload must fail here, not become
|
||||
// ConfigNotFound and reactivate a revoked delegation.
|
||||
let empty =
|
||||
ObjectStore::decode_iam_config_strict::<serde_json::Value>(&[]).expect_err("an existing empty tombstone is corrupt");
|
||||
assert!(
|
||||
!crate::error::is_err_config_not_found(&empty),
|
||||
"C07_REVOCATION_FAIL_CLOSED: empty existing revocation is not absence"
|
||||
);
|
||||
let invalid_json =
|
||||
ObjectStore::decode_iam_config_strict::<serde_json::Value>(br#"{"version": }"#).expect_err("invalid stored JSON");
|
||||
assert!(!crate::error::is_err_config_not_found(&invalid_json));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_decrypt_data_short_data_fails() {
|
||||
let short = &[0x00u8; 40]; // less than 41-byte stream_io header, not valid JSON
|
||||
|
||||
+7
-257
@@ -75,7 +75,6 @@ pub const STATUS_ENABLED: &str = "enabled";
|
||||
pub const STATUS_DISABLED: &str = "disabled";
|
||||
|
||||
pub const POLICYNAME: &str = "policy";
|
||||
pub const PLUGIN_ATTEMPT_CREDENTIAL_CLAIM: &str = "rustfs:plugin-attempt-v1";
|
||||
pub const SESSION_POLICY_NAME: &str = "sessionPolicy";
|
||||
pub const SESSION_POLICY_NAME_EXTRACTED: &str = "sessionPolicy-extracted";
|
||||
const VERIFIED_FEDERATED_POLICY_CLAIM: &str = "x-rustfs-internal-federated-policy";
|
||||
@@ -169,12 +168,6 @@ enum PreparedServicePolicyMode {
|
||||
|
||||
#[derive(Clone)]
|
||||
enum PreparedIamMode {
|
||||
TerminalDeny,
|
||||
PluginAttemptSts {
|
||||
is_owner: bool,
|
||||
combined_policy: Policy,
|
||||
session_policy: PreparedSessionPolicy,
|
||||
},
|
||||
Opa,
|
||||
Owner,
|
||||
Deny,
|
||||
@@ -209,7 +202,7 @@ impl PreparedIamAuth {
|
||||
pub async fn needs_existing_object_tag_for_args(&self, args: &Args<'_>) -> bool {
|
||||
match &self.mode {
|
||||
PreparedIamMode::Opa => true,
|
||||
PreparedIamMode::Owner | PreparedIamMode::Deny | PreparedIamMode::TerminalDeny => false,
|
||||
PreparedIamMode::Owner | PreparedIamMode::Deny => false,
|
||||
PreparedIamMode::Regular { combined_policy } => {
|
||||
policy_needs_existing_object_tag_for_args(combined_policy, args).await
|
||||
}
|
||||
@@ -217,11 +210,6 @@ impl PreparedIamAuth {
|
||||
combined_policy,
|
||||
session_policy,
|
||||
..
|
||||
}
|
||||
| PreparedIamMode::PluginAttemptSts {
|
||||
combined_policy,
|
||||
session_policy,
|
||||
..
|
||||
} => {
|
||||
policy_needs_existing_object_tag_for_args(combined_policy, args).await
|
||||
|| prepared_session_policy_needs_existing_object_tag_for_args(session_policy, args).await
|
||||
@@ -251,56 +239,14 @@ impl PreparedIamAuth {
|
||||
pub fn combined_policy_for_view(&self) -> Option<&Policy> {
|
||||
match &self.mode {
|
||||
PreparedIamMode::Regular { combined_policy } => Some(combined_policy),
|
||||
PreparedIamMode::Sts { combined_policy, .. } | PreparedIamMode::PluginAttemptSts { combined_policy, .. } => {
|
||||
Some(combined_policy)
|
||||
}
|
||||
PreparedIamMode::Sts { combined_policy, .. } => Some(combined_policy),
|
||||
PreparedIamMode::ServiceAccount { combined_policy, .. } => Some(combined_policy),
|
||||
PreparedIamMode::Opa | PreparedIamMode::Owner | PreparedIamMode::Deny | PreparedIamMode::TerminalDeny => None,
|
||||
PreparedIamMode::Opa | PreparedIamMode::Owner | PreparedIamMode::Deny => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: Store> IamSys<T> {
|
||||
/// For the authenticated, explicitly configured broker handler only.
|
||||
pub async fn read_active_plugin_delegation_for_broker(
|
||||
&self,
|
||||
id: &str,
|
||||
now: u64,
|
||||
) -> std::result::Result<crate::delegation::Delegation, crate::delegation::DelegationError> {
|
||||
crate::delegation::read_active_for_broker(&self.store.api, id, now).await
|
||||
}
|
||||
pub async fn create_plugin_delegation(
|
||||
&self,
|
||||
owner: &str,
|
||||
restrictions: crate::delegation::Restrictions,
|
||||
now: u64,
|
||||
) -> std::result::Result<crate::delegation::Delegation, crate::delegation::DelegationError> {
|
||||
crate::delegation::create(&self.store.api, owner, restrictions, now).await
|
||||
}
|
||||
pub async fn revoke_plugin_delegation(
|
||||
&self,
|
||||
owner: &str,
|
||||
id: &str,
|
||||
) -> std::result::Result<(), crate::delegation::DelegationError> {
|
||||
crate::delegation::revoke(&self.store.api, owner, id).await
|
||||
}
|
||||
pub async fn read_active_plugin_delegation(
|
||||
&self,
|
||||
owner: &str,
|
||||
id: &str,
|
||||
now: u64,
|
||||
) -> std::result::Result<crate::delegation::Delegation, crate::delegation::DelegationError> {
|
||||
crate::delegation::read_active(&self.store.api, owner, id, now).await
|
||||
}
|
||||
/// Reads an owned delegation record for historical lookups, including expired or revoked records.
|
||||
pub async fn read_owned_plugin_delegation(
|
||||
&self,
|
||||
owner: &str,
|
||||
id: &str,
|
||||
) -> std::result::Result<crate::delegation::Delegation, crate::delegation::DelegationError> {
|
||||
crate::delegation::read_owned(&self.store.api, owner, id).await
|
||||
}
|
||||
|
||||
/// Create a new IamSys instance with the given IamCache store
|
||||
///
|
||||
/// # Arguments
|
||||
@@ -335,16 +281,6 @@ impl<T: Store> IamSys<T> {
|
||||
*guard = PolicyPluginState::Ready(client);
|
||||
}
|
||||
|
||||
/// Restricted credentials require the built-in parent/session intersection.
|
||||
/// External authorization bypasses that path, so only Disabled is supported.
|
||||
pub async fn ensure_restricted_credential_vending() -> Result<()> {
|
||||
if matches!(Self::policy_plugin_state().await, PolicyPluginState::Disabled) {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(Error::IAMActionNotAllowed)
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_policy_plugin_client() -> Option<rustfs_policy::policy::opa::AuthZPlugin> {
|
||||
let policy_plugin_state = get_policy_plugin_state();
|
||||
let guard = policy_plugin_state.read().await;
|
||||
@@ -1447,50 +1383,17 @@ impl<T: Store> IamSys<T> {
|
||||
/// 1) know whether policy evaluation may need `s3:ExistingObjectTag`, and
|
||||
/// 2) evaluate with final conditions without re-merging identity policies.
|
||||
pub async fn prepare_auth(&self, args: &Args<'_>) -> PreparedIamAuth {
|
||||
let marked = args.claims.contains_key(PLUGIN_ATTEMPT_CREDENTIAL_CLAIM);
|
||||
if args.is_owner && !marked {
|
||||
if args.is_owner {
|
||||
return PreparedIamAuth {
|
||||
needs_existing_object_tag: false,
|
||||
mode: PreparedIamMode::Owner,
|
||||
};
|
||||
}
|
||||
// One observed state decides this request's path. Marked credentials
|
||||
// never enter OPA, including after a restart or on another node.
|
||||
let state = Self::policy_plugin_state().await;
|
||||
if marked {
|
||||
if args.is_owner
|
||||
|| args.claims.get(PLUGIN_ATTEMPT_CREDENTIAL_CLAIM) != Some(&Value::Bool(true))
|
||||
|| !matches!(state, PolicyPluginState::Disabled)
|
||||
{
|
||||
return PreparedIamAuth {
|
||||
needs_existing_object_tag: false,
|
||||
mode: PreparedIamMode::TerminalDeny,
|
||||
};
|
||||
}
|
||||
let prepared = self.prepare_builtin_auth(args).await;
|
||||
let mode = match prepared.mode {
|
||||
PreparedIamMode::Sts {
|
||||
is_owner,
|
||||
combined_policy,
|
||||
session_policy,
|
||||
} => PreparedIamMode::PluginAttemptSts {
|
||||
is_owner,
|
||||
combined_policy,
|
||||
session_policy,
|
||||
},
|
||||
_ => PreparedIamMode::TerminalDeny,
|
||||
};
|
||||
return PreparedIamAuth {
|
||||
needs_existing_object_tag: prepared.needs_existing_object_tag,
|
||||
mode,
|
||||
};
|
||||
}
|
||||
if let Some(prepared) = state.prepared_iam_auth() {
|
||||
|
||||
if let Some(prepared) = Self::policy_plugin_state().await.prepared_iam_auth() {
|
||||
return prepared;
|
||||
}
|
||||
self.prepare_builtin_auth(args).await
|
||||
}
|
||||
async fn prepare_builtin_auth(&self, args: &Args<'_>) -> PreparedIamAuth {
|
||||
|
||||
let Ok((is_svc, parent_user)) = self.is_service_account(args.account).await else {
|
||||
return PreparedIamAuth {
|
||||
needs_existing_object_tag: false,
|
||||
@@ -1522,20 +1425,6 @@ impl<T: Store> IamSys<T> {
|
||||
/// bucket policies on an IAM denial. An error must not become an implicit deny.
|
||||
pub async fn try_eval_prepared(&self, prepared: &PreparedIamAuth, args: &Args<'_>) -> Result<bool> {
|
||||
Ok(match &prepared.mode {
|
||||
PreparedIamMode::TerminalDeny => return Err(Error::IAMActionNotAllowed),
|
||||
PreparedIamMode::PluginAttemptSts {
|
||||
is_owner,
|
||||
combined_policy,
|
||||
session_policy,
|
||||
} => {
|
||||
// A false IAM result permits bucket-policy fallback. Restricted
|
||||
// plugin credentials must instead terminate authorization.
|
||||
let session_allowed = evaluate_prepared_session_policy(session_policy, args).await == Some(true);
|
||||
if !session_allowed || !(*is_owner || combined_policy.is_allowed(args).await) {
|
||||
return Err(Error::IAMActionNotAllowed);
|
||||
}
|
||||
true
|
||||
}
|
||||
PreparedIamMode::Opa => {
|
||||
let Some(opa_enable) = Self::get_policy_plugin_client().await else {
|
||||
tracing::warn!("eval_prepared: OPA mode requested but plugin is unavailable");
|
||||
@@ -2238,145 +2127,6 @@ mod tests {
|
||||
assert!(prepared.combined_policy_for_view().is_none());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn marked_signed_sts_denial_is_terminal_before_public_bucket_fallback() {
|
||||
let iam = IamSys::new(IamCache::new(StsTestMockStore::new(false)).await.unwrap());
|
||||
let previous = IamSys::<StsTestMockStore>::policy_plugin_state().await;
|
||||
let signing_key = "c07-test-token-signing-key";
|
||||
let mut metadata=HashMap::from([
|
||||
("parent".into(),Value::String("sts-fallback-test-parent".into())),
|
||||
("exp".into(),serde_json::json!((OffsetDateTime::now_utc()+time::Duration::hours(1)).unix_timestamp())),
|
||||
(SESSION_POLICY_NAME.into(),Value::String(base64_simd::URL_SAFE_NO_PAD.encode_to_string(br#"{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":["s3:GetObject"],"Resource":["arn:aws:s3:::mybucket/inside"]}]}"#))),
|
||||
]);
|
||||
metadata.insert(PLUGIN_ATTEMPT_CREDENTIAL_CLAIM.into(), Value::Bool(true));
|
||||
let mut marked = get_new_credentials_with_metadata(&metadata, signing_key).unwrap();
|
||||
marked.parent_user = "sts-fallback-test-parent".into();
|
||||
let marked_claims: HashMap<String, Value> = rustfs_policy::utils::extract_claims(&marked.session_token, signing_key)
|
||||
.expect("signed test credentials must decode")
|
||||
.claims;
|
||||
let marked_user = UserIdentity::from(marked.clone());
|
||||
iam.store
|
||||
.cache
|
||||
.add_or_update_sts_account(&marked.access_key, &marked_user, OffsetDateTime::now_utc());
|
||||
metadata.remove(PLUGIN_ATTEMPT_CREDENTIAL_CLAIM);
|
||||
let mut ordinary = get_new_credentials_with_metadata(&metadata, signing_key).unwrap();
|
||||
ordinary.parent_user = marked.parent_user.clone();
|
||||
let ordinary_claims: HashMap<String, Value> = rustfs_policy::utils::extract_claims(&ordinary.session_token, signing_key)
|
||||
.expect("signed test credentials must decode")
|
||||
.claims;
|
||||
iam.store.cache.add_or_update_sts_account(
|
||||
&ordinary.access_key,
|
||||
&UserIdentity::from(ordinary.clone()),
|
||||
OffsetDateTime::now_utc(),
|
||||
);
|
||||
let groups = None;
|
||||
let conditions = HashMap::new();
|
||||
let args = Args {
|
||||
account: &marked.access_key,
|
||||
groups: &groups,
|
||||
action: Action::S3Action(S3Action::GetObjectAction),
|
||||
bucket: "mybucket",
|
||||
object: "outside",
|
||||
conditions: &conditions,
|
||||
is_owner: false,
|
||||
claims: &marked_claims,
|
||||
deny_only: false,
|
||||
};
|
||||
*get_policy_plugin_state().write().await = PolicyPluginState::Disabled;
|
||||
let denied = iam.prepare_auth(&args).await;
|
||||
let disabled_terminal = matches!(iam.try_eval_prepared(&denied, &args).await, Err(Error::IAMActionNotAllowed));
|
||||
let inside = Args {
|
||||
object: "inside",
|
||||
..args.clone()
|
||||
};
|
||||
let allowed = iam.prepare_auth(&inside).await;
|
||||
let inside_allowed = matches!(iam.try_eval_prepared(&allowed, &inside).await, Ok(true));
|
||||
let unmarked_args = Args {
|
||||
account: &ordinary.access_key,
|
||||
claims: &ordinary_claims,
|
||||
..args.clone()
|
||||
};
|
||||
let unmarked = iam.prepare_auth(&unmarked_args).await;
|
||||
let ordinary_false = matches!(iam.try_eval_prepared(&unmarked, &unmarked_args).await, Ok(false));
|
||||
let public:rustfs_policy::policy::BucketPolicy=serde_json::from_value(serde_json::json!({"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"AWS":["*"]},"Action":["s3:GetObject"],"Resource":["arn:aws:s3:::mybucket/*"]}]})).unwrap();
|
||||
let public_allows = public
|
||||
.is_allowed(&rustfs_policy::policy::BucketPolicyArgs {
|
||||
account: &marked.access_key,
|
||||
groups: &groups,
|
||||
action: args.action,
|
||||
bucket: args.bucket,
|
||||
object: args.object,
|
||||
conditions: &conditions,
|
||||
is_owner: false,
|
||||
})
|
||||
.await;
|
||||
IamSys::<StsTestMockStore>::set_policy_plugin_client(opa::AuthZPlugin::new(opa::Args {
|
||||
url: "http://127.0.0.1:8181/allow".into(),
|
||||
auth_token: String::new(),
|
||||
}))
|
||||
.await;
|
||||
let opa_marked = iam.prepare_auth(&args).await;
|
||||
let ready_terminal = matches!(iam.try_eval_prepared(&opa_marked, &args).await, Err(Error::IAMActionNotAllowed));
|
||||
let opa_ordinary = iam.prepare_auth(&unmarked_args).await;
|
||||
let ordinary_keeps_opa = matches!(opa_ordinary.mode, PreparedIamMode::Opa);
|
||||
// The captured Disabled preparation stays on built-in intersection even
|
||||
// if an external policy client becomes ready before evaluation.
|
||||
let captured_still_terminal = matches!(iam.try_eval_prepared(&denied, &args).await, Err(Error::IAMActionNotAllowed));
|
||||
*get_policy_plugin_state().write().await = PolicyPluginState::Initializing;
|
||||
let pending = iam.prepare_auth(&args).await;
|
||||
let initializing_terminal = matches!(iam.try_eval_prepared(&pending, &args).await, Err(Error::IAMActionNotAllowed));
|
||||
*get_policy_plugin_state().write().await = PolicyPluginState::Failed;
|
||||
let failed = iam.prepare_auth(&args).await;
|
||||
let failed_terminal = matches!(iam.try_eval_prepared(&failed, &args).await, Err(Error::IAMActionNotAllowed));
|
||||
*get_policy_plugin_state().write().await = previous;
|
||||
assert!(public_allows, "C07_PUBLIC_BUCKET_CONTROL: real public policy permits outside object");
|
||||
assert!(
|
||||
disabled_terminal && captured_still_terminal,
|
||||
"C07_SCOPE_TERMINAL_BOUND: bucket policy must not rescue restricted scope denial"
|
||||
);
|
||||
assert!(
|
||||
ready_terminal && initializing_terminal && failed_terminal,
|
||||
"C07_EXTERNAL_POLICY_BOUND: marked persisted STS cannot enter OPA"
|
||||
);
|
||||
assert!(
|
||||
inside_allowed && ordinary_false && ordinary_keeps_opa,
|
||||
"C07_UNMARKED_COMPAT: preserve ordinary STS and valid marked scope"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn restricted_vending_rejects_actual_external_policy_plugin_state() {
|
||||
let previous = IamSys::<StsTestMockStore>::policy_plugin_state().await;
|
||||
IamSys::<StsTestMockStore>::set_policy_plugin_client(opa::AuthZPlugin::new(opa::Args {
|
||||
url: "http://127.0.0.1:8181/v1/data/rustfs/authz/allow".into(),
|
||||
auth_token: String::new(),
|
||||
}))
|
||||
.await;
|
||||
let active_rejected = IamSys::<StsTestMockStore>::ensure_restricted_credential_vending()
|
||||
.await
|
||||
.is_err();
|
||||
*get_policy_plugin_state().write().await = PolicyPluginState::Initializing;
|
||||
let initializing_rejected = IamSys::<StsTestMockStore>::ensure_restricted_credential_vending()
|
||||
.await
|
||||
.is_err();
|
||||
*get_policy_plugin_state().write().await = PolicyPluginState::Failed;
|
||||
let failed_rejected = IamSys::<StsTestMockStore>::ensure_restricted_credential_vending()
|
||||
.await
|
||||
.is_err();
|
||||
*get_policy_plugin_state().write().await = PolicyPluginState::Disabled;
|
||||
let disabled_allowed = IamSys::<StsTestMockStore>::ensure_restricted_credential_vending()
|
||||
.await
|
||||
.is_ok();
|
||||
*get_policy_plugin_state().write().await = previous;
|
||||
assert!(
|
||||
active_rejected && initializing_rejected && failed_rejected,
|
||||
"C07_EXTERNAL_POLICY_BOUND: external authorization cannot bypass minted session scope"
|
||||
);
|
||||
assert!(disabled_allowed);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn test_prepare_auth_requests_existing_object_tags_in_opa_mode() {
|
||||
|
||||
@@ -568,24 +568,6 @@ pub enum AdminAction {
|
||||
GetTableLifecycleAction,
|
||||
#[strum(serialize = "admin:SetTableLifecycle")]
|
||||
SetTableLifecycleAction,
|
||||
#[strum(serialize = "admin:CreatePluginDelegation")]
|
||||
CreatePluginDelegationAction,
|
||||
#[strum(serialize = "admin:IssuePluginAttempt")]
|
||||
IssuePluginAttemptAction,
|
||||
#[strum(serialize = "admin:SubmitPluginJob")]
|
||||
SubmitPluginJobAction,
|
||||
#[strum(serialize = "admin:GetPluginRun")]
|
||||
GetPluginRunAction,
|
||||
#[strum(serialize = "admin:CancelPluginRun")]
|
||||
CancelPluginRunAction,
|
||||
#[strum(serialize = "admin:ListPluginRuns")]
|
||||
ListPluginRunsAction,
|
||||
#[strum(serialize = "admin:ReplayPluginRun")]
|
||||
ReplayPluginRunAction,
|
||||
#[strum(serialize = "admin:GetPluginDelegation")]
|
||||
GetPluginDelegationAction,
|
||||
#[strum(serialize = "admin:RevokePluginDelegation")]
|
||||
RevokePluginDelegationAction,
|
||||
#[strum(serialize = "admin:GetTableCredentials")]
|
||||
GetTableCredentialsAction,
|
||||
#[strum(serialize = "admin:RunTableMaintenance")]
|
||||
@@ -731,15 +713,6 @@ impl AdminAction {
|
||||
| AdminAction::GetTableLifecycleAction
|
||||
| AdminAction::SetTableLifecycleAction
|
||||
| AdminAction::GetTableCredentialsAction
|
||||
| AdminAction::IssuePluginAttemptAction
|
||||
| AdminAction::SubmitPluginJobAction
|
||||
| AdminAction::GetPluginRunAction
|
||||
| AdminAction::CancelPluginRunAction
|
||||
| AdminAction::ListPluginRunsAction
|
||||
| AdminAction::ReplayPluginRunAction
|
||||
| AdminAction::GetPluginDelegationAction
|
||||
| AdminAction::CreatePluginDelegationAction
|
||||
| AdminAction::RevokePluginDelegationAction
|
||||
| AdminAction::RunTableMaintenanceAction
|
||||
| AdminAction::GetTableMetadataLocationAction
|
||||
| AdminAction::SetTableMetadataLocationAction
|
||||
@@ -940,35 +913,6 @@ mod tests {
|
||||
assert_eq!(arr[0].as_str().unwrap(), "s3:*");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn plugin_delegation_actions_are_explicit_and_unscoped() {
|
||||
for (name, expected) in [
|
||||
("admin:GetPluginDelegation", AdminAction::GetPluginDelegationAction),
|
||||
("admin:CreatePluginDelegation", AdminAction::CreatePluginDelegationAction),
|
||||
("admin:RevokePluginDelegation", AdminAction::RevokePluginDelegationAction),
|
||||
("admin:SubmitPluginJob", AdminAction::SubmitPluginJobAction),
|
||||
("admin:GetPluginRun", AdminAction::GetPluginRunAction),
|
||||
("admin:CancelPluginRun", AdminAction::CancelPluginRunAction),
|
||||
("admin:ListPluginRuns", AdminAction::ListPluginRunsAction),
|
||||
("admin:ReplayPluginRun", AdminAction::ReplayPluginRunAction),
|
||||
] {
|
||||
assert_eq!(AdminAction::try_from(name).unwrap(), expected);
|
||||
assert!(expected.is_valid());
|
||||
assert!(!expected.is_table_resource_scoped());
|
||||
}
|
||||
assert_eq!(
|
||||
AdminAction::try_from("admin:IssuePluginAttempt").unwrap(),
|
||||
AdminAction::IssuePluginAttemptAction
|
||||
);
|
||||
assert!(AdminAction::IssuePluginAttemptAction.is_valid());
|
||||
assert!(AdminAction::SubmitPluginJobAction.is_valid());
|
||||
assert!(AdminAction::GetPluginRunAction.is_valid());
|
||||
assert!(AdminAction::CancelPluginRunAction.is_valid());
|
||||
assert!(AdminAction::ListPluginRunsAction.is_valid());
|
||||
assert!(AdminAction::ReplayPluginRunAction.is_valid());
|
||||
assert!(AdminAction::try_from("admin:IssuePluginCredentials").is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_replication_metrics_admin_action_is_valid() {
|
||||
assert!(AdminAction::GetReplicationMetricsAction.is_valid());
|
||||
|
||||
@@ -53,10 +53,6 @@ pub enum ScannerError {
|
||||
#[error("Remote namespace scanner disk is already active")]
|
||||
RemoteDiskBusy,
|
||||
|
||||
/// Node resource pressure deferred work before its first storage poll.
|
||||
#[error("Scanner node resource admission deferred")]
|
||||
ResourceDeferred,
|
||||
|
||||
/// Partial data usage cache produced before the scanner stopped.
|
||||
#[error("Scanner stopped with partial data usage cache")]
|
||||
PartialCache(Box<DataUsageCache>),
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
|
||||
use metrics::{counter, gauge};
|
||||
use rustfs_heal_contracts::{
|
||||
completion::{HealCompletion, MAX_COMPLETION_IDENTITY_BYTES, subscribe_heal_completions},
|
||||
heal_channel::{HealAdmissionReceipt, HealChannelRequest, HealScanMode},
|
||||
completion::{MAX_COMPLETION_IDENTITY_BYTES, ObservedHealCompletion, subscribe_observed_heal_completions},
|
||||
heal_channel::{HealChannelRequest, HealObservationChannelError, HealScanMode, ObservedHealAdmissionReceipt},
|
||||
outcome::{HealAbortReason, HealExecutionOutcome, HealObjectDisposition, HealObjectIdentity, HealObjectKind},
|
||||
};
|
||||
use serde::Serialize;
|
||||
@@ -125,15 +125,21 @@ impl Candidate {
|
||||
}
|
||||
|
||||
struct Recent {
|
||||
completion: Arc<HealCompletion>,
|
||||
completion: Arc<ObservedHealCompletion>,
|
||||
counted: bool,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Hash, PartialEq, Eq)]
|
||||
struct ObservationKey {
|
||||
task_id: String,
|
||||
observation_id: rustfs_heal_contracts::completion::HealObservationId,
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct Observations {
|
||||
pending: HashMap<String, Candidate>,
|
||||
recent: HashMap<String, Recent>,
|
||||
recent_order: VecDeque<(Instant, String)>,
|
||||
pending: HashMap<ObservationKey, Candidate>,
|
||||
recent: HashMap<ObservationKey, Recent>,
|
||||
recent_order: VecDeque<(Instant, ObservationKey)>,
|
||||
// All keys come from fixed execution/disposition/scope/mode labels, never task or object identities.
|
||||
terminal_counts: BTreeMap<(&'static str, &'static str, &'static str, &'static str), u64>,
|
||||
terminal_tasks: u64,
|
||||
@@ -240,13 +246,13 @@ impl Observations {
|
||||
self.record_unknown(settlement.scope, settlement.candidates);
|
||||
}
|
||||
|
||||
fn admit(&mut self, task_id: String, candidate: Candidate) -> Option<Settlement> {
|
||||
if let Some(recent) = self.recent.get_mut(&task_id) {
|
||||
fn admit(&mut self, key: ObservationKey, candidate: Candidate) -> Option<Settlement> {
|
||||
if let Some(recent) = self.recent.get_mut(&key) {
|
||||
let settlement = Settlement::new(candidate, recent);
|
||||
self.record_settlement(&settlement);
|
||||
return Some(settlement);
|
||||
}
|
||||
if let Some(pending) = self.pending.get_mut(&task_id) {
|
||||
if let Some(pending) = self.pending.get_mut(&key) {
|
||||
pending.count = pending.count.saturating_add(candidate.count);
|
||||
if pending.identity != candidate.identity {
|
||||
pending.identity = None;
|
||||
@@ -256,31 +262,34 @@ impl Observations {
|
||||
}
|
||||
pending.dry_run |= candidate.dry_run;
|
||||
} else if self.pending.len() < MAX_PENDING {
|
||||
self.pending.insert(task_id, candidate);
|
||||
self.pending.insert(key, candidate);
|
||||
} else {
|
||||
self.record_unknown("pending_full", candidate.count);
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
fn complete(&mut self, completion: Arc<HealCompletion>, now: Instant) -> Option<Settlement> {
|
||||
if self.recent.contains_key(&completion.task_id) {
|
||||
fn complete(&mut self, completion: Arc<ObservedHealCompletion>, now: Instant) -> Option<Settlement> {
|
||||
let key = ObservationKey {
|
||||
task_id: completion.task_id.clone(),
|
||||
observation_id: completion.observation_id?,
|
||||
};
|
||||
if self.recent.contains_key(&key) {
|
||||
return None;
|
||||
}
|
||||
let task_id = completion.task_id.clone();
|
||||
let mut recent = Recent {
|
||||
completion,
|
||||
counted: false,
|
||||
};
|
||||
let settled = self
|
||||
.pending
|
||||
.remove(&task_id)
|
||||
.remove(&key)
|
||||
.map(|candidate| Settlement::new(candidate, &mut recent));
|
||||
if self.recent.len() == MAX_RECENT {
|
||||
self.evict_recent();
|
||||
}
|
||||
self.recent_order.push_back((now, task_id.clone()));
|
||||
self.recent.insert(task_id, recent);
|
||||
self.recent_order.push_back((now, key.clone()));
|
||||
self.recent.insert(key, recent);
|
||||
if let Some(settlement) = &settled {
|
||||
self.record_settlement(settlement);
|
||||
}
|
||||
@@ -341,7 +350,7 @@ impl Observations {
|
||||
}
|
||||
}
|
||||
|
||||
type AdmissionSender = mpsc::Sender<(String, Candidate)>;
|
||||
type AdmissionSender = mpsc::Sender<(ObservationKey, Candidate)>;
|
||||
|
||||
#[derive(Clone)]
|
||||
struct ObserverHandle {
|
||||
@@ -371,7 +380,7 @@ fn observer_from(registry: &Mutex<Option<ObserverHandle>>) -> ObserverHandle {
|
||||
let state = Arc::new(Mutex::new(Observations::default()));
|
||||
let handle = {
|
||||
let (sender, mut admissions) = mpsc::channel(MAX_PENDING);
|
||||
let mut completions = subscribe_heal_completions();
|
||||
let mut completions = subscribe_observed_heal_completions();
|
||||
let observations = state.clone();
|
||||
tokio::spawn(async move {
|
||||
let mut tick = tokio::time::interval(Duration::from_secs(5));
|
||||
@@ -489,11 +498,18 @@ pub(crate) fn prepare(request: &HealChannelRequest) -> Option<Candidate> {
|
||||
Candidate::from_request(request)
|
||||
}
|
||||
|
||||
pub(crate) fn observe(candidate: Option<Candidate>, receipt: Result<&HealAdmissionReceipt, ()>) {
|
||||
pub(crate) fn observe(
|
||||
candidate: Option<Candidate>,
|
||||
receipt: Result<&ObservedHealAdmissionReceipt, &HealObservationChannelError>,
|
||||
) {
|
||||
observe_on(&observer(), candidate, receipt);
|
||||
}
|
||||
|
||||
fn observe_on(observer: &ObserverHandle, candidate: Option<Candidate>, receipt: Result<&HealAdmissionReceipt, ()>) {
|
||||
fn observe_on(
|
||||
observer: &ObserverHandle,
|
||||
candidate: Option<Candidate>,
|
||||
receipt: Result<&ObservedHealAdmissionReceipt, &HealObservationChannelError>,
|
||||
) {
|
||||
match receipt {
|
||||
Ok(receipt) if receipt.result.is_admitted() => {
|
||||
let Some(candidate) = candidate else {
|
||||
@@ -505,11 +521,20 @@ fn observe_on(observer: &ObserverHandle, candidate: Option<Candidate>, receipt:
|
||||
observer.record_unknown("missing_task_id", 1);
|
||||
return;
|
||||
}
|
||||
if observer.sender.try_send((task_id.clone(), candidate)).is_err() {
|
||||
let Some(observation_id) = receipt.observation_id else {
|
||||
observer.record_unknown("owner_generation_unknown", candidate.count);
|
||||
return;
|
||||
};
|
||||
let key = ObservationKey {
|
||||
task_id: task_id.clone(),
|
||||
observation_id,
|
||||
};
|
||||
if observer.sender.try_send((key, candidate)).is_err() {
|
||||
observer.record_unknown("observer_full_or_closed", 1);
|
||||
}
|
||||
}
|
||||
_ => observer.record_unknown("not_admitted", 1),
|
||||
Ok(_) => observer.record_unknown("not_admitted", 1),
|
||||
Err(_) => observer.record_unknown("admission_unknown", 1),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
use super::*;
|
||||
use rustfs_heal_contracts::outcome::{HealAbortReason, HealDeferredReason, HealFailureClass, HealObjectReceipt};
|
||||
use rustfs_heal_contracts::{
|
||||
completion::{HealCompletion, publish_observed_heal_completion},
|
||||
heal_channel::HealAdmissionReceipt,
|
||||
outcome::{HealAbortReason, HealDeferredReason, HealFailureClass, HealObjectReceipt},
|
||||
};
|
||||
use uuid::Uuid;
|
||||
|
||||
fn request() -> HealChannelRequest {
|
||||
@@ -19,24 +23,352 @@ fn candidate() -> Candidate {
|
||||
Candidate::from_request(&request()).expect("bounded candidate")
|
||||
}
|
||||
|
||||
fn completion(task: &str, disposition: HealObjectDisposition) -> Arc<HealCompletion> {
|
||||
Arc::new(HealCompletion {
|
||||
task_id: task.into(),
|
||||
scan_mode: HealScanMode::Deep,
|
||||
dry_run: false,
|
||||
execution: Some(HealExecutionOutcome::Completed),
|
||||
object: Some(HealObjectReceipt {
|
||||
identity: candidate().identity.expect("exact object identity"),
|
||||
disposition,
|
||||
fn key(task_id: &str) -> ObservationKey {
|
||||
ObservationKey {
|
||||
task_id: task_id.into(),
|
||||
observation_id: 1,
|
||||
}
|
||||
}
|
||||
|
||||
fn completion(task: &str, disposition: HealObjectDisposition) -> Arc<ObservedHealCompletion> {
|
||||
Arc::new(ObservedHealCompletion {
|
||||
observation_id: Some(1),
|
||||
completion: Arc::new(HealCompletion {
|
||||
task_id: task.into(),
|
||||
scan_mode: HealScanMode::Deep,
|
||||
dry_run: false,
|
||||
execution: Some(HealExecutionOutcome::Completed),
|
||||
object: Some(HealObjectReceipt {
|
||||
identity: candidate().identity.expect("exact object identity"),
|
||||
disposition,
|
||||
}),
|
||||
}),
|
||||
})
|
||||
}
|
||||
|
||||
fn publish_terminal(observed: Arc<ObservedHealCompletion>) {
|
||||
publish_observed_heal_completion((*observed.completion).clone(), observed.observation_id);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mixed_candidate_semantics_settle_independently_in_either_order() {
|
||||
for terminal_first in [false, true] {
|
||||
for reverse in [false, true] {
|
||||
let mut observations = Observations::default();
|
||||
let owner = key("mixed-candidates");
|
||||
let mut terminal = (*completion("mixed-candidates", HealObjectDisposition::VerifiedHealthy)).clone();
|
||||
Arc::make_mut(&mut terminal.completion).scan_mode = HealScanMode::Normal;
|
||||
let terminal = Arc::new(terminal);
|
||||
if terminal_first {
|
||||
assert!(observations.complete(terminal.clone(), Instant::now()).is_none());
|
||||
}
|
||||
|
||||
let mut normal = candidate();
|
||||
normal.mode = HealScanMode::Normal;
|
||||
let mut same_normal = candidate();
|
||||
same_normal.mode = HealScanMode::Normal;
|
||||
let deep = candidate();
|
||||
let mut different = candidate();
|
||||
different.mode = HealScanMode::Normal;
|
||||
different.identity.as_mut().expect("candidate identity").object = "different".into();
|
||||
let mut unknown = candidate();
|
||||
unknown.mode = HealScanMode::Normal;
|
||||
unknown.identity = None;
|
||||
let mut dry_run = candidate();
|
||||
dry_run.mode = HealScanMode::Normal;
|
||||
dry_run.dry_run = true;
|
||||
let mut candidates = vec![normal, same_normal, deep, different, unknown, dry_run];
|
||||
if reverse {
|
||||
candidates.reverse();
|
||||
}
|
||||
for candidate in candidates {
|
||||
assert_eq!(observations.admit(owner.clone(), candidate).is_some(), terminal_first);
|
||||
}
|
||||
if !terminal_first {
|
||||
assert!(observations.complete(terminal.clone(), Instant::now()).is_some());
|
||||
}
|
||||
assert!(observations.complete(terminal, Instant::now()).is_none());
|
||||
assert_eq!(observations.terminal_tasks, 1);
|
||||
assert_eq!(observations.terminal_counts.values().sum::<u64>(), 6);
|
||||
for (scope, count) in [
|
||||
("content_and_leader_unknown", 2),
|
||||
("insufficient_scan", 1),
|
||||
("identity_mismatch", 1),
|
||||
("identity_unknown", 1),
|
||||
("dry_run", 1),
|
||||
] {
|
||||
assert_eq!(observations.unknown_counts.get(scope), Some(&count), "RED_GROUP_MIXED_SCOPE {scope}");
|
||||
}
|
||||
assert_eq!(
|
||||
observations
|
||||
.terminal_counts
|
||||
.get(&("completed", "verified_healthy", "content_and_leader_unknown", "normal")),
|
||||
Some(&2)
|
||||
);
|
||||
assert_eq!(
|
||||
observations
|
||||
.terminal_counts
|
||||
.get(&("completed", "verified_healthy", "insufficient_scan", "deep")),
|
||||
Some(&1)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn candidate_group_capacity_is_global_and_released_by_completion() {
|
||||
let mut observations = Observations::default();
|
||||
let split = MAX_PENDING / 2;
|
||||
for index in 0..MAX_PENDING {
|
||||
let mut observed = candidate();
|
||||
observed.identity.as_mut().expect("candidate identity").object = format!("object-{index}");
|
||||
let owner = if index < split { "owner-a" } else { "owner-b" };
|
||||
assert!(observations.admit(key(owner), observed).is_none());
|
||||
}
|
||||
assert_eq!(observations.pending.len(), 2);
|
||||
|
||||
let mut duplicate = candidate();
|
||||
duplicate.identity.as_mut().expect("candidate identity").object = "object-0".into();
|
||||
assert!(observations.admit(key("owner-a"), duplicate).is_none());
|
||||
assert!(observations.admit(key("owner-a"), candidate()).is_none());
|
||||
assert!(observations.admit(key("owner-c"), candidate()).is_none());
|
||||
assert_eq!(
|
||||
observations.unknown_counts.get("pending_groups_full"),
|
||||
Some(&2),
|
||||
"RED_GROUP_GLOBAL_CAPACITY"
|
||||
);
|
||||
assert!(!observations.pending.contains_key(&key("owner-c")));
|
||||
|
||||
assert!(
|
||||
observations
|
||||
.complete(completion("owner-a", HealObjectDisposition::VerifiedHealthy), Instant::now())
|
||||
.is_some()
|
||||
);
|
||||
assert_eq!(
|
||||
observations.terminal_counts.values().sum::<u64>(),
|
||||
u64::try_from(split + 1).expect("bounded count")
|
||||
);
|
||||
assert!(observations.admit(key("owner-c"), candidate()).is_none());
|
||||
assert!(observations.pending.contains_key(&key("owner-c")));
|
||||
assert_eq!(observations.unknown_counts.get("pending_groups_full"), Some(&2));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn candidate_group_expiry_and_notification_loss_are_independent() {
|
||||
let mut observations = Observations::default();
|
||||
let now = Instant::now();
|
||||
let mut old = candidate();
|
||||
old.first_seen = now;
|
||||
old.mode = HealScanMode::Normal;
|
||||
let mut old_duplicate = candidate();
|
||||
old_duplicate.first_seen = now;
|
||||
old_duplicate.mode = HealScanMode::Normal;
|
||||
let mut newer = candidate();
|
||||
newer.first_seen = now + Duration::from_secs(1);
|
||||
newer.dry_run = true;
|
||||
for candidate in [old, old_duplicate, newer] {
|
||||
assert!(observations.admit(key("expiring-owner"), candidate).is_none());
|
||||
}
|
||||
|
||||
observations.maintain(now + PENDING_TTL);
|
||||
assert_eq!(observations.unknown_counts.get("expired"), Some(&2), "RED_GROUP_EXPIRY_WITH_LOSS");
|
||||
assert!(observations.pending.contains_key(&key("expiring-owner")));
|
||||
assert_eq!(observations.terminal_tasks, 0);
|
||||
|
||||
observations.lagged(3);
|
||||
assert_eq!(observations.lost_notifications, 3);
|
||||
assert_eq!(observations.unknown_counts.get("completion_lost"), Some(&1));
|
||||
assert!(observations.pending.is_empty());
|
||||
assert!(
|
||||
observations
|
||||
.complete(completion("expiring-owner", HealObjectDisposition::VerifiedHealthy), Instant::now())
|
||||
.is_none()
|
||||
);
|
||||
assert_eq!(observations.terminal_tasks, 0);
|
||||
assert!(observations.admit(key("after-loss"), candidate()).is_none());
|
||||
assert!(observations.pending.contains_key(&key("after-loss")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn candidate_group_expiry_uses_earliest_discovery_not_admission_order() {
|
||||
let mut observations = Observations::default();
|
||||
let now = Instant::now();
|
||||
let mut later = candidate();
|
||||
later.first_seen = now + Duration::from_secs(1);
|
||||
let mut earlier = candidate();
|
||||
earlier.first_seen = now;
|
||||
assert!(observations.admit(key("reordered"), later).is_none());
|
||||
assert!(observations.admit(key("reordered"), earlier).is_none());
|
||||
observations.maintain(now + PENDING_TTL);
|
||||
assert!(!observations.pending.contains_key(&key("reordered")), "RED_GROUP_FIRST_EARLIEST_EXPIRY");
|
||||
assert_eq!(observations.unknown_counts.get("expired"), Some(&2));
|
||||
assert_eq!(observations.terminal_tasks, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn later_candidate_group_also_expires_from_earliest_discovery() {
|
||||
let mut observations = Observations::default();
|
||||
let now = Instant::now();
|
||||
let mut first_group = candidate();
|
||||
first_group.first_seen = now + Duration::from_secs(2);
|
||||
let mut later = candidate();
|
||||
later.mode = HealScanMode::Normal;
|
||||
later.first_seen = now + Duration::from_secs(1);
|
||||
let mut earlier = candidate();
|
||||
earlier.mode = HealScanMode::Normal;
|
||||
earlier.first_seen = now;
|
||||
for candidate in [first_group, later, earlier] {
|
||||
assert!(observations.admit(key("reordered-other-group"), candidate).is_none());
|
||||
}
|
||||
|
||||
observations.maintain(now + PENDING_TTL);
|
||||
assert!(observations.pending.contains_key(&key("reordered-other-group")));
|
||||
assert_eq!(
|
||||
observations.unknown_counts.get("expired"),
|
||||
Some(&2),
|
||||
"RED_GROUP_ADDITIONAL_EARLIEST_EXPIRY"
|
||||
);
|
||||
assert_eq!(observations.terminal_tasks, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn candidate_expiry_is_enforced_when_terminal_arrives_between_ticks() {
|
||||
let mut observations = Observations::default();
|
||||
let now = Instant::now();
|
||||
let mut old = candidate();
|
||||
old.mode = HealScanMode::Normal;
|
||||
old.first_seen = now;
|
||||
let mut fresh = candidate();
|
||||
fresh.first_seen = now + Duration::from_secs(1);
|
||||
assert!(observations.admit(key("terminal-expiry"), old).is_none());
|
||||
assert!(observations.admit(key("terminal-expiry"), fresh).is_none());
|
||||
|
||||
assert!(
|
||||
observations
|
||||
.complete(completion("terminal-expiry", HealObjectDisposition::VerifiedHealthy), now + PENDING_TTL)
|
||||
.is_some()
|
||||
);
|
||||
assert_eq!(observations.unknown_counts.get("expired"), Some(&1), "RED_GROUP_TERMINAL_EXPIRY");
|
||||
assert_eq!(observations.terminal_counts.values().sum::<u64>(), 1);
|
||||
assert_eq!(observations.terminal_tasks, 1);
|
||||
assert!(observations.pending.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn expired_candidate_is_unknown_even_if_terminal_was_seen_first() {
|
||||
for terminal_first in [true, false] {
|
||||
let mut observations = Observations::default();
|
||||
let now = Instant::now();
|
||||
if terminal_first {
|
||||
assert!(
|
||||
observations
|
||||
.complete(completion("late-admission", HealObjectDisposition::VerifiedHealthy), now)
|
||||
.is_none()
|
||||
);
|
||||
}
|
||||
let mut old = candidate();
|
||||
old.first_seen = now
|
||||
.checked_sub(PENDING_TTL + Duration::from_secs(1))
|
||||
.expect("monotonic clock supports the candidate TTL");
|
||||
assert!(observations.admit(key("late-admission"), old).is_none(), "RED_GROUP_EXPIRED_ADMISSION");
|
||||
assert_eq!(observations.unknown_counts.get("expired"), Some(&1));
|
||||
assert!(!observations.pending.contains_key(&key("late-admission")));
|
||||
assert_eq!(observations.terminal_tasks, 0);
|
||||
assert!(observations.terminal_counts.is_empty());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn grouped_pending_status_counts_candidates_after_partial_expiry() {
|
||||
let (sender, _receiver) = mpsc::channel(1);
|
||||
let observer = ObserverHandle {
|
||||
sender,
|
||||
state: Arc::new(Mutex::new(Observations::default())),
|
||||
generation: 1,
|
||||
started_at_unix_secs: None,
|
||||
};
|
||||
let registry = Mutex::new(Some(observer.clone()));
|
||||
let now = Instant::now();
|
||||
{
|
||||
let mut observations = observer.state.lock().expect("observations");
|
||||
let mut old = candidate();
|
||||
old.first_seen = now;
|
||||
let mut newer = candidate();
|
||||
newer.first_seen = now + Duration::from_secs(1);
|
||||
newer.mode = HealScanMode::Normal;
|
||||
let mut newer_duplicate = candidate();
|
||||
newer_duplicate.first_seen = now + Duration::from_secs(1);
|
||||
newer_duplicate.mode = HealScanMode::Normal;
|
||||
for candidate in [old, newer, newer_duplicate] {
|
||||
assert!(observations.admit(key("status-owner"), candidate).is_none());
|
||||
}
|
||||
}
|
||||
let status = observation_status_from(®istry);
|
||||
assert_eq!(status.retained_pending_tasks, Some(1));
|
||||
assert_eq!(status.retained_pending_candidates, Some(3));
|
||||
|
||||
observer.state.lock().expect("observations").maintain(now + PENDING_TTL);
|
||||
let status = observation_status_from(®istry);
|
||||
assert_eq!(status.retained_pending_tasks, Some(1), "RED_GROUP_STATUS_AFTER_EXPIRY");
|
||||
assert_eq!(status.retained_pending_candidates, Some(2));
|
||||
assert_eq!(
|
||||
status
|
||||
.unknown_candidates
|
||||
.iter()
|
||||
.find(|row| row.reason == "expired")
|
||||
.map(|row| row.count),
|
||||
Some(1)
|
||||
);
|
||||
|
||||
observer.state.lock().expect("observations").lagged(1);
|
||||
let status = observation_status_from(®istry);
|
||||
assert_eq!(status.retained_pending_tasks, Some(0));
|
||||
assert_eq!(status.retained_pending_candidates, Some(0));
|
||||
assert_eq!(
|
||||
status
|
||||
.unknown_candidates
|
||||
.iter()
|
||||
.find(|row| row.reason == "completion_lost")
|
||||
.map(|row| row.count),
|
||||
Some(2)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn observation_id_keeps_grouped_owner_generations_separate() {
|
||||
let mut observations = Observations::default();
|
||||
let first = key("reused-owner");
|
||||
let second = ObservationKey {
|
||||
task_id: first.task_id.clone(),
|
||||
observation_id: 2,
|
||||
};
|
||||
let mut normal = candidate();
|
||||
normal.mode = HealScanMode::Normal;
|
||||
assert!(observations.admit(first.clone(), normal).is_none());
|
||||
assert!(observations.admit(first.clone(), candidate()).is_none());
|
||||
assert!(observations.admit(second.clone(), candidate()).is_none());
|
||||
|
||||
let first_terminal = completion("reused-owner", HealObjectDisposition::VerifiedHealthy);
|
||||
assert!(observations.complete(first_terminal.clone(), Instant::now()).is_some());
|
||||
assert!(!observations.pending.contains_key(&first));
|
||||
assert!(observations.pending.contains_key(&second));
|
||||
assert_eq!(observations.terminal_tasks, 1);
|
||||
assert!(observations.complete(first_terminal.clone(), Instant::now()).is_none());
|
||||
assert_eq!(observations.terminal_tasks, 1);
|
||||
|
||||
let mut second_terminal = (*first_terminal).clone();
|
||||
second_terminal.observation_id = Some(2);
|
||||
assert!(observations.complete(Arc::new(second_terminal), Instant::now()).is_some());
|
||||
assert!(observations.pending.is_empty());
|
||||
assert_eq!(observations.terminal_tasks, 2);
|
||||
assert_eq!(observations.terminal_counts.values().sum::<u64>(), 3);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn merged_candidates_close_only_on_the_canonical_task_once() {
|
||||
let mut observations = Observations::default();
|
||||
assert!(observations.admit("owner".into(), candidate()).is_none());
|
||||
assert!(observations.admit("owner".into(), candidate()).is_none());
|
||||
assert!(observations.admit(key("owner"), candidate()).is_none());
|
||||
assert!(observations.admit(key("owner"), candidate()).is_none());
|
||||
assert_eq!(observations.pending.len(), 1);
|
||||
assert!(
|
||||
observations
|
||||
@@ -57,7 +389,7 @@ fn merged_candidates_close_only_on_the_canonical_task_once() {
|
||||
"duplicate completion is ignored"
|
||||
);
|
||||
let merged_late = observations
|
||||
.admit("owner".into(), candidate())
|
||||
.admit(key("owner"), candidate())
|
||||
.expect("terminal before merged admission is retained");
|
||||
assert!(!merged_late.first_task_observation);
|
||||
assert_eq!(merged_late.candidates, 1);
|
||||
@@ -71,14 +403,149 @@ fn terminal_before_admission_is_observed_without_claiming_coverage() {
|
||||
.complete(completion("fast", HealObjectDisposition::Repaired), Instant::now())
|
||||
.is_none()
|
||||
);
|
||||
let settled = observations
|
||||
.admit("fast".into(), candidate())
|
||||
.expect("fast terminal retained");
|
||||
let settled = observations.admit(key("fast"), candidate()).expect("fast terminal retained");
|
||||
assert_eq!(settled.disposition, "repaired");
|
||||
assert_eq!(settled.scope, "content_and_leader_unknown");
|
||||
assert!(settled.first_task_observation);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn status_and_pending_metric_count_each_owner_generation() {
|
||||
#[derive(Default)]
|
||||
struct GaugeValue(Mutex<f64>);
|
||||
|
||||
impl metrics::GaugeFn for GaugeValue {
|
||||
fn increment(&self, value: f64) {
|
||||
*self.0.lock().expect("pending gauge") += value;
|
||||
}
|
||||
fn decrement(&self, value: f64) {
|
||||
*self.0.lock().expect("pending gauge") -= value;
|
||||
}
|
||||
fn set(&self, value: f64) {
|
||||
*self.0.lock().expect("pending gauge") = value;
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct PendingRecorder(Arc<GaugeValue>);
|
||||
|
||||
impl metrics::Recorder for PendingRecorder {
|
||||
fn describe_counter(&self, _: metrics::KeyName, _: Option<metrics::Unit>, _: metrics::SharedString) {}
|
||||
fn describe_gauge(&self, _: metrics::KeyName, _: Option<metrics::Unit>, _: metrics::SharedString) {}
|
||||
fn describe_histogram(&self, _: metrics::KeyName, _: Option<metrics::Unit>, _: metrics::SharedString) {}
|
||||
fn register_counter(&self, _: &metrics::Key, _: &metrics::Metadata<'_>) -> metrics::Counter {
|
||||
metrics::Counter::noop()
|
||||
}
|
||||
fn register_gauge(&self, key: &metrics::Key, _: &metrics::Metadata<'_>) -> metrics::Gauge {
|
||||
if key.name() == "rustfs_scanner_heal_pending_tasks" {
|
||||
metrics::Gauge::from_arc(Arc::clone(&self.0))
|
||||
} else {
|
||||
metrics::Gauge::noop()
|
||||
}
|
||||
}
|
||||
fn register_histogram(&self, _: &metrics::Key, _: &metrics::Metadata<'_>) -> metrics::Histogram {
|
||||
metrics::Histogram::noop()
|
||||
}
|
||||
}
|
||||
|
||||
let recorder = PendingRecorder::default();
|
||||
let _recorder = metrics::set_default_local_recorder(&recorder);
|
||||
let (sender, _receiver) = mpsc::channel(1);
|
||||
let observer = ObserverHandle {
|
||||
sender,
|
||||
state: Arc::new(Mutex::new(Observations::default())),
|
||||
generation: 1,
|
||||
started_at_unix_secs: None,
|
||||
};
|
||||
let registry = Mutex::new(Some(observer.clone()));
|
||||
let first = key("same-task");
|
||||
let second = ObservationKey {
|
||||
task_id: "same-task".into(),
|
||||
observation_id: 2,
|
||||
};
|
||||
{
|
||||
let mut observations = observer.state.lock().expect("observations");
|
||||
assert!(observations.admit(first.clone(), candidate()).is_none());
|
||||
assert!(observations.admit(first, candidate()).is_none());
|
||||
assert!(observations.admit(second, candidate()).is_none());
|
||||
observations.maintain(Instant::now());
|
||||
}
|
||||
let status = observation_status_from(®istry);
|
||||
assert_eq!(status.retained_pending_tasks, Some(2));
|
||||
assert_eq!(status.retained_pending_candidates, Some(3));
|
||||
assert_eq!(*recorder.0.0.lock().expect("pending gauge"), 2.0);
|
||||
let json = serde_json::to_value(&status).expect("serialize observation status");
|
||||
assert_eq!(json["retained_pending_tasks"], 2);
|
||||
assert_eq!(json["retained_pending_candidates"], 3);
|
||||
|
||||
{
|
||||
let mut observations = observer.state.lock().expect("observations");
|
||||
let settlement = observations
|
||||
.complete(completion("same-task", HealObjectDisposition::VerifiedHealthy), Instant::now())
|
||||
.expect("the first generation settles its two candidates");
|
||||
assert_eq!(settlement.candidates, 2);
|
||||
observations.maintain(Instant::now());
|
||||
}
|
||||
let status = observation_status_from(®istry);
|
||||
assert_eq!(status.retained_pending_tasks, Some(1));
|
||||
assert_eq!(status.retained_pending_candidates, Some(1));
|
||||
assert_eq!(*recorder.0.0.lock().expect("pending gauge"), 1.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn reused_task_id_keeps_terminal_observations_on_their_owner_generation() {
|
||||
let mut observations = Observations::default();
|
||||
let old_key = key("owner");
|
||||
assert!(observations.admit(old_key.clone(), candidate()).is_none());
|
||||
assert!(
|
||||
observations
|
||||
.complete(completion("owner", HealObjectDisposition::VerifiedHealthy), Instant::now())
|
||||
.is_some()
|
||||
);
|
||||
|
||||
let new_key = ObservationKey {
|
||||
task_id: "owner".into(),
|
||||
observation_id: 2,
|
||||
};
|
||||
assert!(
|
||||
observations.admit(new_key.clone(), candidate()).is_none(),
|
||||
"the old terminal cannot settle a new owner"
|
||||
);
|
||||
let mut new_terminal = (*completion("owner", HealObjectDisposition::Repaired)).clone();
|
||||
new_terminal.observation_id = Some(2);
|
||||
let settled = observations
|
||||
.complete(Arc::new(new_terminal), Instant::now())
|
||||
.expect("the new owner settles itself");
|
||||
assert_eq!(settled.disposition, "repaired");
|
||||
assert!(observations.pending.is_empty());
|
||||
|
||||
let fast_key = ObservationKey {
|
||||
task_id: "owner".into(),
|
||||
observation_id: 3,
|
||||
};
|
||||
let mut fast_terminal = (*completion("owner", HealObjectDisposition::MetadataHealthy)).clone();
|
||||
fast_terminal.observation_id = Some(3);
|
||||
assert!(observations.complete(Arc::new(fast_terminal), Instant::now()).is_none());
|
||||
assert!(
|
||||
observations.admit(fast_key, candidate()).is_some(),
|
||||
"a fast terminal stays available to its owner"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn removed_owner_remains_pending_then_expires_unknown_after_id_reuse() {
|
||||
let mut observations = Observations::default();
|
||||
let old = key("removed-owner");
|
||||
assert!(observations.admit(old.clone(), candidate()).is_none());
|
||||
let mut new_terminal = (*completion("removed-owner", HealObjectDisposition::VerifiedHealthy)).clone();
|
||||
new_terminal.observation_id = Some(2);
|
||||
assert!(observations.complete(Arc::new(new_terminal), Instant::now()).is_none());
|
||||
assert!(observations.pending.contains_key(&old));
|
||||
observations.maintain(Instant::now() + PENDING_TTL);
|
||||
assert!(!observations.pending.contains_key(&old));
|
||||
assert_eq!(observations.unknown_counts.get("expired"), Some(&1));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn replacement_bucket_version_or_location_cannot_match_an_old_result() {
|
||||
for change in 0..4 {
|
||||
@@ -103,7 +570,12 @@ fn unversioned_overwrite_and_unknown_leader_never_certify_payload() {
|
||||
let mut observed = candidate();
|
||||
observed.identity.as_mut().expect("identity").version_id = None;
|
||||
let mut terminal = (*completion("same-name", HealObjectDisposition::VerifiedHealthy)).clone();
|
||||
terminal.object.as_mut().expect("receipt").identity.version_id = None;
|
||||
Arc::make_mut(&mut terminal.completion)
|
||||
.object
|
||||
.as_mut()
|
||||
.expect("receipt")
|
||||
.identity
|
||||
.version_id = None;
|
||||
let mut recent = Recent {
|
||||
completion: Arc::new(terminal),
|
||||
counted: false,
|
||||
@@ -120,7 +592,7 @@ fn unversioned_overwrite_and_unknown_leader_never_certify_payload() {
|
||||
fn normal_metadata_and_unproven_repairs_do_not_satisfy_deep_candidates() {
|
||||
for disposition in [HealObjectDisposition::MetadataHealthy, HealObjectDisposition::Repaired] {
|
||||
let mut terminal = (*completion("normal", disposition)).clone();
|
||||
terminal.scan_mode = HealScanMode::Normal;
|
||||
Arc::make_mut(&mut terminal.completion).scan_mode = HealScanMode::Normal;
|
||||
let mut recent = Recent {
|
||||
completion: Arc::new(terminal),
|
||||
counted: false,
|
||||
@@ -153,7 +625,7 @@ fn command_success_does_not_hide_deferred_failed_cancelled_or_dry_run_objects()
|
||||
assert_eq!(settled.scope, "content_and_leader_unknown");
|
||||
}
|
||||
let mut terminal = (*completion("cancelled", HealObjectDisposition::VerifiedHealthy)).clone();
|
||||
terminal.execution = Some(HealExecutionOutcome::Aborted(HealAbortReason::Cancelled));
|
||||
Arc::make_mut(&mut terminal.completion).execution = Some(HealExecutionOutcome::Aborted(HealAbortReason::Cancelled));
|
||||
let mut recent = Recent {
|
||||
completion: Arc::new(terminal),
|
||||
counted: false,
|
||||
@@ -161,7 +633,7 @@ fn command_success_does_not_hide_deferred_failed_cancelled_or_dry_run_objects()
|
||||
assert_eq!(Settlement::new(candidate(), &mut recent).scope, "execution_incomplete");
|
||||
assert_eq!(Settlement::new(candidate(), &mut recent).execution, "aborted_cancelled");
|
||||
let mut errors = (*completion("errors", HealObjectDisposition::Repaired)).clone();
|
||||
errors.execution = Some(HealExecutionOutcome::CompletedWithErrors);
|
||||
Arc::make_mut(&mut errors.completion).execution = Some(HealExecutionOutcome::CompletedWithErrors);
|
||||
let mut recent = Recent {
|
||||
completion: Arc::new(errors),
|
||||
counted: false,
|
||||
@@ -174,7 +646,7 @@ fn command_success_does_not_hide_deferred_failed_cancelled_or_dry_run_objects()
|
||||
#[test]
|
||||
fn missing_or_truncated_object_result_remains_unknown() {
|
||||
let mut terminal = (*completion("truncated", HealObjectDisposition::VerifiedHealthy)).clone();
|
||||
terminal.object = None;
|
||||
Arc::make_mut(&mut terminal.completion).object = None;
|
||||
let mut recent = Recent {
|
||||
completion: Arc::new(terminal),
|
||||
counted: false,
|
||||
@@ -186,10 +658,10 @@ fn missing_or_truncated_object_result_remains_unknown() {
|
||||
fn overflow_loss_expiry_and_restart_are_bounded_and_do_not_restore_pending() {
|
||||
let mut observations = Observations::default();
|
||||
for index in 0..=MAX_PENDING {
|
||||
observations.admit(format!("pending-{index}"), candidate());
|
||||
observations.admit(key(&format!("pending-{index}")), candidate());
|
||||
}
|
||||
assert_eq!(observations.pending.len(), MAX_PENDING);
|
||||
assert!(!observations.pending.contains_key(&format!("pending-{MAX_PENDING}")));
|
||||
assert!(!observations.pending.contains_key(&key(&format!("pending-{MAX_PENDING}"))));
|
||||
observations.lost();
|
||||
assert!(observations.pending.is_empty());
|
||||
assert!(
|
||||
@@ -197,7 +669,7 @@ fn overflow_loss_expiry_and_restart_are_bounded_and_do_not_restore_pending() {
|
||||
.complete(completion("pending-0", HealObjectDisposition::VerifiedHealthy), Instant::now())
|
||||
.is_none()
|
||||
);
|
||||
observations.admit("expires".into(), candidate());
|
||||
observations.admit(key("expires"), candidate());
|
||||
observations.maintain(Instant::now() + PENDING_TTL);
|
||||
assert!(observations.pending.is_empty());
|
||||
assert!(observations.recent.is_empty());
|
||||
@@ -220,8 +692,8 @@ fn terminal_history_eviction_loses_evidence_without_inventing_a_completion() {
|
||||
}
|
||||
assert_eq!(observations.recent.len(), MAX_RECENT);
|
||||
assert_eq!(observations.recent_order.len(), MAX_RECENT);
|
||||
assert!(observations.admit("terminal-0".into(), candidate()).is_none());
|
||||
assert!(observations.pending.contains_key("terminal-0"));
|
||||
assert!(observations.admit(key("terminal-0"), candidate()).is_none());
|
||||
assert!(observations.pending.contains_key(&key("terminal-0")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -258,7 +730,7 @@ fn observer_reinstalls_after_runtime_teardown() {
|
||||
assert!(observation_status_from(®istry).unknown_candidates.is_empty());
|
||||
replacement
|
||||
.sender
|
||||
.try_send(("new-runtime".into(), candidate()))
|
||||
.try_send((key("new-runtime"), candidate()))
|
||||
.expect("replacement observer admits work");
|
||||
});
|
||||
}
|
||||
@@ -294,10 +766,10 @@ fn observer_status_preserves_loss_expiry_and_rejected_admissions() {
|
||||
{
|
||||
let mut state = observer.state.lock().expect("observations");
|
||||
for index in 0..=MAX_PENDING {
|
||||
let _ = state.admit(format!("pending-{index}"), candidate());
|
||||
let _ = state.admit(key(&format!("pending-{index}")), candidate());
|
||||
}
|
||||
state.lagged(3);
|
||||
let _ = state.admit("expired".into(), candidate());
|
||||
let _ = state.admit(key("expired"), candidate());
|
||||
state.maintain(Instant::now() + PENDING_TTL);
|
||||
}
|
||||
let status = observation_status_from(®istry);
|
||||
@@ -313,20 +785,37 @@ fn observer_status_preserves_loss_expiry_and_rejected_admissions() {
|
||||
assert_eq!(unknown["completion_lost"], u64::try_from(MAX_PENDING).expect("bounded pending count"));
|
||||
assert_eq!(unknown["expired"], 1);
|
||||
|
||||
let admitted = HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Accepted,
|
||||
task_id: "canonical".into(),
|
||||
let admitted = ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Accepted,
|
||||
task_id: "canonical".into(),
|
||||
},
|
||||
observation_id: Some(1),
|
||||
};
|
||||
observe_on(
|
||||
&observer,
|
||||
Some(candidate()),
|
||||
Ok(&ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Merged,
|
||||
task_id: "unproven-owner".into(),
|
||||
},
|
||||
observation_id: None,
|
||||
}),
|
||||
);
|
||||
observe_on(&observer, None, Ok(&admitted));
|
||||
observe_on(
|
||||
&observer,
|
||||
Some(candidate()),
|
||||
Ok(&HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Accepted,
|
||||
task_id: String::new(),
|
||||
Ok(&ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Accepted,
|
||||
task_id: String::new(),
|
||||
},
|
||||
observation_id: Some(1),
|
||||
}),
|
||||
);
|
||||
observe_on(&observer, Some(candidate()), Err(()));
|
||||
observe_on(&observer, Some(candidate()), Err(&HealObservationChannelError::NotInitialized));
|
||||
observe_on(&observer, Some(candidate()), Ok(&admitted));
|
||||
assert_eq!(observation_status_from(®istry).queued_admissions, Some(1));
|
||||
observe_on(&observer, Some(candidate()), Ok(&admitted));
|
||||
@@ -341,14 +830,98 @@ fn observer_status_preserves_loss_expiry_and_rejected_admissions() {
|
||||
.map(|row| (row.reason, row.count))
|
||||
.collect::<BTreeMap<_, _>>();
|
||||
assert_eq!(unknown["identity_too_large"], 1);
|
||||
assert_eq!(unknown["owner_generation_unknown"], 1);
|
||||
assert_eq!(unknown["missing_task_id"], 1);
|
||||
assert_eq!(unknown["not_admitted"], 1);
|
||||
assert_eq!(unknown["admission_unknown"], 1);
|
||||
assert_eq!(unknown["observer_full_or_closed"], 2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn explicit_rejections_are_reported_not_admitted() {
|
||||
use rustfs_heal_contracts::heal_channel::{HealAdmissionDropReason, HealAdmissionResult};
|
||||
|
||||
let recorder = CompletionRecorder::default();
|
||||
let _recorder = metrics::set_default_local_recorder(&recorder);
|
||||
let (sender, _receiver) = mpsc::channel(1);
|
||||
let observer = ObserverHandle {
|
||||
sender,
|
||||
state: Arc::new(Mutex::new(Observations::default())),
|
||||
generation: 1,
|
||||
started_at_unix_secs: None,
|
||||
};
|
||||
let registry = Mutex::new(Some(observer.clone()));
|
||||
for result in [
|
||||
HealAdmissionResult::Full,
|
||||
HealAdmissionResult::Dropped(HealAdmissionDropReason::QueueFull),
|
||||
] {
|
||||
let receipt = ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result,
|
||||
task_id: String::new(),
|
||||
},
|
||||
observation_id: None,
|
||||
};
|
||||
observe_on(&observer, Some(candidate()), Ok(&receipt));
|
||||
}
|
||||
let status = observation_status_from(®istry);
|
||||
assert_eq!(status.integrity_state, "unknown");
|
||||
assert_eq!(status.retained_pending_candidates, Some(0));
|
||||
assert_eq!(status.unknown_candidates.iter().map(|row| row.count).sum::<u64>(), 2);
|
||||
assert!(
|
||||
status
|
||||
.unknown_candidates
|
||||
.iter()
|
||||
.any(|row| row.reason == "not_admitted" && row.count == 2)
|
||||
);
|
||||
assert_eq!(recorder.reason_total("not_admitted"), 2);
|
||||
assert_eq!(recorder.reason_total("admission_unknown"), 0);
|
||||
assert_eq!(recorder.total("rustfs_scanner_heal_candidate_unknown_total"), 2);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn admission_errors_without_decisions_are_reported_unknown() {
|
||||
let recorder = CompletionRecorder::default();
|
||||
let _recorder = metrics::set_default_local_recorder(&recorder);
|
||||
let (sender, _receiver) = mpsc::channel(1);
|
||||
let observer = ObserverHandle {
|
||||
sender,
|
||||
state: Arc::new(Mutex::new(Observations::default())),
|
||||
generation: 1,
|
||||
started_at_unix_secs: None,
|
||||
};
|
||||
let registry = Mutex::new(Some(observer.clone()));
|
||||
let (sender, observed_reply) = tokio::sync::oneshot::channel::<()>();
|
||||
drop(sender);
|
||||
let (sender, legacy_reply) = tokio::sync::oneshot::channel::<()>();
|
||||
drop(sender);
|
||||
for error in [
|
||||
HealObservationChannelError::NotInitialized,
|
||||
HealObservationChannelError::LegacyCommandClosed,
|
||||
HealObservationChannelError::ObservedResponseClosed(observed_reply.await.expect_err("reply was dropped")),
|
||||
HealObservationChannelError::LegacyResponseClosed(legacy_reply.await.expect_err("reply was dropped")),
|
||||
HealObservationChannelError::AdmissionFailed("unconfirmed processor error".into()),
|
||||
] {
|
||||
observe_on(&observer, Some(candidate()), Err(&error));
|
||||
}
|
||||
|
||||
let status = observation_status_from(®istry);
|
||||
assert_eq!(status.integrity_state, "unknown");
|
||||
assert_eq!(status.retained_pending_candidates, Some(0));
|
||||
assert_eq!(status.unknown_candidates.iter().map(|row| row.count).sum::<u64>(), 5);
|
||||
assert!(
|
||||
status
|
||||
.unknown_candidates
|
||||
.iter()
|
||||
.any(|row| row.reason == "admission_unknown" && row.count == 5)
|
||||
);
|
||||
assert_eq!(recorder.reason_total("admission_unknown"), 5);
|
||||
assert_eq!(recorder.reason_total("not_admitted"), 0);
|
||||
assert_eq!(recorder.total("rustfs_scanner_heal_candidate_unknown_total"), 5);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn observer_status_tracks_canonical_terminals_without_a_metrics_recorder() {
|
||||
use rustfs_heal_contracts::{completion::publish_heal_completion, heal_channel::HealAdmissionResult};
|
||||
use rustfs_heal_contracts::heal_channel::HealAdmissionResult;
|
||||
|
||||
let recorder = metrics::NoopRecorder;
|
||||
let _recorder = metrics::set_default_local_recorder(&recorder);
|
||||
@@ -361,19 +934,23 @@ async fn observer_status_tracks_canonical_terminals_without_a_metrics_recorder()
|
||||
(canonical.clone(), HealAdmissionResult::Merged),
|
||||
(deferred.clone(), HealAdmissionResult::Accepted),
|
||||
] {
|
||||
observe_on(&observer, Some(candidate()), Ok(&HealAdmissionReceipt { result, task_id }));
|
||||
observe_on(
|
||||
&observer,
|
||||
Some(candidate()),
|
||||
Ok(&ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt { result, task_id },
|
||||
observation_id: Some(1),
|
||||
}),
|
||||
);
|
||||
}
|
||||
publish_heal_completion((*completion(&canonical, HealObjectDisposition::VerifiedHealthy)).clone());
|
||||
publish_heal_completion(
|
||||
(*completion(
|
||||
&deferred,
|
||||
HealObjectDisposition::Deferred {
|
||||
reason: HealDeferredReason::Deadline,
|
||||
retry_not_before: None,
|
||||
},
|
||||
))
|
||||
.clone(),
|
||||
);
|
||||
publish_terminal(completion(&canonical, HealObjectDisposition::VerifiedHealthy));
|
||||
publish_terminal(completion(
|
||||
&deferred,
|
||||
HealObjectDisposition::Deferred {
|
||||
reason: HealDeferredReason::Deadline,
|
||||
retry_not_before: None,
|
||||
},
|
||||
));
|
||||
tokio::time::timeout(Duration::from_secs(2), async {
|
||||
loop {
|
||||
let status = observation_status_from(®istry);
|
||||
@@ -447,6 +1024,19 @@ impl CompletionRecorder {
|
||||
.sum()
|
||||
}
|
||||
|
||||
fn reason_total(&self, reason: &str) -> u64 {
|
||||
self.0
|
||||
.lock()
|
||||
.expect("completion recorder")
|
||||
.iter()
|
||||
.filter(|(key, _)| {
|
||||
key.name() == "rustfs_scanner_heal_candidate_unknown_total"
|
||||
&& key.labels().any(|label| label.key() == "reason" && label.value() == reason)
|
||||
})
|
||||
.map(|(_, value)| value.load(std::sync::atomic::Ordering::Relaxed))
|
||||
.sum()
|
||||
}
|
||||
|
||||
async fn wait_for_terminals(&self, expected: u64) {
|
||||
tokio::time::timeout(Duration::from_secs(2), async {
|
||||
while self.total("rustfs_scanner_heal_candidate_terminal_total") < expected {
|
||||
@@ -462,7 +1052,7 @@ impl CompletionRecorder {
|
||||
// current-thread runtime keeps its spawned observer under this local recorder.
|
||||
#[tokio::test]
|
||||
async fn live_observer_associates_early_completion_with_canonical_merged_receipts() {
|
||||
use rustfs_heal_contracts::{completion::publish_heal_completion, heal_channel::HealAdmissionResult};
|
||||
use rustfs_heal_contracts::heal_channel::HealAdmissionResult;
|
||||
|
||||
let recorder = CompletionRecorder::default();
|
||||
let _recorder = metrics::set_default_local_recorder(&recorder);
|
||||
@@ -476,20 +1066,26 @@ async fn live_observer_associates_early_completion_with_canonical_merged_receipt
|
||||
observe_on(
|
||||
&sender,
|
||||
Some(candidate()),
|
||||
Ok(&HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Accepted,
|
||||
task_id: sentinel_id.clone(),
|
||||
Ok(&ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Accepted,
|
||||
task_id: sentinel_id.clone(),
|
||||
},
|
||||
observation_id: Some(1),
|
||||
}),
|
||||
);
|
||||
publish_heal_completion((*completion(&canonical_id, HealObjectDisposition::VerifiedHealthy)).clone());
|
||||
publish_terminal(completion(&canonical_id, HealObjectDisposition::VerifiedHealthy));
|
||||
// FIFO on the real broadcast channel makes this terminal an acknowledgement
|
||||
// that the earlier unmatched completion was consumed before its admission.
|
||||
publish_heal_completion((*completion(&sentinel_id, HealObjectDisposition::MetadataHealthy)).clone());
|
||||
publish_terminal(completion(&sentinel_id, HealObjectDisposition::MetadataHealthy));
|
||||
recorder.wait_for_terminals(1).await;
|
||||
|
||||
let merged = HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Merged,
|
||||
task_id: canonical_id,
|
||||
let merged = ObservedHealAdmissionReceipt {
|
||||
receipt: HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Merged,
|
||||
task_id: canonical_id,
|
||||
},
|
||||
observation_id: Some(1),
|
||||
};
|
||||
observe_on(&sender, Candidate::from_request(&source_request), Ok(&merged));
|
||||
recorder.wait_for_terminals(2).await;
|
||||
|
||||
+14
-73
@@ -50,9 +50,9 @@ use storage_api::owner::{
|
||||
};
|
||||
#[cfg(test)]
|
||||
use storage_api::owner::{
|
||||
EcstoreDiskOption, EcstoreDiskStore, EcstoreEndpoint, EcstoreEndpointServerPools, EcstoreEndpoints, EcstoreExpiryState,
|
||||
EcstoreInstanceContext, EcstorePoolEndpoints, ecstore_config_init, ecstore_init_bucket_metadata_sys,
|
||||
ecstore_init_local_disks_with_instance_ctx, ecstore_new_disk,
|
||||
EcstoreDiskOption, EcstoreDiskStore, EcstoreEndpoint, EcstoreEndpointServerPools, EcstoreEndpoints, EcstoreInstanceContext,
|
||||
EcstorePoolEndpoints, ecstore_config_init, ecstore_init_bucket_metadata_sys, ecstore_init_local_disks_with_instance_ctx,
|
||||
ecstore_new_disk,
|
||||
};
|
||||
use tokio_util::sync::CancellationToken;
|
||||
use uuid::Uuid;
|
||||
@@ -123,7 +123,7 @@ pub use storage_api::scan::{
|
||||
SCANNER_DIRTY_USAGE_SNAPSHOT_PROTOCOL_VERSION, SCANNER_DIRTY_USAGE_SNAPSHOT_RPC_MAX_MESSAGE_SIZE,
|
||||
SCANNER_SCOPED_DIRTY_USAGE_ACK_MAX_ENTRIES,
|
||||
};
|
||||
pub use workload_admission::{set_scanner_node_admission, set_scanner_workload_admission_snapshot_provider};
|
||||
pub use workload_admission::set_scanner_workload_admission_snapshot_provider;
|
||||
|
||||
static SCANNER_ACTIVE_WORK_UNITS: AtomicU64 = AtomicU64::new(0);
|
||||
static SCANNER_RUNTIME_INSTANCES: AtomicU64 = AtomicU64::new(0);
|
||||
@@ -678,37 +678,8 @@ fn reset_tier_name_cache_for_test() {
|
||||
TIER_REGISTRY_GENERATION.store(0, Ordering::Relaxed);
|
||||
}
|
||||
|
||||
// Only a task running an isolated unit test can override these handles.
|
||||
#[cfg(test)]
|
||||
struct ExpiryLockTestContext {
|
||||
state: Arc<tokio::sync::RwLock<EcstoreExpiryState>>,
|
||||
store: Option<Arc<ECStore>>,
|
||||
completed_incarnation_reads: Arc<std::sync::atomic::AtomicUsize>,
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
tokio::task_local! {
|
||||
static EXPIRY_LOCK_TEST_CONTEXT: ExpiryLockTestContext;
|
||||
}
|
||||
|
||||
pub(crate) async fn enqueue_runtime_free_version(oi: ScannerObjectInfo, cancellation: Option<&CancellationToken>) {
|
||||
#[cfg(test)]
|
||||
let state = EXPIRY_LOCK_TEST_CONTEXT
|
||||
.try_with(|context| context.state.clone())
|
||||
.unwrap_or_else(|_| ecstore_expiry_state_handle());
|
||||
#[cfg(not(test))]
|
||||
let state = ecstore_expiry_state_handle();
|
||||
let state = match cancellation {
|
||||
Some(cancel) => tokio::select! {
|
||||
biased;
|
||||
_ = cancel.cancelled() => return,
|
||||
state = state.write() => state,
|
||||
},
|
||||
None => state.write().await,
|
||||
};
|
||||
if !cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
state.enqueue_free_version(oi);
|
||||
}
|
||||
pub(crate) async fn enqueue_runtime_free_version(oi: ScannerObjectInfo) {
|
||||
ecstore_expiry_state_handle().write().await.enqueue_free_version(oi);
|
||||
}
|
||||
|
||||
pub(crate) async fn enqueue_runtime_newer_noncurrent(
|
||||
@@ -716,50 +687,20 @@ pub(crate) async fn enqueue_runtime_newer_noncurrent(
|
||||
to_delete_objs: Vec<ObjectToDelete>,
|
||||
event: Event,
|
||||
src: &LcEventSrc,
|
||||
cancellation: Option<&CancellationToken>,
|
||||
) -> bool {
|
||||
if cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
return false;
|
||||
}
|
||||
#[cfg(test)]
|
||||
let store = EXPIRY_LOCK_TEST_CONTEXT
|
||||
.try_with(|context| context.store.clone())
|
||||
.unwrap_or_else(|_| ecstore_resolve_object_store_handle());
|
||||
#[cfg(not(test))]
|
||||
let store = ecstore_resolve_object_store_handle();
|
||||
let Some(store) = store else {
|
||||
let Some(store) = ecstore_resolve_object_store_handle() else {
|
||||
return false;
|
||||
};
|
||||
let Ok(bucket_incarnation_id) = store.bucket_incarnation_id(bucket).await else {
|
||||
return false;
|
||||
};
|
||||
#[cfg(test)]
|
||||
let _ = EXPIRY_LOCK_TEST_CONTEXT.try_with(|context| {
|
||||
context
|
||||
.completed_incarnation_reads
|
||||
.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
|
||||
});
|
||||
if cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
return false;
|
||||
}
|
||||
#[cfg(test)]
|
||||
let state = EXPIRY_LOCK_TEST_CONTEXT
|
||||
.try_with(|context| context.state.clone())
|
||||
.unwrap_or_else(|_| ecstore_expiry_state_handle());
|
||||
#[cfg(not(test))]
|
||||
let state = ecstore_expiry_state_handle();
|
||||
let mut state = match cancellation {
|
||||
Some(cancel) => tokio::select! {
|
||||
biased;
|
||||
_ = cancel.cancelled() => return false,
|
||||
state = state.write() => state,
|
||||
},
|
||||
None => state.write().await,
|
||||
};
|
||||
if cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
return false;
|
||||
}
|
||||
state.enqueue_by_newer_noncurrent(bucket, to_delete_objs, event, src, bucket_incarnation_id)
|
||||
ecstore_expiry_state_handle().write().await.enqueue_by_newer_noncurrent(
|
||||
bucket,
|
||||
to_delete_objs,
|
||||
event,
|
||||
src,
|
||||
bucket_incarnation_id,
|
||||
)
|
||||
}
|
||||
|
||||
pub(crate) async fn queue_replication_heal(
|
||||
|
||||
@@ -705,7 +705,7 @@ async fn scan_and_persist_local_bucket(
|
||||
RemoteScannerServerError::worker("remote namespace scanner cache publication is blocked by data movement")
|
||||
})?;
|
||||
let cache_name = path_join_buf(&[&bucket, DATA_USAGE_CACHE_NAME]);
|
||||
let mut guard = acquire_scanner_cache_locks(set.as_ref(), &cache_name, source)
|
||||
let guard = acquire_scanner_cache_locks(set.as_ref(), &cache_name, source)
|
||||
.await
|
||||
.map_err(|err| {
|
||||
if err.is_contention() {
|
||||
@@ -791,23 +791,19 @@ async fn scan_and_persist_local_bucket(
|
||||
|
||||
let set_disks = scanner_set_disk_inventory(set.as_ref()).await;
|
||||
let (checkpoint_tx, mut checkpoint_rx) = mpsc::channel::<DataUsageCache>(1);
|
||||
let (node_tx, mut node_rx) = crate::workload_admission::scanner_node_request_channel();
|
||||
let scan_ctx = ctx.child_token();
|
||||
let scan = crate::workload_admission::with_scanner_node_requests(
|
||||
node_tx,
|
||||
ScannerIODisk::nsscanner_disk(
|
||||
disk.clone(),
|
||||
scan_ctx.clone(),
|
||||
budget,
|
||||
set_disks,
|
||||
cache,
|
||||
None,
|
||||
ScannerDiskScanOptions {
|
||||
scan_mode,
|
||||
prefix_scan_scope: None,
|
||||
checkpoint_tx: Some(checkpoint_tx),
|
||||
},
|
||||
),
|
||||
let scan = ScannerIODisk::nsscanner_disk(
|
||||
disk.clone(),
|
||||
scan_ctx.clone(),
|
||||
budget,
|
||||
set_disks,
|
||||
cache,
|
||||
None,
|
||||
ScannerDiskScanOptions {
|
||||
scan_mode,
|
||||
prefix_scan_scope: None,
|
||||
checkpoint_tx: Some(checkpoint_tx),
|
||||
},
|
||||
);
|
||||
tokio::pin!(scan);
|
||||
let fence_watch = watch_remote_scanner_request_fence(next_cycle, leader_epoch, store.clone(), NS_SCANNER_FENCE_POLL_INTERVAL);
|
||||
@@ -817,27 +813,6 @@ async fn scan_and_persist_local_bucket(
|
||||
let mut checkpoint_channel_closed = false;
|
||||
let outcome = loop {
|
||||
tokio::select! {
|
||||
request = async {
|
||||
match node_rx.as_mut() {
|
||||
Some(receiver) => receiver.recv().await,
|
||||
None => std::future::pending().await,
|
||||
}
|
||||
} => {
|
||||
let Some(request) = request else {
|
||||
node_rx = None;
|
||||
continue;
|
||||
};
|
||||
if let Err(error) = wait_for_remote_node_resumption(
|
||||
guard.resume_node_operation(set.clone(), &cache_name, source, &revisions, request),
|
||||
fence_watch.as_mut(),
|
||||
).await {
|
||||
scan_ctx.cancel();
|
||||
let _ = tokio::time::timeout(NS_SCANNER_LOCK_LOSS_SHUTDOWN_TIMEOUT, scan.as_mut()).await;
|
||||
return Err(RemoteScannerServerError::retry_bucket(format!(
|
||||
"remote namespace scanner could not resume node admission: {error}",
|
||||
)));
|
||||
}
|
||||
}
|
||||
result = &mut scan => {
|
||||
match result {
|
||||
Ok(outcome) => break outcome,
|
||||
@@ -1146,22 +1121,6 @@ pub(crate) async fn scan_remote_bucket(
|
||||
result
|
||||
}
|
||||
|
||||
/// Resource waits must keep checking the persisted leader fence.
|
||||
async fn wait_for_remote_node_resumption<F, G>(resume: F, fence_watch: Pin<&mut G>) -> Result<(), StorageError>
|
||||
where
|
||||
F: Future<Output = Result<(), StorageError>>,
|
||||
G: Future<Output = Result<(), ScannerError>>,
|
||||
{
|
||||
tokio::select! {
|
||||
biased;
|
||||
result = fence_watch => Err(match result {
|
||||
Ok(()) => StorageError::other("remote namespace scanner fence watcher stopped unexpectedly"),
|
||||
Err(error) => StorageError::other(error),
|
||||
}),
|
||||
result = resume => result,
|
||||
}
|
||||
}
|
||||
|
||||
fn finish_remote_scanner_stream(
|
||||
result: RemoteScannerStreamResult<RemoteScannerOutcome>,
|
||||
budget: &ScannerCycleBudget,
|
||||
|
||||
@@ -1006,58 +1006,6 @@ async fn fence_watcher_stops_work_after_persisted_leader_changes() {
|
||||
assert!(err.to_string().contains("requested_epoch=9"));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn node_admission_wait_does_not_hide_replacement_leader() {
|
||||
use rustfs_concurrency::adaptive::{FeedbackController, FeedbackObservation, NodeAdmission, ResourcePressure};
|
||||
use std::num::NonZeroU16;
|
||||
|
||||
let store = Arc::new(MutableCycleStateStore {
|
||||
state: RwLock::new(crate::scanner::encode_scanner_cycle_fence_for_test(7, 9)),
|
||||
});
|
||||
let cache = Mutex::new(None);
|
||||
let refresh = AsyncMutex::new(());
|
||||
let watcher = watch_remote_scanner_request_fence_with_cache(
|
||||
7,
|
||||
9,
|
||||
store.clone(),
|
||||
Duration::from_millis(5),
|
||||
&cache,
|
||||
&refresh,
|
||||
Duration::from_millis(5),
|
||||
);
|
||||
tokio::pin!(watcher);
|
||||
let gate = NodeAdmission::new(NonZeroU16::new(1).expect("one shared node unit"));
|
||||
let storage_polled = AtomicBool::new(false);
|
||||
{
|
||||
let resume = async {
|
||||
let _permit = gate.acquire().await;
|
||||
storage_polled.store(true, Ordering::Relaxed);
|
||||
Ok(())
|
||||
};
|
||||
let waiting = wait_for_remote_node_resumption(resume, watcher.as_mut());
|
||||
tokio::pin!(waiting);
|
||||
assert!(futures::poll!(&mut waiting).is_pending(), "no resource sample grants a node unit");
|
||||
*store.state.write().expect("persist replacement leader") = crate::scanner::encode_scanner_cycle_fence_for_test(7, 10);
|
||||
let error = tokio::time::timeout(Duration::from_millis(100), waiting)
|
||||
.await
|
||||
.expect("resource pause must not hide a changed leader")
|
||||
.expect_err("old leader cannot resume storage work");
|
||||
assert!(error.to_string().contains("requested_epoch=9"));
|
||||
}
|
||||
assert!(!storage_polled.load(Ordering::Relaxed));
|
||||
assert_eq!(gate.snapshot().active, 0);
|
||||
gate.update(
|
||||
&mut FeedbackController::new(),
|
||||
Some(FeedbackObservation {
|
||||
generation: 1,
|
||||
max_concurrency: 1,
|
||||
pressure: ResourcePressure::Unknown,
|
||||
completed_units: None,
|
||||
}),
|
||||
);
|
||||
assert!(gate.try_acquire().is_some(), "failed fencing drops the old node queue ticket");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn concurrent_cycle_cache_misses_share_one_backend_read() {
|
||||
let request = RemoteScannerRequest(test_request(Uuid::new_v4()));
|
||||
|
||||
@@ -43,7 +43,6 @@ use crate::storage_api::owner::{
|
||||
};
|
||||
#[cfg(test)]
|
||||
use crate::storage_api::owner::{EcstoreExpirationStatus as ExpirationStatus, EcstoreLifecycleRule as LifecycleRule};
|
||||
use crate::workload_admission::run_scanner_node_operation;
|
||||
use metrics::{counter, describe_counter};
|
||||
use rustfs_common::trace_bus::{TraceEvent, TraceFunc, TraceKind, trace_emit, trace_subscriber_count};
|
||||
use rustfs_filemeta::{
|
||||
@@ -52,7 +51,7 @@ use rustfs_filemeta::{
|
||||
};
|
||||
use rustfs_heal_contracts::heal_channel::{
|
||||
HEAL_DELETE_DANGLING, HealAdmissionDropReason, HealAdmissionResult, HealChannelPriority, HealChannelRequest,
|
||||
HealRequestSource, HealScanMode, send_heal_request_with_receipt,
|
||||
HealRequestSource, HealScanMode, send_heal_request_with_observation,
|
||||
};
|
||||
use rustfs_scanner_metrics::metrics::{
|
||||
CloseDiskGuard, IlmAction, Metric, Metrics, ScannerReplicationRepairKind, ScannerSourceWorkUpdate, ScannerWorkSource,
|
||||
@@ -796,7 +795,6 @@ pub struct FolderScanner {
|
||||
resolved_failed_object_paths: HashSet<String>,
|
||||
|
||||
sleeper: DynamicSleeper,
|
||||
node_admission: Option<Arc<rustfs_concurrency::adaptive::NodeAdmission>>,
|
||||
// should_heal: Arc<dyn Fn() -> bool + Send + Sync>,
|
||||
disks: Vec<Arc<Disk>>,
|
||||
disks_quorum: usize,
|
||||
@@ -830,8 +828,6 @@ pub struct FolderScanner {
|
||||
pending_size_reconciliation_truncated: bool,
|
||||
#[cfg(test)]
|
||||
list_path_raw_options_observer: Option<mpsc::UnboundedSender<ListPathRawTimeoutSnapshot>>,
|
||||
#[cfg(test)]
|
||||
defer_abandoned_entries_until_finished: bool,
|
||||
}
|
||||
|
||||
struct RawEnumerationProgress {
|
||||
@@ -1002,13 +998,12 @@ async fn next_scanner_dir_entry(
|
||||
ctx: &CancellationToken,
|
||||
sleeper: &DynamicSleeper,
|
||||
entries: &mut ScannerDirectory,
|
||||
admission: Option<&Arc<rustfs_concurrency::adaptive::NodeAdmission>>,
|
||||
) -> Result<Option<tokio::fs::DirEntry>, ScannerError> {
|
||||
if entries.batch_entries == SCANNER_DIRECTORY_BATCH_ENTRIES {
|
||||
wait_for_scanner_io(ctx, tokio::task::yield_now()).await?;
|
||||
entries.batch_entries = 0;
|
||||
}
|
||||
let entry = wait_for_scanner_io(ctx, run_scanner_node_operation(admission, ctx, entries.next_entry())).await???;
|
||||
let entry = wait_for_scanner_io(ctx, entries.next_entry()).await??;
|
||||
if entry.is_some() {
|
||||
// Tokio prefetches bounded chunks. Pacing consumption also paces the
|
||||
// next refill, without charging an extra entry for EOF.
|
||||
@@ -1928,12 +1923,7 @@ impl FolderScanner {
|
||||
// directory that vanished during iteration instead of failing the
|
||||
// whole parent subtree. The bucket root (no parent) still propagates
|
||||
// NotFound so namespace removal is detected by the caller.
|
||||
let mut dir_reader = match wait_for_scanner_io(
|
||||
&ctx,
|
||||
run_scanner_node_operation(self.node_admission.as_ref(), &ctx, ScannerDirectory::open(&dir_path)),
|
||||
)
|
||||
.await??
|
||||
{
|
||||
let mut dir_reader = match wait_for_scanner_io(&ctx, ScannerDirectory::open(&dir_path)).await? {
|
||||
Ok(dir_reader) => Some(dir_reader),
|
||||
Err(e)
|
||||
if folder.parent.is_some()
|
||||
@@ -1971,7 +1961,7 @@ impl FolderScanner {
|
||||
// Hold at most one metadata entry until a candidate reaches
|
||||
// EOF: a later part must not leave object accounting or ILM work.
|
||||
let (entry, replayed_metadata) = if let Some(reader) = dir_reader.as_mut() {
|
||||
let entry = match next_scanner_dir_entry(&ctx, &self.sleeper, reader, self.node_admission.as_ref()).await {
|
||||
let entry = match next_scanner_dir_entry(&ctx, &self.sleeper, reader).await {
|
||||
Ok(Some(entry)) => entry,
|
||||
Ok(None) => {
|
||||
raw_enumeration_complete = true;
|
||||
@@ -2082,12 +2072,7 @@ impl FolderScanner {
|
||||
|
||||
// Ignore entries that disappeared during traversal or hit symlink
|
||||
// loops, but propagate other walk errors.
|
||||
let mut entry_type = match wait_for_scanner_io(
|
||||
&ctx,
|
||||
run_scanner_node_operation(self.node_admission.as_ref(), &ctx, entry.file_type()),
|
||||
)
|
||||
.await??
|
||||
{
|
||||
let mut entry_type = match wait_for_scanner_io(&ctx, entry.file_type()).await? {
|
||||
Ok(entry_type) => entry_type,
|
||||
Err(e) if e.kind() == ErrorKind::NotFound => {
|
||||
debug!(
|
||||
@@ -2138,12 +2123,7 @@ impl FolderScanner {
|
||||
let mut entry_metadata_len = None;
|
||||
if entry_type.is_symlink() {
|
||||
wait_for_scanner_io(&ctx, self.sleeper.admit_disk_io(1, 0)).await?;
|
||||
let metadata = match wait_for_scanner_io(
|
||||
&ctx,
|
||||
run_scanner_node_operation(self.node_admission.as_ref(), &ctx, tokio::fs::metadata(&file_path)),
|
||||
)
|
||||
.await??
|
||||
{
|
||||
let metadata = match wait_for_scanner_io(&ctx, tokio::fs::metadata(&file_path)).await? {
|
||||
Ok(metadata) => metadata,
|
||||
Err(e) if e.kind() == ErrorKind::NotFound => {
|
||||
debug!(
|
||||
@@ -2294,30 +2274,22 @@ impl FolderScanner {
|
||||
len
|
||||
} else {
|
||||
wait_for_scanner_io(&ctx, self.sleeper.admit_disk_io(1, 0)).await?;
|
||||
wait_for_scanner_io(
|
||||
&ctx,
|
||||
run_scanner_node_operation(self.node_admission.as_ref(), &ctx, tokio::fs::metadata(&item.path)),
|
||||
)
|
||||
.await??
|
||||
.map(|metadata| metadata.len())
|
||||
.unwrap_or(0)
|
||||
wait_for_scanner_io(&ctx, tokio::fs::metadata(&item.path))
|
||||
.await?
|
||||
.map(|metadata| metadata.len())
|
||||
.unwrap_or(0)
|
||||
}
|
||||
} else {
|
||||
0
|
||||
};
|
||||
wait_for_scanner_io(&ctx, self.sleeper.admit_disk_io(1, budgeted_bytes)).await?;
|
||||
|
||||
let size_result = run_scanner_node_operation(self.node_admission.as_ref(), &ctx, async {
|
||||
self.object_metadata_visits.increment(1);
|
||||
self.local_disk
|
||||
.get_size_with_tier_names(item.clone(), &self.tier_registry.names)
|
||||
.await
|
||||
})
|
||||
.await?;
|
||||
if self.node_admission.is_some() && ctx.is_cancelled() {
|
||||
return Err(ScannerError::Other("Operation cancelled".to_string()));
|
||||
}
|
||||
let sz = match size_result {
|
||||
self.object_metadata_visits.increment(1);
|
||||
let sz = match self
|
||||
.local_disk
|
||||
.get_size_with_tier_names(item.clone(), &self.tier_registry.names)
|
||||
.await
|
||||
{
|
||||
Ok(sz) => sz,
|
||||
Err(e) => {
|
||||
let failure_action = classify_get_size_failure(&item, &e);
|
||||
@@ -2634,7 +2606,7 @@ impl FolderScanner {
|
||||
{
|
||||
Ok(outcome) => outcome,
|
||||
Err(e) => {
|
||||
if ctx.is_cancelled() || matches!(&e, ScannerError::ResourceDeferred) {
|
||||
if ctx.is_cancelled() {
|
||||
self.preserve_partial_child_progress(&folder_item.parent, &h, into, &dst)
|
||||
.await;
|
||||
return Err(e);
|
||||
@@ -2875,23 +2847,19 @@ impl FolderScanner {
|
||||
let mut seen_truncated_objects: HashSet<String> = HashSet::new();
|
||||
|
||||
loop {
|
||||
if child_ctx.is_cancelled() || (agreed_closed && partial_closed && finished_closed) {
|
||||
if agreed_closed && partial_closed && finished_closed {
|
||||
break;
|
||||
}
|
||||
#[cfg(test)]
|
||||
let defer_entries = self.defer_abandoned_entries_until_finished && !finished_closed;
|
||||
#[cfg(not(test))]
|
||||
let defer_entries = false;
|
||||
|
||||
select! {
|
||||
entry_name = agreed_rx.recv(), if !agreed_closed && !defer_entries => {
|
||||
entry_name = agreed_rx.recv(), if !agreed_closed => {
|
||||
let Some(entry_name) = entry_name else {
|
||||
agreed_closed = true;
|
||||
continue;
|
||||
};
|
||||
(self.update_current_path)(&entry_name).await;
|
||||
}
|
||||
entries = partial_rx.recv(), if !partial_closed && !defer_entries => {
|
||||
entries = partial_rx.recv(), if !partial_closed => {
|
||||
let Some(entries) = entries else {
|
||||
partial_closed = true;
|
||||
continue;
|
||||
@@ -3017,7 +2985,6 @@ impl FolderScanner {
|
||||
finished_closed = true;
|
||||
continue;
|
||||
};
|
||||
finished_closed = true;
|
||||
if disk_errors_are_only_missing_paths(&errs) {
|
||||
debug!(
|
||||
target: "rustfs::scanner::folder",
|
||||
@@ -3039,9 +3006,7 @@ impl FolderScanner {
|
||||
"Scanner list_path_raw finished with disk errors"
|
||||
);
|
||||
}
|
||||
// The producer awaited callback sends, not their
|
||||
// consumption. Drain the remaining candidate and
|
||||
// agreed frames before closing this child walk.
|
||||
child_ctx.cancel();
|
||||
}
|
||||
_ = child_ctx.cancelled() => {
|
||||
break;
|
||||
@@ -3059,10 +3024,7 @@ impl FolderScanner {
|
||||
if into.compacted {
|
||||
// In compacted mode child totals are accumulated directly into the parent entry.
|
||||
let fut = Box::pin(self.scan_folder(ctx.clone(), folder_item.clone(), into));
|
||||
fut.await.map_err(|error| match error {
|
||||
ScannerError::ResourceDeferred => ScannerError::ResourceDeferred,
|
||||
other => ScannerError::Other(other.to_string()),
|
||||
})?;
|
||||
fut.await.map_err(|e| ScannerError::Other(e.to_string()))?;
|
||||
self.send_update_for_entry(&this_hash, &folder.parent, into).await;
|
||||
tokio::task::yield_now().await;
|
||||
} else {
|
||||
@@ -3081,7 +3043,7 @@ impl FolderScanner {
|
||||
)
|
||||
.await
|
||||
{
|
||||
if ctx.is_cancelled() || matches!(&e, ScannerError::ResourceDeferred) {
|
||||
if ctx.is_cancelled() {
|
||||
self.preserve_partial_child_progress(&folder_item.parent, &h, into, &dst)
|
||||
.await;
|
||||
return Err(e);
|
||||
@@ -3255,7 +3217,6 @@ pub(crate) async fn scan_data_folder_scoped(
|
||||
failed_object_paths_seen: HashSet::new(),
|
||||
resolved_failed_object_paths: HashSet::new(),
|
||||
sleeper,
|
||||
node_admission: crate::workload_admission::scanner_node_admission(),
|
||||
disks,
|
||||
disks_quorum,
|
||||
usage_updates,
|
||||
@@ -3283,8 +3244,6 @@ pub(crate) async fn scan_data_folder_scoped(
|
||||
pending_size_reconciliation_truncated: false,
|
||||
#[cfg(test)]
|
||||
list_path_raw_options_observer: None,
|
||||
#[cfg(test)]
|
||||
defer_abandoned_entries_until_finished: false,
|
||||
};
|
||||
|
||||
let now = FolderScanner::now_secs();
|
||||
@@ -3374,7 +3333,7 @@ pub(crate) async fn scan_data_folder_scoped(
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
if ctx.is_cancelled() || matches!(&e, ScannerError::ResourceDeferred) {
|
||||
if ctx.is_cancelled() {
|
||||
let root_hash = hash_path(&bucket_name);
|
||||
let root_has_progress = data_usage_root_has_progress(&root);
|
||||
let pending_heals_changed = scanner.pending_heals_changed;
|
||||
@@ -3449,19 +3408,6 @@ pub(crate) async fn scan_data_folder_scoped(
|
||||
close_disk_guard.close().await;
|
||||
return Err(ScannerError::NamespaceNotFoundCache(Box::new(partial_cache)));
|
||||
}
|
||||
if matches!(&e, ScannerError::ResourceDeferred) {
|
||||
// Admission pressure is not disk failure or an empty census.
|
||||
// Keep the previous tree when no new useful progress exists.
|
||||
let mut partial_cache = scanner.old_cache;
|
||||
if partial_cache.cache.is_empty() {
|
||||
partial_cache
|
||||
.cache
|
||||
.insert(hash_path(&bucket_name).0, DataUsageEntry::default());
|
||||
}
|
||||
partial_cache.info.snapshot_complete = false;
|
||||
close_disk_guard.close().await;
|
||||
return Err(ScannerError::PartialCache(Box::new(partial_cache)));
|
||||
}
|
||||
close_disk_guard.close().await;
|
||||
// No useful information, return original cache
|
||||
Err(e)
|
||||
@@ -3481,15 +3427,3 @@ pub(crate) use tests::checkpoint_fixture::run_checkpoint_fixture;
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
|
||||
#[cfg(test)]
|
||||
tokio::task_local! {
|
||||
pub(crate) static TEST_SIZE_DISPATCH_BOUNDARIES: tokio::sync::mpsc::UnboundedSender<&'static str>;
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub(crate) fn observe_test_size_dispatch_boundary(stage: &'static str) -> bool {
|
||||
TEST_SIZE_DISPATCH_BOUNDARIES
|
||||
.try_with(|sender| sender.send(stage).is_ok())
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
@@ -481,7 +481,7 @@ pub(super) async fn send_scanner_heal_request(
|
||||
let priority = request.priority;
|
||||
let trace_context = scanner_heal_candidate_trace_context(&request);
|
||||
let candidate = crate::heal_completion::prepare(&request);
|
||||
match send_heal_request_with_receipt(request).await {
|
||||
match send_heal_request_with_observation(request).await {
|
||||
Ok(receipt) => {
|
||||
crate::heal_completion::observe(candidate, Ok(&receipt));
|
||||
let result = receipt.result;
|
||||
@@ -501,7 +501,8 @@ pub(super) async fn send_scanner_heal_request(
|
||||
Ok(result)
|
||||
}
|
||||
Err(err) => {
|
||||
crate::heal_completion::observe(candidate, Err(()));
|
||||
crate::heal_completion::observe(candidate, Err(&err));
|
||||
let err = err.to_string();
|
||||
counter!(
|
||||
"rustfs_heal_candidate_enqueue_total",
|
||||
"type" => candidate_type.to_string(),
|
||||
@@ -628,22 +629,6 @@ impl ScannerItem {
|
||||
tier_names: &[String],
|
||||
size_summary: &mut SizeSummary,
|
||||
) {
|
||||
self.apply_actions_cancellable(object_infos, lock_retention, versioning_config, tier_names, size_summary, None)
|
||||
.await;
|
||||
}
|
||||
|
||||
pub(crate) async fn apply_actions_cancellable(
|
||||
&mut self,
|
||||
object_infos: Vec<ObjectInfo>,
|
||||
lock_retention: Option<Arc<ObjectLockConfiguration>>,
|
||||
versioning_config: VersioningConfiguration,
|
||||
tier_names: &[String],
|
||||
size_summary: &mut SizeSummary,
|
||||
cancellation: Option<&CancellationToken>,
|
||||
) {
|
||||
if cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
return;
|
||||
}
|
||||
let object_path = self.object_path();
|
||||
if object_infos.is_empty() {
|
||||
debug!(
|
||||
@@ -687,9 +672,6 @@ impl ScannerItem {
|
||||
let Some(lifecycle) = self.lifecycle.clone() else {
|
||||
let mut cumulative_size: i64 = 0;
|
||||
for (oi, resolved_size) in object_infos.iter().zip(resolved_sizes.iter()) {
|
||||
if cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
return;
|
||||
}
|
||||
let accounting_size = match resolved_size {
|
||||
SizeResolution::Known { logical, .. } => *logical,
|
||||
// A valid compressed legacy sentinel has no logical size,
|
||||
@@ -697,7 +679,7 @@ impl ScannerItem {
|
||||
// physical size is only an input to those operations; it
|
||||
// is not folded into the logical total below.
|
||||
SizeResolution::Unknown { physical, .. } => {
|
||||
self.heal_actions(oi, *physical, size_summary, cancellation).await;
|
||||
self.heal_actions(oi, *physical, size_summary).await;
|
||||
size_summary.actions_accounting_unknown(oi);
|
||||
continue;
|
||||
}
|
||||
@@ -707,16 +689,13 @@ impl ScannerItem {
|
||||
}
|
||||
};
|
||||
|
||||
let size = self.heal_actions(oi, accounting_size, size_summary, cancellation).await;
|
||||
let size = self.heal_actions(oi, accounting_size, size_summary).await;
|
||||
|
||||
size_summary.actions_accounting(oi, size, accounting_size);
|
||||
|
||||
cumulative_size = cumulative_size.saturating_add(size);
|
||||
}
|
||||
|
||||
if cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
return;
|
||||
}
|
||||
self.alert_excessive_versions(object_infos.len(), cumulative_size);
|
||||
|
||||
debug!(
|
||||
@@ -758,10 +737,6 @@ impl ScannerItem {
|
||||
}
|
||||
};
|
||||
|
||||
if cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Every version handed to the evaluator counts as an ILM-checked
|
||||
// version, whether or not a rule matched (NoneAction included). This is
|
||||
// reached only for buckets with lifecycle rules; it feeds
|
||||
@@ -780,9 +755,6 @@ impl ScannerItem {
|
||||
.all(|candidate| Self::tier_is_known(candidate, tier_names));
|
||||
'eventLoop: {
|
||||
for (i, event) in events.iter().enumerate() {
|
||||
if cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
return;
|
||||
}
|
||||
let oi = &object_infos[i];
|
||||
let known_size = resolved_sizes[i].known_size();
|
||||
if has_corrupt_size
|
||||
@@ -801,7 +773,7 @@ impl ScannerItem {
|
||||
// accounting. Size-filtered or deferred events remain
|
||||
// pending, so retain the version-only physical counters.
|
||||
if let SizeResolution::Unknown { physical, .. } = &resolved_sizes[i] {
|
||||
self.heal_actions(oi, *physical, size_summary, cancellation).await;
|
||||
self.heal_actions(oi, *physical, size_summary).await;
|
||||
size_summary.actions_accounting_unknown(oi);
|
||||
}
|
||||
continue;
|
||||
@@ -858,7 +830,7 @@ impl ScannerItem {
|
||||
noncurrent_unknown.push(oi);
|
||||
} else {
|
||||
if let SizeResolution::Unknown { physical, .. } = &resolved_sizes[i] {
|
||||
self.heal_actions(oi, *physical, size_summary, cancellation).await;
|
||||
self.heal_actions(oi, *physical, size_summary).await;
|
||||
}
|
||||
size_summary.actions_accounting_unknown(oi);
|
||||
}
|
||||
@@ -875,7 +847,7 @@ impl ScannerItem {
|
||||
}
|
||||
IlmAction::NoneAction | IlmAction::ActionCount => {
|
||||
if let SizeResolution::Unknown { physical, .. } = &resolved_sizes[i] {
|
||||
self.heal_actions(oi, *physical, size_summary, cancellation).await;
|
||||
self.heal_actions(oi, *physical, size_summary).await;
|
||||
}
|
||||
size_summary.actions_accounting_unknown(oi);
|
||||
}
|
||||
@@ -893,7 +865,7 @@ impl ScannerItem {
|
||||
// side-effecting tier actions fail closed until the registry
|
||||
// recognizes the source again.
|
||||
if Self::action_blocked_by_unknown_tier(event.action, oi, all_versions_known, tier_names, &event.storage_class) {
|
||||
size = self.heal_actions(oi, actual_size, size_summary, cancellation).await;
|
||||
size = self.heal_actions(oi, actual_size, size_summary).await;
|
||||
size_summary.actions_accounting(oi, size, actual_size);
|
||||
cumulative_size += size;
|
||||
continue;
|
||||
@@ -1002,7 +974,7 @@ impl ScannerItem {
|
||||
}
|
||||
|
||||
IlmAction::NoneAction | IlmAction::ActionCount => {
|
||||
size = self.heal_actions(oi, actual_size, size_summary, cancellation).await;
|
||||
size = self.heal_actions(oi, actual_size, size_summary).await;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1013,9 +985,6 @@ impl ScannerItem {
|
||||
}
|
||||
}
|
||||
|
||||
if cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
return;
|
||||
}
|
||||
if !to_delete_objs.is_empty()
|
||||
&& let Some(event) = noncurrent_events.first().cloned()
|
||||
{
|
||||
@@ -1023,8 +992,7 @@ impl ScannerItem {
|
||||
let count = u64::try_from(to_delete_objs.len()).unwrap_or(u64::MAX);
|
||||
let done_ilm = Metrics::time_ilm(action);
|
||||
let trace_started_at = trace_start_instant();
|
||||
let queued =
|
||||
enqueue_runtime_newer_noncurrent(&self.bucket, to_delete_objs, event, &LcEventSrc::Scanner, cancellation).await;
|
||||
let queued = enqueue_runtime_newer_noncurrent(&self.bucket, to_delete_objs, event, &LcEventSrc::Scanner).await;
|
||||
if let Some(trace_started_at) = trace_started_at {
|
||||
let state = if queued { "queued" } else { "not_queued" };
|
||||
trace_emit(|| {
|
||||
@@ -1055,28 +1023,15 @@ impl ScannerItem {
|
||||
}
|
||||
}
|
||||
}
|
||||
if !cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
self.alert_excessive_versions(remaining_versions, cumulative_size);
|
||||
}
|
||||
self.alert_excessive_versions(remaining_versions, cumulative_size);
|
||||
}
|
||||
|
||||
pub(super) async fn heal_actions(
|
||||
&mut self,
|
||||
oi: &ObjectInfo,
|
||||
actual_size: i64,
|
||||
size_summary: &mut SizeSummary,
|
||||
cancellation: Option<&CancellationToken>,
|
||||
) -> i64 {
|
||||
if cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
return actual_size;
|
||||
}
|
||||
pub(super) async fn heal_actions(&mut self, oi: &ObjectInfo, actual_size: i64, size_summary: &mut SizeSummary) -> i64 {
|
||||
if self.heal_enabled {
|
||||
self.enqueue_heal(oi).await;
|
||||
}
|
||||
|
||||
if !cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
self.heal_replication(oi, size_summary).await;
|
||||
}
|
||||
self.heal_replication(oi, size_summary).await;
|
||||
|
||||
actual_size
|
||||
}
|
||||
|
||||
@@ -30,9 +30,7 @@ use std::sync::Mutex;
|
||||
pub(super) mod checkpoint_fixture;
|
||||
pub(super) mod enumeration_restart;
|
||||
mod incremental_enumeration;
|
||||
mod listing_completion;
|
||||
mod metadata_visits;
|
||||
mod node_admission;
|
||||
mod usage_updates;
|
||||
|
||||
/// Reset the process-global alert cooldown map; test-only.
|
||||
@@ -366,7 +364,6 @@ async fn build_test_scanner() -> (FolderScanner, std::path::PathBuf) {
|
||||
failed_object_paths_seen: HashSet::new(),
|
||||
resolved_failed_object_paths: HashSet::new(),
|
||||
sleeper: SCANNER_SLEEPER.clone(),
|
||||
node_admission: None,
|
||||
disks: Vec::new(),
|
||||
disks_quorum: 0,
|
||||
usage_updates: None,
|
||||
@@ -397,7 +394,6 @@ async fn build_test_scanner() -> (FolderScanner, std::path::PathBuf) {
|
||||
pending_size_reconciliation_scopes: HashSet::new(),
|
||||
pending_size_reconciliation_truncated: false,
|
||||
list_path_raw_options_observer: None,
|
||||
defer_abandoned_entries_until_finished: false,
|
||||
};
|
||||
|
||||
(scanner, temp_dir)
|
||||
@@ -2266,7 +2262,7 @@ async fn test_heal_actions_returns_actual_size_without_inline_heal() {
|
||||
};
|
||||
let mut size_summary = SizeSummary::default();
|
||||
|
||||
let size = item.heal_actions(&object_info, 123, &mut size_summary, None).await;
|
||||
let size = item.heal_actions(&object_info, 123, &mut size_summary).await;
|
||||
assert_eq!(size, 123);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
// Copyright 2026 RustFS Team
|
||||
// Licensed under the Apache License, Version 2.0.
|
||||
|
||||
use super::*;
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn abandoned_listing_drains_candidate_buffered_before_finished() {
|
||||
let (mut scanner, root) = build_test_scanner().await;
|
||||
let _guard = TestGuard {
|
||||
temp_dir: Some(root.clone()),
|
||||
};
|
||||
let bucket = "bucket";
|
||||
let object = "abandoned/object";
|
||||
tokio::fs::create_dir_all(root.join(bucket)).await.expect("local bucket");
|
||||
let mut disks = vec![scanner.local_disk.clone()];
|
||||
let mut original_metadata = Vec::new();
|
||||
for (index, version) in [(2, 0x1935), (3, 0x1935), (4, 0x1934)] {
|
||||
let disk_root = root.join(format!("disk-{index}"));
|
||||
let metadata = metadata_for_object_version(bucket, object, Some(Uuid::from_u128(version)));
|
||||
write_test_object_metadata_bytes(&disk_root, bucket, object, &metadata).await;
|
||||
original_metadata.push((disk_root.join(bucket).join(object).join(STORAGE_FORMAT_FILE), metadata));
|
||||
let endpoint = Endpoint::try_from(disk_root.to_string_lossy().as_ref()).expect("listing fixture endpoint");
|
||||
disks.push(
|
||||
new_disk(
|
||||
&endpoint,
|
||||
&DiskOption {
|
||||
cleanup: false,
|
||||
health_check: false,
|
||||
},
|
||||
)
|
||||
.await
|
||||
.expect("listing fixture disk"),
|
||||
);
|
||||
}
|
||||
for cache in [&mut scanner.old_cache, &mut scanner.new_cache] {
|
||||
cache.info.name = bucket.to_owned();
|
||||
}
|
||||
scanner.old_cache.replace(
|
||||
"bucket/abandoned/object",
|
||||
bucket,
|
||||
DataUsageEntry {
|
||||
objects: 1,
|
||||
..Default::default()
|
||||
},
|
||||
);
|
||||
scanner.heal_object_select = 1;
|
||||
scanner.disks = disks;
|
||||
scanner.disks_quorum = 2;
|
||||
scanner.sleeper = DynamicSleeper::new(rustfs_config::ScannerSpeed::Fastest);
|
||||
// Force the valid select ordering that receives terminal errors before the
|
||||
// final candidate. One candidate frame fits in the bounded partial channel.
|
||||
scanner.defer_abandoned_entries_until_finished = true;
|
||||
let (_commands, mut heal_rx) = rustfs_heal_contracts::heal_channel::init_heal_channels().expect("isolated heal channel");
|
||||
let (captured_tx, mut captured_rx) = mpsc::unbounded_channel();
|
||||
let responder = tokio::spawn(async move {
|
||||
while let Some(command) = heal_rx.recv().await {
|
||||
let rustfs_heal_contracts::heal_channel::HealReceiptCommand { request, response_tx } = command;
|
||||
captured_tx
|
||||
.send((request.object_prefix.clone(), request.object_version_id.clone()))
|
||||
.expect("candidate capture remains open");
|
||||
let _ = response_tx.send(Ok(rustfs_heal_contracts::heal_channel::HealAdmissionReceipt {
|
||||
result: HealAdmissionResult::Accepted,
|
||||
task_id: request.id,
|
||||
}));
|
||||
}
|
||||
});
|
||||
let result = tokio::time::timeout(
|
||||
Duration::from_secs(2),
|
||||
scanner.scan_folder(
|
||||
CancellationToken::new(),
|
||||
CachedFolder {
|
||||
name: bucket.to_owned(),
|
||||
parent: None,
|
||||
object_heal_prob_div: 1,
|
||||
},
|
||||
&mut DataUsageEntry::default(),
|
||||
),
|
||||
)
|
||||
.await;
|
||||
responder.abort();
|
||||
result
|
||||
.expect("listing completion must close every callback channel")
|
||||
.expect("complete folder scan");
|
||||
let mut candidates = HashSet::new();
|
||||
while let Ok((object, version)) = captured_rx.try_recv() {
|
||||
if let (Some(object), Some(version)) = (object, version) {
|
||||
candidates.insert((object, version));
|
||||
}
|
||||
}
|
||||
let expected = [0x1934, 0x1935]
|
||||
.into_iter()
|
||||
// Raw base-object listings include the trailing separator. Preserve
|
||||
// the producer's candidate identity when draining its callback frame.
|
||||
.map(|version| (format!("{object}/"), Uuid::from_u128(version).to_string()))
|
||||
.collect();
|
||||
assert_eq!(
|
||||
candidates, expected,
|
||||
"terminal disk errors must not discard buffered exact-version candidates"
|
||||
);
|
||||
for (path, metadata) in original_metadata {
|
||||
assert_eq!(tokio::fs::read(path).await.expect("retained metadata"), metadata);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -172,55 +172,12 @@ fn record_checkpoint_save_failure(cache_name: &str, checkpoint: &DataUsageCache,
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct ScannerCacheLockGuards {
|
||||
scoped: Option<NamespaceLockGuard>,
|
||||
scoped: NamespaceLockGuard,
|
||||
}
|
||||
|
||||
impl ScannerCacheLockGuards {
|
||||
pub(crate) fn is_lock_lost(&self) -> bool {
|
||||
self.scoped.as_ref().is_none_or(NamespaceLockGuard::is_lock_lost)
|
||||
}
|
||||
|
||||
/// Suspend the same traversal while yielding its cache lease. Lock order on
|
||||
/// resumption is node admission -> cache lease -> cache revision reads.
|
||||
pub(crate) async fn resume_node_operation(
|
||||
&mut self,
|
||||
store: Arc<SetDisks>,
|
||||
cache_name: &str,
|
||||
source: DataUsageCacheSource,
|
||||
revisions: &DataUsageCacheRevisions,
|
||||
request: crate::workload_admission::ScannerNodeRequest,
|
||||
) -> Result<()> {
|
||||
if self.is_lock_lost() {
|
||||
return Err(Error::other("scanner cache lock was lost before node admission"));
|
||||
}
|
||||
if request.respond.is_closed() {
|
||||
return Ok(());
|
||||
}
|
||||
let crate::workload_admission::ScannerNodeRequest { owner, respond, cancel } = request;
|
||||
drop(self.scoped.take());
|
||||
let resume = async {
|
||||
let permit = owner.acquire().await;
|
||||
*self = acquire_scanner_cache_locks(store.as_ref(), cache_name, source)
|
||||
.await
|
||||
.map_err(Error::other)?;
|
||||
let current = crate::storage_api::ecstore_with_background_disk_io(
|
||||
cancel.clone(),
|
||||
DataUsageCache::read_revisions(store, cache_name),
|
||||
)
|
||||
.await?;
|
||||
if self.is_lock_lost() || ¤t != revisions {
|
||||
return Err(Error::other("scanner cache changed while waiting for node admission"));
|
||||
}
|
||||
// If the walk was dropped, send returns ownership and drops the
|
||||
// permit without recording completed work.
|
||||
let _ = respond.send(permit);
|
||||
Ok(())
|
||||
};
|
||||
tokio::select! {
|
||||
biased;
|
||||
_ = cancel.cancelled() => Err(Error::other("scanner node admission cancelled")),
|
||||
result = resume => result,
|
||||
}
|
||||
self.scoped.is_lock_lost()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -258,15 +215,6 @@ impl std::fmt::Display for ScannerCacheLockError {
|
||||
}
|
||||
}
|
||||
|
||||
impl std::error::Error for ScannerCacheLockError {
|
||||
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
|
||||
match self {
|
||||
Self::Create { source, .. } => Some(source),
|
||||
Self::Acquire { source, .. } => Some(source),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) async fn acquire_scanner_cache_locks(
|
||||
store: &SetDisks,
|
||||
cache_name: &str,
|
||||
@@ -289,7 +237,7 @@ pub(crate) async fn acquire_scanner_cache_locks(
|
||||
source,
|
||||
})?;
|
||||
|
||||
Ok(ScannerCacheLockGuards { scoped: Some(scoped) })
|
||||
Ok(ScannerCacheLockGuards { scoped })
|
||||
}
|
||||
|
||||
pub(super) async fn await_scanner_disk_shutdown<F>(scan: Pin<&mut F>)
|
||||
@@ -740,15 +688,6 @@ pub(super) fn completed_data_usage_info(
|
||||
.map(|candidate| (candidate.data, candidate.last_update))
|
||||
}
|
||||
|
||||
/// Certify an incarnation only when every contributing set reports the same non-nil identity.
|
||||
fn certified_bucket_incarnation(results: &[DataUsageCache], bucket: &str) -> Option<uuid::Uuid> {
|
||||
let mut identities = results
|
||||
.iter()
|
||||
.map(|result| result.info.scan_bucket_incarnations.get(bucket).copied());
|
||||
let first = identities.next().flatten().filter(|id| !id.is_nil())?;
|
||||
identities.all(|id| id == Some(first)).then_some(first)
|
||||
}
|
||||
|
||||
pub(super) fn completed_usage_candidate(
|
||||
results: &[DataUsageCache],
|
||||
scope: &ScannerSnapshotScope<'_>,
|
||||
@@ -801,11 +740,7 @@ pub(super) fn completed_usage_candidate(
|
||||
let merged_last_update = validated.last_update;
|
||||
let buckets_usage = bucket_entries
|
||||
.into_iter()
|
||||
.map(|(bucket, entry)| {
|
||||
let mut usage = checked_bucket_usage_info(entry).ok_or(CandidateOutcome::UsageCounters)?;
|
||||
usage.bucket_incarnation = certified_bucket_incarnation(results, &bucket).map(|id| id.to_string());
|
||||
Ok((bucket, usage))
|
||||
})
|
||||
.map(|(bucket, entry)| Ok((bucket, checked_bucket_usage_info(entry).ok_or(CandidateOutcome::UsageCounters)?)))
|
||||
.collect::<std::result::Result<HashMap<_, _>, CandidateOutcome>>()?;
|
||||
let bucket_sizes = buckets_usage
|
||||
.iter()
|
||||
|
||||
@@ -238,71 +238,6 @@ pub enum ScannerDurableDirtyUsageReplayScope {
|
||||
TopLevelEntries { entries: BTreeSet<String> },
|
||||
}
|
||||
|
||||
impl ScannerDurableDirtyUsageReplayRecord {
|
||||
/// Replays decoded producer hints with the canonical byte limit and semantic checks.
|
||||
///
|
||||
/// Callers must retain their framing and owner checks. This performs the same
|
||||
/// state update as [`replay_durable_dirty_usage_producer_record`]; it does not
|
||||
/// establish storage-verified source authority.
|
||||
pub fn replay(self) -> std::result::Result<ScannerDirtyUsageState, ScannerDurableDirtyUsageReplayError> {
|
||||
check_durable_dirty_usage_replay_bytes(&self)?;
|
||||
replay_decoded_dirty_usage_record(&self)
|
||||
}
|
||||
}
|
||||
|
||||
struct ReplayByteLimit {
|
||||
remaining: usize,
|
||||
}
|
||||
|
||||
impl std::io::Write for ReplayByteLimit {
|
||||
fn write(&mut self, bytes: &[u8]) -> std::io::Result<usize> {
|
||||
self.remaining = self
|
||||
.remaining
|
||||
.checked_sub(bytes.len())
|
||||
.ok_or_else(|| std::io::Error::other("dirty replay byte limit"))?;
|
||||
Ok(bytes.len())
|
||||
}
|
||||
|
||||
fn flush(&mut self) -> std::io::Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn check_durable_dirty_usage_replay_bytes(
|
||||
record: &ScannerDurableDirtyUsageReplayRecord,
|
||||
) -> std::result::Result<(), ScannerDurableDirtyUsageReplayError> {
|
||||
// Bound structure traversal and string scanning before counting escaped JSON.
|
||||
// Each entry or prefix contributes at least one additional serialized byte.
|
||||
let mut remaining = SCANNER_DURABLE_DIRTY_USAGE_REPLAY_MAX_BYTES;
|
||||
let mut charge = |size: usize| -> std::result::Result<(), ScannerDurableDirtyUsageReplayError> {
|
||||
remaining = remaining
|
||||
.checked_sub(size)
|
||||
.ok_or(ScannerDurableDirtyUsageReplayError::ByteLimit)?;
|
||||
Ok(())
|
||||
};
|
||||
charge(record.writer_epoch.len())?;
|
||||
charge(record.entries.len())?;
|
||||
for entry in &record.entries {
|
||||
charge(entry.bucket.len())?;
|
||||
if let ScannerDurableDirtyUsageReplayScope::TopLevelEntries { entries } = &entry.scope {
|
||||
charge(entries.len())?;
|
||||
for entry in entries {
|
||||
charge(entry.len())?;
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut limit = ReplayByteLimit {
|
||||
remaining: SCANNER_DURABLE_DIRTY_USAGE_REPLAY_MAX_BYTES,
|
||||
};
|
||||
serde_json::to_writer(&mut limit, record).map_err(|error| {
|
||||
if error.is_io() {
|
||||
ScannerDurableDirtyUsageReplayError::ByteLimit
|
||||
} else {
|
||||
ScannerDurableDirtyUsageReplayError::InvalidJson
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
pub fn encode_durable_dirty_usage_producer_replay_record(
|
||||
entries: Vec<ScannerDurableDirtyUsageReplayEntry>,
|
||||
) -> std::result::Result<Vec<u8>, ScannerDurableDirtyUsageReplayError> {
|
||||
@@ -328,13 +263,7 @@ pub fn replay_durable_dirty_usage_producer_record(
|
||||
}
|
||||
let record: ScannerDurableDirtyUsageReplayRecord =
|
||||
serde_json::from_slice(bytes).map_err(|_| ScannerDurableDirtyUsageReplayError::InvalidJson)?;
|
||||
replay_decoded_dirty_usage_record(&record)
|
||||
}
|
||||
|
||||
fn replay_decoded_dirty_usage_record(
|
||||
record: &ScannerDurableDirtyUsageReplayRecord,
|
||||
) -> std::result::Result<ScannerDirtyUsageState, ScannerDurableDirtyUsageReplayError> {
|
||||
let replay = validate_durable_dirty_usage_replay_record(record)?;
|
||||
let replay = validate_durable_dirty_usage_replay_record(&record)?;
|
||||
let max_generation = replay.iter().map(|entry| entry.generation).max().unwrap_or(0);
|
||||
set_dirty_usage_generation_floor(max_generation)?;
|
||||
let pending = {
|
||||
@@ -843,109 +772,6 @@ mod scoped_dirty_usage_tests {
|
||||
);
|
||||
}
|
||||
|
||||
fn decoded_replay_fixture() -> ScannerDurableDirtyUsageReplayRecord {
|
||||
ScannerDurableDirtyUsageReplayRecord {
|
||||
schema: SCANNER_DURABLE_DIRTY_USAGE_REPLAY_SCHEMA,
|
||||
cache_key_format: crate::DATA_USAGE_CACHE_KEY_FORMAT,
|
||||
writer_epoch: "writer".to_string(),
|
||||
entries: vec![ScannerDurableDirtyUsageReplayEntry {
|
||||
bucket: "photos".to_string(),
|
||||
generation: 7,
|
||||
scope: ScannerDurableDirtyUsageReplayScope::TopLevelEntries {
|
||||
entries: BTreeSet::from(["2026".to_string(), "archive".to_string()]),
|
||||
},
|
||||
producers: SegmentInvalidationProducerIdentity::REQUIRED_PRODUCTION.into_iter().collect(),
|
||||
}],
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[serial]
|
||||
fn durable_dirty_usage_decoded_replay_matches_byte_replay_at_size_boundary() {
|
||||
let record = decoded_replay_fixture();
|
||||
let fixed_bytes = serde_json::to_vec(&record).expect("fixture encoding").len() - record.writer_epoch.len();
|
||||
for size in [
|
||||
SCANNER_DURABLE_DIRTY_USAGE_REPLAY_MAX_BYTES - 1,
|
||||
SCANNER_DURABLE_DIRTY_USAGE_REPLAY_MAX_BYTES,
|
||||
SCANNER_DURABLE_DIRTY_USAGE_REPLAY_MAX_BYTES + 1,
|
||||
] {
|
||||
clear_dirty_usage_buckets_for_tests();
|
||||
let mut record = record.clone();
|
||||
record.writer_epoch = "x".repeat(size - fixed_bytes);
|
||||
let bytes = serde_json::to_vec(&record).expect("bounded fixture encoding");
|
||||
assert_eq!(bytes.len(), size);
|
||||
let expected = replay_durable_dirty_usage_producer_record(&bytes);
|
||||
let buckets = dirty_usage_buckets_for_tests();
|
||||
let scopes = dirty_usage_bucket_scopes_for_tests();
|
||||
let identities = dirty_usage_producer_identities().clone();
|
||||
let coverage = DIRTY_USAGE_PRODUCER_COVERAGE.load(Ordering::Acquire);
|
||||
|
||||
clear_dirty_usage_buckets_for_tests();
|
||||
assert_eq!(record.replay(), expected, "canonical size {size}");
|
||||
assert_eq!(dirty_usage_buckets_for_tests(), buckets);
|
||||
assert_eq!(dirty_usage_bucket_scopes_for_tests(), scopes);
|
||||
assert_eq!(*dirty_usage_producer_identities(), identities);
|
||||
assert_eq!(DIRTY_USAGE_PRODUCER_COVERAGE.load(Ordering::Acquire), coverage);
|
||||
}
|
||||
clear_dirty_usage_buckets_for_tests();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn durable_dirty_usage_decoded_size_counts_escaped_utf8() {
|
||||
for repeats in [6000, 8000] {
|
||||
let mut record = decoded_replay_fixture();
|
||||
record.writer_epoch = "\"\n雪\\".repeat(repeats);
|
||||
let bytes = serde_json::to_vec(&record).expect("escaped fixture encoding");
|
||||
let expected = if bytes.len() > SCANNER_DURABLE_DIRTY_USAGE_REPLAY_MAX_BYTES {
|
||||
Err(ScannerDurableDirtyUsageReplayError::ByteLimit)
|
||||
} else {
|
||||
Ok(())
|
||||
};
|
||||
assert_eq!(check_durable_dirty_usage_replay_bytes(&record), expected);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[serial]
|
||||
fn durable_dirty_usage_decoded_replay_rejects_large_values_before_state_changes() {
|
||||
for field in ["epoch", "prefix", "entries"] {
|
||||
clear_dirty_usage_buckets_for_tests();
|
||||
let before = scanner_dirty_usage_state();
|
||||
let mut record = decoded_replay_fixture();
|
||||
match field {
|
||||
"epoch" => record.writer_epoch = "x".repeat(1024 * 1024),
|
||||
"prefix" => {
|
||||
record.entries[0].scope = ScannerDurableDirtyUsageReplayScope::TopLevelEntries {
|
||||
entries: BTreeSet::from(["x".repeat(1024 * 1024)]),
|
||||
};
|
||||
}
|
||||
_ => record.entries = vec![record.entries[0].clone(); SCANNER_DURABLE_DIRTY_USAGE_REPLAY_MAX_BYTES + 1],
|
||||
}
|
||||
assert_eq!(record.replay(), Err(ScannerDurableDirtyUsageReplayError::ByteLimit), "{field}");
|
||||
assert_eq!(scanner_dirty_usage_state(), before);
|
||||
assert!(dirty_usage_buckets_for_tests().is_empty());
|
||||
assert!(dirty_usage_bucket_scopes_for_tests().is_empty());
|
||||
assert!(dirty_usage_producer_identities().is_empty());
|
||||
assert_eq!(DIRTY_USAGE_PRODUCER_COVERAGE.load(Ordering::Acquire), 0);
|
||||
}
|
||||
clear_dirty_usage_buckets_for_tests();
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[serial]
|
||||
fn durable_dirty_usage_decoded_replay_preserves_generation_exhaustion() {
|
||||
clear_dirty_usage_buckets_for_tests();
|
||||
let generation = DIRTY_USAGE_BUCKET_GENERATION.swap(u64::MAX, Ordering::AcqRel);
|
||||
let result = decoded_replay_fixture().replay();
|
||||
DIRTY_USAGE_BUCKET_GENERATION.store(generation, Ordering::Release);
|
||||
assert_eq!(result, Err(ScannerDurableDirtyUsageReplayError::InvalidGeneration));
|
||||
assert!(dirty_usage_buckets_for_tests().is_empty());
|
||||
assert!(dirty_usage_bucket_scopes_for_tests().is_empty());
|
||||
assert!(dirty_usage_producer_identities().is_empty());
|
||||
assert_eq!(DIRTY_USAGE_PRODUCER_COVERAGE.load(Ordering::Acquire), 0);
|
||||
clear_dirty_usage_buckets_for_tests();
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[serial]
|
||||
fn durable_dirty_usage_replay_rejects_invalid_records_without_partial_state() {
|
||||
@@ -1017,17 +843,9 @@ mod scoped_dirty_usage_tests {
|
||||
|
||||
for (bytes, expected_error) in invalid_cases {
|
||||
clear_dirty_usage_buckets_for_tests();
|
||||
let before = scanner_dirty_usage_state();
|
||||
assert_eq!(replay_durable_dirty_usage_producer_record(&bytes), Err(expected_error.clone()));
|
||||
assert_eq!(replay_durable_dirty_usage_producer_record(&bytes), Err(expected_error));
|
||||
assert!(dirty_usage_buckets_for_tests().is_empty());
|
||||
assert!(dirty_usage_bucket_scopes_for_tests().is_empty());
|
||||
let record: ScannerDurableDirtyUsageReplayRecord = serde_json::from_slice(&bytes).expect("typed invalid record");
|
||||
assert_eq!(record.replay(), Err(expected_error));
|
||||
assert_eq!(scanner_dirty_usage_state(), before);
|
||||
assert!(dirty_usage_buckets_for_tests().is_empty());
|
||||
assert!(dirty_usage_bucket_scopes_for_tests().is_empty());
|
||||
assert!(dirty_usage_producer_identities().is_empty());
|
||||
assert_eq!(DIRTY_USAGE_PRODUCER_COVERAGE.load(Ordering::Acquire), 0);
|
||||
}
|
||||
|
||||
clear_dirty_usage_buckets_for_tests();
|
||||
|
||||
@@ -1090,7 +1090,7 @@ impl ScannerIOCache for SetDisks {
|
||||
|
||||
// Lock order: scanner leader fence -> set-scoped per-bucket cache lock ->
|
||||
// cache object read/write.
|
||||
let mut cache_guard = match acquire_scanner_cache_locks(store_clone_clone.as_ref(), &cache_name, source).await {
|
||||
let cache_guard = match acquire_scanner_cache_locks(store_clone_clone.as_ref(), &cache_name, source).await {
|
||||
Ok(guard) => guard,
|
||||
Err(e) => {
|
||||
if e.is_contention() {
|
||||
@@ -1320,10 +1320,9 @@ impl ScannerIOCache for SetDisks {
|
||||
);
|
||||
|
||||
let (checkpoint_tx, mut checkpoint_rx) = mpsc::channel::<DataUsageCache>(1);
|
||||
let (node_tx, mut node_rx) = crate::workload_admission::scanner_node_request_channel();
|
||||
|
||||
let scan_ctx = ctx_clone.child_token();
|
||||
let scan = crate::workload_admission::with_scanner_node_requests(node_tx, disk.clone().nsscanner_disk(
|
||||
let scan = disk.clone().nsscanner_disk(
|
||||
scan_ctx.clone(),
|
||||
budget_clone.clone(),
|
||||
set_disk_inventory_clone.as_ref().clone(),
|
||||
@@ -1334,7 +1333,7 @@ impl ScannerIOCache for SetDisks {
|
||||
prefix_scan_scope,
|
||||
checkpoint_tx: Some(checkpoint_tx),
|
||||
},
|
||||
));
|
||||
);
|
||||
tokio::pin!(scan);
|
||||
let mut lock_watch = tokio::time::interval(SCANNER_CACHE_LOCK_POLL_INTERVAL);
|
||||
lock_watch.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay);
|
||||
@@ -1342,24 +1341,6 @@ impl ScannerIOCache for SetDisks {
|
||||
let scan_result = loop {
|
||||
tokio::select! {
|
||||
result = &mut scan => break result,
|
||||
request = async {
|
||||
match node_rx.as_mut() {
|
||||
Some(receiver) => receiver.recv().await,
|
||||
None => std::future::pending().await,
|
||||
}
|
||||
} => {
|
||||
let Some(request) = request else {
|
||||
node_rx = None;
|
||||
continue;
|
||||
};
|
||||
if let Err(error) = cache_guard.resume_node_operation(
|
||||
store_clone_clone.clone(), &cache_name, source, &revisions, request,
|
||||
).await {
|
||||
scan_ctx.cancel();
|
||||
await_scanner_disk_shutdown(scan.as_mut()).await;
|
||||
break Err(error);
|
||||
}
|
||||
}
|
||||
_ = lock_watch.tick() => {
|
||||
if cache_guard.is_lock_lost() {
|
||||
scan_ctx.cancel();
|
||||
|
||||
@@ -38,13 +38,6 @@ pub(super) fn tier_stats_template(tier_names: &[String]) -> HashMap<String, Tier
|
||||
tier_stats
|
||||
}
|
||||
|
||||
fn ensure_scanner_node_operation_active(cancellation: Option<&CancellationToken>) -> Result<()> {
|
||||
if cancellation.is_some_and(CancellationToken::is_cancelled) {
|
||||
return Err(StorageError::other("Scanner operation cancelled"));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl ScannerIODisk for Disk {
|
||||
async fn get_size(&self, item: ScannerItem) -> Result<SizeSummary> {
|
||||
@@ -52,18 +45,14 @@ impl ScannerIODisk for Disk {
|
||||
}
|
||||
|
||||
async fn get_size_with_tier_names(&self, mut item: ScannerItem, tier_names: &[String]) -> Result<SizeSummary> {
|
||||
let cancellation = crate::workload_admission::scanner_node_operation_cancellation();
|
||||
let done_object = Metrics::time(Metric::ScanObject);
|
||||
|
||||
if !is_xl_meta_path(&item.path) {
|
||||
return Err(StorageError::other(SCANNER_SKIP_FILE_ERROR.to_string()));
|
||||
}
|
||||
|
||||
ensure_scanner_node_operation_active(cancellation.as_ref())?;
|
||||
let metadata_object_path = item.object_path();
|
||||
let metadata_result = self.read_metadata(&item.bucket, &metadata_object_path).await;
|
||||
ensure_scanner_node_operation_active(cancellation.as_ref())?;
|
||||
let data = match metadata_result {
|
||||
let data = match self.read_metadata(&item.bucket, &metadata_object_path).await {
|
||||
Ok(data) => data,
|
||||
Err(e) if DiskError::is_err_object_not_found(&e) || DiskError::is_err_version_not_found(&e) => {
|
||||
return Err(StorageError::other(SCANNER_SKIP_FILE_ERROR.to_string()));
|
||||
@@ -97,10 +86,7 @@ impl ScannerIODisk for Disk {
|
||||
// (which used to query it a second time). On failure keep the
|
||||
// historical fallback: default configuration (versioned = false) plus
|
||||
// the warn that `apply_actions` used to emit.
|
||||
ensure_scanner_node_operation_active(cancellation.as_ref())?;
|
||||
let versioning_result = BucketVersioningSys::get(&item.bucket).await;
|
||||
ensure_scanner_node_operation_active(cancellation.as_ref())?;
|
||||
let versioning_config = match versioning_result {
|
||||
let versioning_config = match BucketVersioningSys::get(&item.bucket).await {
|
||||
Ok(versioning_config) => versioning_config,
|
||||
Err(_) => {
|
||||
warn!(
|
||||
@@ -136,9 +122,7 @@ impl ScannerIODisk for Disk {
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
ensure_scanner_node_operation_active(cancellation.as_ref())?;
|
||||
let lock_config = object_lock_config_for_scanner_item(&item).await;
|
||||
ensure_scanner_node_operation_active(cancellation.as_ref())?;
|
||||
|
||||
// Count every version this object contributes to the scan, independent
|
||||
// of any lifecycle configuration, so scan-coverage metrics stay honest
|
||||
@@ -146,33 +130,17 @@ impl ScannerIODisk for Disk {
|
||||
// `object_infos`.
|
||||
global_metrics().record_scanner_versions_scanned(object_infos.len() as u64);
|
||||
|
||||
#[cfg(test)]
|
||||
let _ = crate::scanner_folder::observe_test_size_dispatch_boundary("apply_actions");
|
||||
item.apply_actions_cancellable(
|
||||
object_infos,
|
||||
lock_config,
|
||||
versioning_config,
|
||||
tier_names,
|
||||
&mut size_summary,
|
||||
cancellation.as_ref(),
|
||||
)
|
||||
.await;
|
||||
ensure_scanner_node_operation_active(cancellation.as_ref())?;
|
||||
item.apply_actions(object_infos, lock_config, versioning_config, tier_names, &mut size_summary)
|
||||
.await;
|
||||
|
||||
if !free_version_infos.is_empty() {
|
||||
for oi in free_version_infos {
|
||||
ensure_scanner_node_operation_active(cancellation.as_ref())?;
|
||||
if ScannerItem::tier_is_known(&oi, tier_names) {
|
||||
#[cfg(test)]
|
||||
if crate::scanner_folder::observe_test_size_dispatch_boundary("free_version_dispatch") {
|
||||
continue;
|
||||
}
|
||||
enqueue_runtime_free_version(oi, cancellation.as_ref()).await;
|
||||
enqueue_runtime_free_version(oi).await;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ensure_scanner_node_operation_active(cancellation.as_ref())?;
|
||||
done_object();
|
||||
|
||||
Ok(size_summary)
|
||||
|
||||
@@ -996,73 +996,6 @@ fn completed_data_usage_info_adds_same_bucket_across_unique_sets() {
|
||||
assert_eq!(bucket.delete_markers_count, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn bucket_usage_incarnation_is_optional_and_old_readers_ignore_it() {
|
||||
#[derive(serde::Deserialize)]
|
||||
struct LegacyBucketUsage {
|
||||
size: u64,
|
||||
}
|
||||
let legacy = BucketUsageInfo {
|
||||
size: 42,
|
||||
..Default::default()
|
||||
};
|
||||
let without = serde_json::to_value(&legacy).expect("encode legacy usage");
|
||||
assert!(without.get("bucket_incarnation").is_none());
|
||||
let restored: BucketUsageInfo = serde_json::from_value(without).expect("decode old usage");
|
||||
assert_eq!(restored.bucket_incarnation, None);
|
||||
let certified = BucketUsageInfo {
|
||||
size: 42,
|
||||
bucket_incarnation: Some(uuid::Uuid::from_u128(7).to_string()),
|
||||
..Default::default()
|
||||
};
|
||||
let encoded = serde_json::to_vec(&certified).expect("encode certified usage");
|
||||
let old: LegacyBucketUsage = serde_json::from_slice(&encoded).expect("old schema ignores additive field");
|
||||
assert_eq!(old.size, 42);
|
||||
let named = rmp_serde::to_vec_named(&certified).expect("encode certified named msgpack");
|
||||
let old: LegacyBucketUsage = rmp_serde::from_slice(&named).expect("old named reader ignores additive field");
|
||||
assert_eq!(old.size, 42);
|
||||
let old_bytes = rmp_serde::to_vec_named(&legacy).expect("encode old shape");
|
||||
let new: BucketUsageInfo = rmp_serde::from_slice(&old_bytes).expect("new reader accepts old shape");
|
||||
assert_eq!(new.bucket_incarnation, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn completed_usage_certifies_only_matching_non_nil_bucket_incarnations() {
|
||||
let buckets = vec!["bucket".to_string()];
|
||||
let id = uuid::Uuid::from_u128(7);
|
||||
let mut a = completed_root_cache("bucket", 2, 10, DataUsageCacheSource::new(0, 0));
|
||||
let mut b = completed_root_cache("bucket", 3, 20, DataUsageCacheSource::new(1, 0));
|
||||
a.info.scan_bucket_incarnations.insert("bucket".to_string(), id);
|
||||
b.info.scan_bucket_incarnations.insert("bucket".to_string(), id);
|
||||
let published = completed_data_usage_info_for_test(&[a.clone(), b.clone()], &buckets, false, false)
|
||||
.unwrap()
|
||||
.0;
|
||||
assert_eq!(
|
||||
published.buckets_usage["bucket"].bucket_incarnation.as_deref(),
|
||||
Some(id.to_string().as_str())
|
||||
);
|
||||
let encoded = serde_json::to_vec(&published).expect("serialize certified usage");
|
||||
let decoded: DataUsageInfo = serde_json::from_slice(&encoded).expect("read certified usage");
|
||||
assert_eq!(decoded.buckets_usage["bucket"].bucket_incarnation, Some(id.to_string()));
|
||||
b.info
|
||||
.scan_bucket_incarnations
|
||||
.insert("bucket".to_string(), uuid::Uuid::from_u128(8));
|
||||
let mismatch = completed_data_usage_info_for_test(&[a.clone(), b.clone()], &buckets, false, false)
|
||||
.unwrap()
|
||||
.0;
|
||||
assert_eq!(mismatch.buckets_usage["bucket"].bucket_incarnation, None);
|
||||
b.info.scan_bucket_incarnations.remove("bucket");
|
||||
let missing = completed_data_usage_info_for_test(&[a.clone(), b.clone()], &buckets, false, false)
|
||||
.unwrap()
|
||||
.0;
|
||||
assert_eq!(missing.buckets_usage["bucket"].bucket_incarnation, None);
|
||||
b.info
|
||||
.scan_bucket_incarnations
|
||||
.insert("bucket".to_string(), uuid::Uuid::nil());
|
||||
let nil = completed_data_usage_info_for_test(&[a, b], &buckets, false, false).unwrap().0;
|
||||
assert_eq!(nil.buckets_usage["bucket"].bucket_incarnation, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn checked_bucket_usage_info_moves_replication_keys_and_preserves_the_snapshot() {
|
||||
let first_target = "arn:rustfs:replication:local::target-a".to_string();
|
||||
@@ -1124,7 +1057,6 @@ fn checked_bucket_usage_info_moves_replication_keys_and_preserves_the_snapshot()
|
||||
}
|
||||
let expected = BucketUsageInfo {
|
||||
size: 32768,
|
||||
bucket_incarnation: None,
|
||||
replication_pending_size_v1: 0,
|
||||
replication_failed_size_v1: 0,
|
||||
replicated_size_v1: 0,
|
||||
|
||||
@@ -46,9 +46,7 @@ use uuid::Uuid;
|
||||
|
||||
mod checkpoint_coverage_identity;
|
||||
mod collector_lifecycle;
|
||||
mod expiry_lock;
|
||||
mod listing_window_scope;
|
||||
mod node_admission;
|
||||
mod partial_bucket_carry;
|
||||
mod per_bucket_certification;
|
||||
mod scoped_entry_fallback;
|
||||
|
||||
@@ -1,183 +0,0 @@
|
||||
// Copyright 2024 RustFS Team
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
use super::*;
|
||||
use crate::storage_api::owner::EcstoreExpiryState;
|
||||
use std::future::Future;
|
||||
use std::pin::Pin;
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
use std::task::Poll;
|
||||
use std::time::Duration;
|
||||
|
||||
// Return Some(result) if the operation ended too early, None only if it was
|
||||
// actually polled pending after the prerequisite read had finished.
|
||||
async fn observe_queued<F: Future>(
|
||||
mut operation: Pin<&mut F>,
|
||||
read_complete: impl Fn() -> bool,
|
||||
observation: Duration,
|
||||
) -> std::result::Result<Option<F::Output>, tokio::time::error::Elapsed> {
|
||||
tokio::time::timeout(
|
||||
observation,
|
||||
std::future::poll_fn(|cx| match operation.as_mut().poll(cx) {
|
||||
Poll::Ready(value) => Poll::Ready(Some(value)),
|
||||
Poll::Pending if read_complete() => Poll::Ready(None),
|
||||
Poll::Pending => Poll::Pending,
|
||||
}),
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn free_version_cancelled_while_waiting_for_expiry_write_lock_never_queues() {
|
||||
let state = EcstoreExpiryState::new_with_unconsumed_worker_channel(4);
|
||||
let observation = Duration::from_secs(rustfs_config::DEFAULT_DRIVE_METADATA_TIMEOUT_SECS);
|
||||
let context = crate::ExpiryLockTestContext {
|
||||
state: state.clone(),
|
||||
store: None,
|
||||
completed_incarnation_reads: Arc::new(AtomicUsize::new(0)),
|
||||
};
|
||||
crate::EXPIRY_LOCK_TEST_CONTEXT
|
||||
.scope(context, async {
|
||||
let object = crate::ScannerObjectInfo {
|
||||
bucket: "expiry-lock-bucket".to_string(),
|
||||
name: "free-object".to_string(),
|
||||
..Default::default()
|
||||
};
|
||||
let cancellation = CancellationToken::new();
|
||||
let guard = state.write().await;
|
||||
let mut pending = Box::pin(crate::enqueue_runtime_free_version(object.clone(), Some(&cancellation)));
|
||||
let first = observe_queued(pending.as_mut(), || true, observation).await;
|
||||
let observed_wait = matches!(&first, Ok(None));
|
||||
let already_finished = matches!(&first, Ok(Some(())));
|
||||
cancellation.cancel();
|
||||
let cancelled_while_locked = if already_finished {
|
||||
false
|
||||
} else {
|
||||
tokio::time::timeout(observation, pending.as_mut()).await.is_ok()
|
||||
};
|
||||
let pending_while_locked = guard.pending_tasks();
|
||||
drop(guard);
|
||||
if !already_finished && !cancelled_while_locked {
|
||||
pending.as_mut().await;
|
||||
}
|
||||
drop(pending);
|
||||
let pending_after_cancel = state.read().await.pending_tasks();
|
||||
|
||||
// Positive control queues a real free-version task while using the same
|
||||
// implementation and isolated, unconsumed worker channel.
|
||||
let mut positive = Box::pin(crate::enqueue_runtime_free_version(object, None));
|
||||
let positive_in_time = tokio::time::timeout(observation, positive.as_mut()).await.is_ok();
|
||||
if !positive_in_time {
|
||||
positive.as_mut().await;
|
||||
}
|
||||
drop(positive);
|
||||
let pending_after_control = state.read().await.pending_tasks();
|
||||
assert!(observed_wait, "must poll the real enqueue while the write lock is held");
|
||||
assert!(cancelled_while_locked, "cancellation must finish before the lock is released");
|
||||
assert_eq!(pending_while_locked, 0);
|
||||
assert_eq!(pending_after_cancel, 0);
|
||||
assert!(positive_in_time, "positive control must finish within the observation limit");
|
||||
assert_eq!(pending_after_control, 1, "positive control must queue a task");
|
||||
})
|
||||
.await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn newer_noncurrent_cancelled_after_real_read_while_waiting_for_expiry_write_lock_never_queues() {
|
||||
let (_temp_dir, store) = setup_local_scanner_store(1, 4).await;
|
||||
let bucket = "expiry-lock-bucket";
|
||||
store
|
||||
.make_bucket(bucket, &MakeBucketOptions::default())
|
||||
.await
|
||||
.expect("create bucket");
|
||||
let expected_incarnation = store.bucket_incarnation_id(bucket).await.expect("real incarnation metadata");
|
||||
assert!(!expected_incarnation.is_nil());
|
||||
let state = EcstoreExpiryState::new_with_unconsumed_worker_channel(4);
|
||||
let reads = Arc::new(AtomicUsize::new(0));
|
||||
let context = crate::ExpiryLockTestContext {
|
||||
state: state.clone(),
|
||||
store: Some(store.clone()),
|
||||
completed_incarnation_reads: reads.clone(),
|
||||
};
|
||||
let observation = Duration::from_secs(rustfs_config::DEFAULT_DRIVE_METADATA_TIMEOUT_SECS);
|
||||
crate::EXPIRY_LOCK_TEST_CONTEXT
|
||||
.scope(context, async {
|
||||
let versions = vec![crate::ScannerObjectToDelete {
|
||||
object_name: "noncurrent-object".to_string(),
|
||||
version_id: Some(Uuid::new_v4()),
|
||||
..Default::default()
|
||||
}];
|
||||
let event = crate::Event::default();
|
||||
let src = crate::LcEventSrc::Scanner;
|
||||
let cancellation = CancellationToken::new();
|
||||
let guard = state.write().await;
|
||||
let mut pending = Box::pin(crate::enqueue_runtime_newer_noncurrent(
|
||||
bucket,
|
||||
versions.clone(),
|
||||
event.clone(),
|
||||
&src,
|
||||
Some(&cancellation),
|
||||
));
|
||||
let first = observe_queued(pending.as_mut(), || reads.load(Ordering::SeqCst) == 1, observation).await;
|
||||
let observed_wait_after_read = matches!(&first, Ok(None));
|
||||
let mut result = match first {
|
||||
Ok(Some(value)) => Some(value),
|
||||
_ => None,
|
||||
};
|
||||
cancellation.cancel();
|
||||
let cancelled_while_locked = if result.is_some() {
|
||||
false
|
||||
} else {
|
||||
match tokio::time::timeout(observation, pending.as_mut()).await {
|
||||
Ok(value) => {
|
||||
result = Some(value);
|
||||
true
|
||||
}
|
||||
Err(_) => false,
|
||||
}
|
||||
};
|
||||
let pending_while_locked = guard.pending_tasks();
|
||||
drop(guard);
|
||||
let result = match result {
|
||||
Some(value) => value,
|
||||
None => pending.as_mut().await,
|
||||
};
|
||||
drop(pending);
|
||||
let pending_after_cancel = state.read().await.pending_tasks();
|
||||
let mut positive = Box::pin(crate::enqueue_runtime_newer_noncurrent(bucket, versions, event, &src, None));
|
||||
let bounded_positive = tokio::time::timeout(observation, positive.as_mut()).await;
|
||||
let positive_in_time = bounded_positive.is_ok();
|
||||
let positive_result = match bounded_positive {
|
||||
Ok(value) => value,
|
||||
Err(_) => positive.as_mut().await,
|
||||
};
|
||||
drop(positive);
|
||||
let pending_after_control = state.read().await.pending_tasks();
|
||||
assert!(
|
||||
observed_wait_after_read,
|
||||
"real incarnation read must finish before waiting on the held lock"
|
||||
);
|
||||
assert!(cancelled_while_locked, "cancellation must finish before the lock is released");
|
||||
assert!(!result);
|
||||
assert_eq!(pending_while_locked, 0);
|
||||
assert_eq!(pending_after_cancel, 0);
|
||||
assert!(positive_in_time, "positive control must finish within the observation limit");
|
||||
assert!(positive_result, "positive control must enqueue the nonempty version batch");
|
||||
assert_eq!(pending_after_control, 1);
|
||||
assert_eq!(reads.load(Ordering::SeqCst), 2);
|
||||
})
|
||||
.await;
|
||||
}
|
||||
@@ -1,136 +0,0 @@
|
||||
// Copyright 2026 RustFS Team
|
||||
// Licensed under the Apache License, Version 2.0.
|
||||
|
||||
use super::*;
|
||||
use crate::workload_admission::ScannerNodeRequest;
|
||||
use rustfs_concurrency::adaptive::{FeedbackController, FeedbackObservation, NodeAdmission, ResourcePressure};
|
||||
use std::num::NonZeroU16;
|
||||
use tokio::sync::oneshot;
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||
enum ResumeCase {
|
||||
Unchanged,
|
||||
Updated,
|
||||
Cancelled,
|
||||
}
|
||||
|
||||
async fn check_cache_lease_resume(case: ResumeCase) {
|
||||
let (_directory, store) = setup_local_scanner_store(1, 4).await;
|
||||
let set = store.pools[0].disk_set[0].clone();
|
||||
let source = DataUsageCacheSource::new(0, 0);
|
||||
let cache_name = "node-resume/.usage-cache.bin";
|
||||
let cache = DataUsageCache::default();
|
||||
cache.save(set.clone(), cache_name).await.expect("seed cache");
|
||||
let revisions = DataUsageCache::read_revisions(set.clone(), cache_name)
|
||||
.await
|
||||
.expect("initial revisions");
|
||||
let gate = NodeAdmission::new(NonZeroU16::new(1).expect("one shared unit"));
|
||||
gate.update(
|
||||
&mut FeedbackController::new(),
|
||||
Some(FeedbackObservation {
|
||||
generation: 1,
|
||||
max_concurrency: 1,
|
||||
pressure: ResourcePressure::Unknown,
|
||||
completed_units: None,
|
||||
}),
|
||||
);
|
||||
let mut held = Some(gate.acquire().await);
|
||||
let mut guard = acquire_scanner_cache_locks(set.as_ref(), cache_name, source)
|
||||
.await
|
||||
.expect("initial cache lease");
|
||||
let ctx = CancellationToken::new();
|
||||
let (respond, response) = oneshot::channel();
|
||||
let request = ScannerNodeRequest {
|
||||
owner: gate.clone(),
|
||||
respond,
|
||||
cancel: ctx.clone(),
|
||||
};
|
||||
let mut expected = revisions.clone();
|
||||
let result = {
|
||||
let resume = guard.resume_node_operation(set.clone(), cache_name, source, &revisions, request);
|
||||
tokio::pin!(resume);
|
||||
assert!(futures::poll!(&mut resume).is_pending(), "shared node is occupied");
|
||||
let other = tokio::time::timeout(Duration::from_secs(1), acquire_scanner_cache_locks(set.as_ref(), cache_name, source))
|
||||
.await
|
||||
.expect("cache lock must be released before joining the node queue")
|
||||
.expect("another cache worker can acquire the lease");
|
||||
if case == ResumeCase::Updated {
|
||||
let mut newer = cache;
|
||||
newer.info.next_cycle = 1;
|
||||
newer
|
||||
.save(set.clone(), cache_name)
|
||||
.await
|
||||
.expect("another worker updates the cache");
|
||||
expected = DataUsageCache::read_revisions(set.clone(), cache_name)
|
||||
.await
|
||||
.expect("new cache revisions");
|
||||
assert_ne!(expected, revisions);
|
||||
}
|
||||
drop(other);
|
||||
if case == ResumeCase::Cancelled {
|
||||
ctx.cancel();
|
||||
} else {
|
||||
held.take().expect("held node unit").complete();
|
||||
}
|
||||
tokio::time::timeout(Duration::from_secs(2), resume)
|
||||
.await
|
||||
.expect("node resumption must finish or observe cancellation")
|
||||
};
|
||||
if case == ResumeCase::Unchanged {
|
||||
result.expect("unchanged cache resumes the same walk");
|
||||
let permit = response.await.expect("coordinator returns the node permit");
|
||||
assert_eq!(gate.snapshot().active, 1);
|
||||
assert_eq!(gate.completed(), Some(1), "admitting scanner work must not count it as completed");
|
||||
assert!(!guard.is_lock_lost());
|
||||
let lock = set
|
||||
.new_ns_lock(RUSTFS_META_BUCKET, &scanner_cache_lock_resource(cache_name, source))
|
||||
.await
|
||||
.expect("competing cache lock");
|
||||
assert!(
|
||||
lock.get_write_lock_quiet(Duration::from_millis(20)).await.is_err(),
|
||||
"cache lease must be restored before the operation resumes"
|
||||
);
|
||||
permit.complete();
|
||||
} else {
|
||||
result.expect_err("cancelled or stale work cannot resume");
|
||||
assert!(response.await.is_err(), "failed resumption must not authorize storage work");
|
||||
if case == ResumeCase::Cancelled {
|
||||
assert!(guard.is_lock_lost());
|
||||
assert_eq!(gate.snapshot().active, 1, "the running heal keeps its unit");
|
||||
drop(held.take());
|
||||
assert_eq!(gate.completed(), Some(0));
|
||||
} else {
|
||||
assert_eq!(gate.completed(), Some(1));
|
||||
}
|
||||
}
|
||||
drop(guard);
|
||||
assert_eq!(gate.snapshot().active, 0);
|
||||
assert!(gate.try_acquire().is_some(), "dropped requests must leave no queue or capacity leak");
|
||||
assert_eq!(
|
||||
DataUsageCache::read_revisions(set.clone(), cache_name)
|
||||
.await
|
||||
.expect("final revisions"),
|
||||
expected
|
||||
);
|
||||
acquire_scanner_cache_locks(set.as_ref(), cache_name, source)
|
||||
.await
|
||||
.expect("final cache lease is available");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn scanner_node_wait_yields_cache_lease_before_fifo_admission() {
|
||||
check_cache_lease_resume(ResumeCase::Unchanged).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn scanner_node_wait_rejects_cache_changed_while_unlocked() {
|
||||
check_cache_lease_resume(ResumeCase::Updated).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn scanner_node_wait_cancellation_releases_queue_without_stealing_running_unit() {
|
||||
check_cache_lease_resume(ResumeCase::Cancelled).await;
|
||||
}
|
||||
@@ -22,8 +22,6 @@ use serde::{Deserialize, Serialize};
|
||||
use tokio::sync::Notify;
|
||||
|
||||
pub(crate) use rustfs_ecstore::with_background_disk_io as ecstore_with_background_disk_io;
|
||||
#[cfg(all(test, unix))]
|
||||
pub(crate) use rustfs_ecstore::with_background_resource_unit as ecstore_with_background_resource_unit;
|
||||
|
||||
pub(crate) use s3s::dto::{
|
||||
BucketLifecycleConfiguration as EcstoreBucketLifecycleConfiguration, LifecycleRuleFilter as EcstoreLifecycleRuleFilter,
|
||||
@@ -41,8 +39,6 @@ pub(crate) use rustfs_ecstore::api::data_usage::{NativeScannerPauseBacklogWriteF
|
||||
|
||||
pub(crate) use rustfs_ecstore::api::bucket::bucket_target_sys::BucketTargetSys as EcstoreBucketTargetSys;
|
||||
pub(crate) use rustfs_ecstore::api::bucket::lifecycle::bucket_lifecycle_audit::LcEventSrc as EcstoreLcEventSrc;
|
||||
#[cfg(test)]
|
||||
pub(crate) use rustfs_ecstore::api::bucket::lifecycle::bucket_lifecycle_ops::ExpiryState as EcstoreExpiryState;
|
||||
pub(crate) use rustfs_ecstore::api::bucket::lifecycle::bucket_lifecycle_ops::{
|
||||
apply_expiry_rule as ecstore_apply_expiry_rule, apply_transition_rule as ecstore_apply_transition_rule,
|
||||
lifecycle_version_delete_target as ecstore_lifecycle_version_delete_target,
|
||||
@@ -103,10 +99,6 @@ pub(crate) use rustfs_ecstore::api::disk::{
|
||||
pub(crate) use rustfs_ecstore::api::disk::{
|
||||
DiskOption as EcstoreDiskOption, DiskStore as EcstoreDiskStore, new_disk as ecstore_new_disk,
|
||||
};
|
||||
#[cfg(all(test, unix))]
|
||||
pub(crate) use rustfs_ecstore::api::disk::{
|
||||
LocalPublicationPause as EcstoreLocalPublicationPause, LocalPublicationStage as EcstoreLocalPublicationStage,
|
||||
};
|
||||
pub(crate) use rustfs_ecstore::api::error::{
|
||||
Error as EcstoreErrorType, Result as EcstoreResultType, StorageError as EcstoreStorageError,
|
||||
};
|
||||
@@ -169,17 +161,10 @@ pub(crate) mod ecstore_diagnostic {
|
||||
pub(crate) type EcstoreHealResultItem = <EcstoreStore as storage_contracts::HealOperations>::HealResultItem;
|
||||
|
||||
pub(crate) mod owner {
|
||||
#[cfg(test)]
|
||||
pub(crate) use super::EcstoreExpiryState;
|
||||
#[cfg(test)]
|
||||
pub(crate) use super::ecstore_set_object_store_resolver;
|
||||
#[cfg(test)]
|
||||
pub(crate) use super::storage_contracts::DiskSetSelector;
|
||||
#[cfg(all(test, unix))]
|
||||
pub(crate) use super::{
|
||||
EcstoreLocalPublicationPause, EcstoreLocalPublicationStage, ecstore_with_background_disk_io,
|
||||
ecstore_with_background_resource_unit,
|
||||
};
|
||||
pub(crate) use super::{
|
||||
MAX_SCANNER_PAUSE_BACKLOG_BYTES, ScannerPauseBacklogRetirementError, ScannerPauseBacklogRetirementPlan,
|
||||
ScannerPauseBacklogRetirementReplica, register_scanner_pause_backlog_retirement_planner,
|
||||
|
||||
@@ -12,143 +12,9 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::{Arc, LazyLock, OnceLock, RwLock};
|
||||
use std::sync::{Arc, LazyLock, RwLock};
|
||||
|
||||
use rustfs_concurrency::adaptive::{NodeAdmission, NodePermit};
|
||||
use rustfs_concurrency::{AdmissionState, WorkloadAdmissionRegistrySnapshot, WorkloadAdmissionSnapshotProvider, WorkloadClass};
|
||||
use tokio::sync::{mpsc, oneshot};
|
||||
use tokio_util::sync::CancellationToken;
|
||||
|
||||
use crate::ScannerError;
|
||||
|
||||
static SCANNER_NODE_ADMISSION: OnceLock<Arc<NodeAdmission>> = OnceLock::new();
|
||||
|
||||
tokio::task_local! {
|
||||
static SCANNER_NODE_REQUESTS: ScannerNodeRequestSender;
|
||||
static SCANNER_NODE_OPERATION_CANCEL: CancellationToken;
|
||||
}
|
||||
|
||||
/// Cancellation for the currently admitted scanner operation, when present.
|
||||
pub(crate) fn scanner_node_operation_cancellation() -> Option<CancellationToken> {
|
||||
SCANNER_NODE_OPERATION_CANCEL.try_with(Clone::clone).ok()
|
||||
}
|
||||
|
||||
pub(crate) struct ScannerNodeRequest {
|
||||
pub(crate) owner: Arc<NodeAdmission>,
|
||||
pub(crate) respond: oneshot::Sender<NodePermit>,
|
||||
pub(crate) cancel: CancellationToken,
|
||||
}
|
||||
|
||||
pub(crate) type ScannerNodeRequestSender = mpsc::Sender<ScannerNodeRequest>;
|
||||
pub(crate) type ScannerNodeRequestReceiver = mpsc::Receiver<ScannerNodeRequest>;
|
||||
|
||||
/// One suspended operation per walk; disabled admission allocates no channel.
|
||||
pub(crate) fn scanner_node_request_channel() -> (Option<ScannerNodeRequestSender>, Option<ScannerNodeRequestReceiver>) {
|
||||
if scanner_node_admission().is_none() {
|
||||
return (None, None);
|
||||
}
|
||||
let (sender, receiver) = mpsc::channel(1);
|
||||
(Some(sender), Some(receiver))
|
||||
}
|
||||
|
||||
pub(crate) async fn with_scanner_node_requests<F: std::future::Future>(
|
||||
sender: Option<ScannerNodeRequestSender>,
|
||||
operation: F,
|
||||
) -> F::Output {
|
||||
match sender {
|
||||
Some(sender) => SCANNER_NODE_REQUESTS.scope(sender, operation).await,
|
||||
None => operation.await,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
tokio::task_local! {
|
||||
pub(crate) static TEST_SCANNER_NODE_ADMISSION: Arc<NodeAdmission>;
|
||||
pub(crate) static TEST_SCANNER_AFTER_NODE_ACQUIRE: Arc<dyn Fn() + Send + Sync>;
|
||||
}
|
||||
|
||||
/// Install the heal manager's node owner before starting scanner workers.
|
||||
/// Refuse replacement: existing scans must not outlive an independently renewed owner.
|
||||
pub fn set_scanner_node_admission(owner: Arc<NodeAdmission>) -> bool {
|
||||
SCANNER_NODE_ADMISSION.set(owner).is_ok()
|
||||
}
|
||||
|
||||
pub(crate) fn scanner_node_admission() -> Option<Arc<NodeAdmission>> {
|
||||
#[cfg(test)]
|
||||
if let Ok(owner) = TEST_SCANNER_NODE_ADMISSION.try_with(Arc::clone) {
|
||||
return Some(owner);
|
||||
}
|
||||
SCANNER_NODE_ADMISSION.get().cloned()
|
||||
}
|
||||
|
||||
/// Try the fast path first. A scoped coordinator releases the cache lease before
|
||||
/// joining the node queue and validates the cache before returning a permit.
|
||||
/// Uncoordinated callers defer instead of parking under an unknown lock.
|
||||
pub(crate) async fn run_scanner_node_operation<T, E>(
|
||||
owner: Option<&Arc<NodeAdmission>>,
|
||||
cancel: &CancellationToken,
|
||||
operation: impl std::future::Future<Output = Result<T, E>>,
|
||||
) -> Result<Result<T, E>, ScannerError> {
|
||||
let Some(owner) = owner else {
|
||||
return Ok(operation.await);
|
||||
};
|
||||
let operation = SCANNER_NODE_OPERATION_CANCEL.scope(cancel.clone(), operation);
|
||||
if cancel.is_cancelled() {
|
||||
return Err(ScannerError::Other("Operation cancelled".to_string()));
|
||||
}
|
||||
let permit = match owner.try_acquire() {
|
||||
Some(permit) => permit,
|
||||
None => {
|
||||
let sender = SCANNER_NODE_REQUESTS
|
||||
.try_with(Clone::clone)
|
||||
.map_err(|_| ScannerError::ResourceDeferred)?;
|
||||
let acquire = async {
|
||||
let (respond, response) = oneshot::channel();
|
||||
sender
|
||||
.send(ScannerNodeRequest {
|
||||
owner: owner.clone(),
|
||||
respond,
|
||||
cancel: cancel.clone(),
|
||||
})
|
||||
.await
|
||||
.map_err(|_| ScannerError::ResourceDeferred)?;
|
||||
response.await.map_err(|_| ScannerError::ResourceDeferred)
|
||||
};
|
||||
tokio::select! {
|
||||
biased;
|
||||
_ = cancel.cancelled() => return Err(ScannerError::Other("Operation cancelled".to_string())),
|
||||
permit = acquire => permit?,
|
||||
}
|
||||
}
|
||||
};
|
||||
#[cfg(test)]
|
||||
let _ = TEST_SCANNER_AFTER_NODE_ACQUIRE.try_with(|hook| hook());
|
||||
let operation_started = AtomicBool::new(false);
|
||||
tokio::pin!(operation);
|
||||
let observed = std::future::poll_fn(|context| {
|
||||
operation_started.store(true, Ordering::Relaxed);
|
||||
std::future::Future::poll(operation.as_mut(), context)
|
||||
});
|
||||
tokio::pin!(observed);
|
||||
let result = tokio::select! {
|
||||
biased;
|
||||
_ = cancel.cancelled() => {
|
||||
// The node slot belongs to the waiter, not the native operation.
|
||||
drop(permit);
|
||||
if !operation_started.load(Ordering::Relaxed) {
|
||||
return Err(ScannerError::Other("Operation cancelled".to_string()));
|
||||
}
|
||||
// Keep polling the started operation under its existing locks.
|
||||
return Ok(observed.await);
|
||||
}
|
||||
result = &mut observed => result,
|
||||
};
|
||||
if result.is_ok() && !cancel.is_cancelled() {
|
||||
permit.complete();
|
||||
}
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
type WorkloadSnapshotProviderRef = Arc<dyn WorkloadAdmissionSnapshotProvider + Send + Sync>;
|
||||
|
||||
|
||||
@@ -1471,7 +1471,6 @@ mod tests {
|
||||
inner: QueueStore<QueuedPayload>,
|
||||
fail_put_failed_raw: Arc<std::sync::atomic::AtomicBool>,
|
||||
fail_del: Arc<std::sync::atomic::AtomicBool>,
|
||||
delete_attempts: Arc<Semaphore>,
|
||||
}
|
||||
|
||||
impl Store<QueuedPayload> for FailingFailedStore {
|
||||
@@ -1500,13 +1499,10 @@ mod tests {
|
||||
self.inner.get_raw(key)
|
||||
}
|
||||
fn del(&self, key: &Self::Key) -> Result<(), Self::Error> {
|
||||
let result = if self.fail_del.load(Ordering::SeqCst) {
|
||||
Err(StoreError::Internal("injected del failure".to_string()))
|
||||
} else {
|
||||
self.inner.del(key)
|
||||
};
|
||||
self.delete_attempts.add_permits(1);
|
||||
result
|
||||
if self.fail_del.load(Ordering::SeqCst) {
|
||||
return Err(StoreError::Internal("injected del failure".to_string()));
|
||||
}
|
||||
self.inner.del(key)
|
||||
}
|
||||
fn delete(&self) -> Result<(), Self::Error> {
|
||||
self.inner.delete()
|
||||
@@ -1990,7 +1986,6 @@ mod tests {
|
||||
inner: inner.clone(),
|
||||
fail_put_failed_raw: fail_flag.clone(),
|
||||
fail_del: Arc::new(std::sync::atomic::AtomicBool::new(false)),
|
||||
delete_attempts: Arc::new(Semaphore::new(0)),
|
||||
};
|
||||
// The target's terminal move writes through the rejecting failed handle, so the injected
|
||||
// failure is what the move hits.
|
||||
@@ -2047,7 +2042,6 @@ mod tests {
|
||||
inner: inner.clone(),
|
||||
fail_put_failed_raw: Arc::new(std::sync::atomic::AtomicBool::new(false)),
|
||||
fail_del: Arc::new(std::sync::atomic::AtomicBool::new(true)),
|
||||
delete_attempts: Arc::new(Semaphore::new(0)),
|
||||
};
|
||||
let target = Arc::new(ProgrammedTarget::new(
|
||||
Some(TargetError::JetStreamPublish {
|
||||
@@ -2059,15 +2053,8 @@ mod tests {
|
||||
let tally = Arc::new(ReplayTally::default());
|
||||
let (cancel_tx, worker) = spawn_failing_store_worker(&store, target, tally.clone());
|
||||
|
||||
// Observe repeated durable overwrites without auto-advancing through thousands of
|
||||
// real filesystem writes. Keep the original virtual observation bound on progress.
|
||||
tokio::time::timeout(Duration::from_secs(300), store.delete_attempts.acquire_many(8))
|
||||
.await
|
||||
.expect("replay should retry the failing delete eight times")
|
||||
.expect("delete progress remains open")
|
||||
.forget();
|
||||
cancel_tx.send(()).await.expect("replay worker should remain cancellable");
|
||||
worker.await.expect("replay worker should drain after cancellation");
|
||||
// Many scans run while the live delete keeps failing.
|
||||
tokio::time::sleep(Duration::from_secs(300)).await;
|
||||
assert_eq!(
|
||||
tally.permanent_failure.load(Ordering::SeqCst),
|
||||
0,
|
||||
@@ -2076,6 +2063,8 @@ mod tests {
|
||||
assert_eq!(inner.len(), 1, "the live entry stays for the next scan");
|
||||
assert_eq!(inner.failed_len(), 1, "the durable failed copy landed exactly once");
|
||||
|
||||
let _ = cancel_tx.send(()).await;
|
||||
let _ = worker.await;
|
||||
let _ = inner.delete();
|
||||
}
|
||||
|
||||
@@ -2095,7 +2084,6 @@ mod tests {
|
||||
inner: store.clone(),
|
||||
fail_put_failed_raw: Arc::new(std::sync::atomic::AtomicBool::new(false)),
|
||||
fail_del: Arc::new(std::sync::atomic::AtomicBool::new(false)),
|
||||
delete_attempts: Arc::new(Semaphore::new(0)),
|
||||
};
|
||||
let target = Arc::new(ProgrammedTarget::new(
|
||||
Some(TargetError::JetStreamPublish {
|
||||
|
||||
@@ -50,7 +50,6 @@ Required headings and strings in these files are asserted by `scripts/check_arch
|
||||
| [scanner-usage-authority-decision.md](scanner-usage-authority-decision.md) | deciding whether quota admission depends on scanner data usage, removing scanner publication layers, or designing a scanner storage boundary |
|
||||
| [scanner-per-bucket-convergence.md](scanner-per-bucket-convergence.md) | changing what makes a scanner cycle `Complete`, `Superseded`, or converged, adding or re-classifying a dirty-usage producer, deciding whether a background writeback may invalidate a cycle, changing scanner worker concurrency or throttling, or activating scoped dirty acknowledgements |
|
||||
| [config-model-boundary-adr.md](config-model-boundary-adr.md) | touching the server-config model (`Config`, `KV`, `KVS`) or its persistence, or asking which crate owns which part of server configuration |
|
||||
| [plugin-delegation.md](plugin-delegation.md) | changing original-user plugin delegation, attempt credentials, or Runner task APIs |
|
||||
| [admin-route-action-snapshot.md](admin-route-action-snapshot.md) | adding, moving, or re-authorizing an admin route and needing to know where the route → handler → `AdminAction` contract is enforced |
|
||||
| [kms-bulk-rekey-contract.md](kms-bulk-rekey-contract.md) | changing the bulk envelope re-wrap sweep, its admin endpoints, the re-wrap primitive, or which objects a rekey may touch |
|
||||
| [remote-credential-sealing-adr.md](remote-credential-sealing-adr.md) | adding, reading, or persisting a stored remote credential (replication target, remote tier, on-demand migration source), or needing the sealed-envelope format, the mixed-version rules, or the reason this is worth doing in one deployment and not in another |
|
||||
|
||||
@@ -1,142 +0,0 @@
|
||||
# Plugin delegation
|
||||
|
||||
**Use this when:** changing plugin delegation registration, revocation, broker identity, or the scope of attempt credentials.
|
||||
|
||||
## Integration boundary
|
||||
|
||||
Runner owns scheduling, leases, container execution and result publication. RustFS provides original-user delegation, scoped temporary credentials and authenticated task API forwarding. Inputs and outputs use ordinary versioned S3 buckets; event-driven jobs use the existing bucket notification/Webhook path. Managed artifact sealing, inventory, garbage collection and backup retention require separate storage contracts and are outside this integration.
|
||||
|
||||
Set `RUSTFS_PLUGIN_RUNNER_URL` to the Controller HTTPS URL ending in `/v1/ingress/manual/jobs`, and `RUSTFS_PLUGIN_RUNNER_DEPLOYMENT` to the delegation deployment. Forwarding requires the published outbound mTLS client identity and uses the published trust roots when configured. Connections are reused within a TLS generation; publishing new TLS material replaces the pool, and removing the client identity rejects new forwarding requests.
|
||||
|
||||
## Authority
|
||||
|
||||
A delegation is an immutable restriction record owned by an ordinary IAM user. It is neither a permission grant nor a credential. Creating it requires that user's real signed request and `admin:CreatePluginDelegation`; reading and revoking require the corresponding `admin:GetPluginDelegation` and `admin:RevokePluginDelegation` actions. Root, temporary credentials and service accounts cannot own records.
|
||||
|
||||
The record binds a deployment, an input bucket, literal input and output prefixes, and an expiry of at most 24 hours. The v1 profile writes to that same bucket; v2 explicitly names the output bucket. Wildcards, control characters and IAM variable expressions are rejected. Its random ID is also its immutable revision. There is no update operation.
|
||||
|
||||
The Controller is responsible for validating accepted task identity, current lease, epoch, node session and control generation before requesting credentials. RustFS authenticates the configured broker and enforces the delegation and current parent IAM. RustFS does not independently verify a remote Controller lease.
|
||||
|
||||
```mermaid
|
||||
sequenceDiagram
|
||||
participant U as Original IAM user
|
||||
participant C as Controller broker
|
||||
participant R as RustFS
|
||||
participant P as Plugin
|
||||
U->>R: Signed delegation registration
|
||||
R-->>U: Immutable ID and revision
|
||||
C->>C: Validate task and current lease
|
||||
C->>R: Signed issue-attempt request
|
||||
R->>R: Broker mapping + active record + current IAM
|
||||
R->>R: Persist scoped STS and recheck authority
|
||||
R-->>C: Short-lived credentials
|
||||
C-->>P: Attempt credentials
|
||||
P->>R: Exact version GET / attempt-prefix PUT
|
||||
R->>R: Current parent IAM intersected with session policy
|
||||
```
|
||||
|
||||
## Persistence and revocation
|
||||
|
||||
`crates/iam/src/delegation.rs` owns record validation and immutable revocation tombstones. Records use the existing IAM store under `config/iam/plugin-delegations/v1`. Writes require a successful readback. Revocation is idempotent and durable; it does not delete or overwrite the restriction record.
|
||||
|
||||
`ObjectStore::load_iam_config_strict` distinguishes a missing object from an empty object, invalid JSON or failed decryption. Only a genuinely absent tombstone permits an active record. Corrupt or unavailable storage rejects access rather than treating revocation as absent. Existing non-delegation readers keep their compatibility behavior.
|
||||
|
||||
Revocation prevents future issuance. It does not promise immediate invalidation of credentials already delivered; those remain subject to their expiration and current parent IAM. Registration, IAM changes and issuance are not one atomic transaction. Issuance rechecks after persistence and deletes the generated STS account if authority changed. Failed persistence or invalidation acknowledgment is reported as unknown issuance, never as safe retry permission.
|
||||
|
||||
Manual job submission reads the active delegation before calling the Runner. A submission that passed this check is in flight and may be admitted if revocation races with the outbound request; revocation prevents submissions whose authority check occurs afterward, but does not cancel an admitted job. Callers must treat a successful submit receipt as accepted work even if the delegation is revoked later. After an ambiguous timeout or service error, retry the same idempotency key while the delegation remains active; after revocation or expiry, query status instead of retrying submission.
|
||||
|
||||
`POST /rustfs/admin/v3/plugin-delegations/{id}/runs/query` accepts `{version:1,run_id}` and requires an ordinary IAM user with `admin:GetPluginRun` who owns the delegation in `{id}`. It reads the immutable owner record without checking expiry or revocation, then queries Runner using the record's delegation ID and revision and the authenticated access key. The result can contain only that caller's run status and committed manifest; it does not perform object reads or reauthorize object access. The Runner response must match the requested run ID and the strict status schema before RustFS returns it.
|
||||
|
||||
`POST /rustfs/admin/v3/plugin-delegations/{id}/runs/cancel` accepts the same request and requires `admin:CancelPluginRun` plus ownership of `{id}`. Expiry and revocation do not block cancelling an existing run. Runner scopes the run to that owner; missing and other-owner runs share the same not-found response, while successful and failed runs return conflict. Success returns `{version:1,run_id,state:"CANCELLED",cleanup_pending}` and does not imply that asynchronous cleanup has finished.
|
||||
|
||||
`POST /rustfs/admin/v3/plugin-delegations/{id}/runs/page` accepts `{version:1,limit,cursor?}` with a limit from 1 to 100 and requires `admin:ListPluginRuns` plus ownership of `{id}`. Expiry and revocation do not hide historical runs. RustFS supplies signer and delegation identity from authenticated IAM state; the Runner page is scoped to the exact caller and deployment. The strict response contains run summaries and an opaque-to-clients stable cursor; callers pass the returned cursor unchanged until it is null. RustFS bounds request/response sizes and rejects malformed, unordered, over-limit, or identity-invalid summaries.
|
||||
|
||||
`POST /rustfs/admin/v3/plugin-delegations/{id}/runs/history` accepts `{version:1,run_id}` and requires `admin:ListPluginRuns` plus ownership of `{id}`. RustFS derives signer and delegation identity from the authenticated user and IAM record, then proxies Runner's bounded history response. The response contains at most the latest 32 committed state events in Runner's history-ID order and a `has_older` flag; timestamps are display data and are not used to reorder events. Missing and foreign runs share the same not-found response. RustFS rejects malformed, empty, over-limit, unexpected-state, or mismatched-run responses and bounds both request and response bodies.
|
||||
|
||||
`POST /rustfs/admin/v3/plugin-delegations/{id}/runs/replay` accepts `{version:1,origin_run_id,idempotency_key,deadline_unix_micros}` and requires `admin:ReplayPluginRun`, current IAM authorization, ownership, and an active unexpired delegation. Caller identity fields are not accepted; RustFS derives signer and delegation revision from the authenticated request and IAM record. Runner accepts only an owned failed origin, preserves its fixed plugin/configuration/input version, and requires a new deadline no later than its configured run timeout. RustFS requires a positive Unix-microsecond deadline and verifies the strict receipt echoes it. Missing or foreign origins share not-found behavior; conflicts map to an operation conflict. Requests and receipts are bounded, and responses use `Cache-Control: no-store`.
|
||||
|
||||
## Broker profile
|
||||
|
||||
`rustfs/src/admin/handlers/plugin_attempt.rs` implements `POST /rustfs/admin/v3/plugin-delegations/{id}/issue-attempt`. The signer must be an ordinary IAM user with `admin:IssuePluginAttempt`, independently listed in `RUSTFS_PLUGIN_BROKERS`:
|
||||
|
||||
```json
|
||||
{"broker-access-key":"deployment-name"}
|
||||
```
|
||||
|
||||
This configuration contains public access keys, not secrets. It is immutable per process. Missing or invalid configuration disables broker issuance. The broker is a trusted Controller identity; ordinary users cannot substitute their own request fields for Controller validation.
|
||||
|
||||
The request carries `tenant`, `run_id`, `attempt_id`, `revision`, `deployment`, `input_bucket`, `input_key`, `input_version`, `output_bucket`, `output_prefix` and `ttl_seconds`. IDs must be non-nil. Both profiles accept one exact input version and an output prefix equal to:
|
||||
|
||||
```text
|
||||
<delegation-output-prefix><lowercase-hex-tenant>/<run-uuid>/<attempt-uuid>/
|
||||
```
|
||||
|
||||
The session policy permits only `s3:GetObjectVersion` for that input with an exact `s3:VersionId`, and `s3:PutObject` beneath that attempt prefix. Credential lifetime is at most 900 seconds and cannot exceed delegation expiry. The Controller must additionally cap it to its validated lease and hard deadline.
|
||||
|
||||
The original user's current IAM remains the parent permission boundary on every S3 request. The server's signing key only seals the token; it is not the plugin's authorization identity. Broker identity and original user identity are separate.
|
||||
|
||||
External policy plugins must be disabled: their authorization path does not enforce this built-in session-policy boundary. Initializing, failed and ready plugin states all reject issuance. Attempt tokens carry a signed, persisted marker: after restart or on another node, marked credentials are accepted only by built-in STS authorization. A denied marked request returns a terminal error, so public bucket policies cannot bypass its session scope. The first profile also rejects parent policies containing conditions, because a broker request cannot reconstruct the original user's IP, MFA or other request context. It does not silently replace that context with the broker's.
|
||||
|
||||
## Response and failures
|
||||
|
||||
Successful issuance returns `version`, `delegation_id`, `delegation_revision`, `owner_access_key`, `access_key_id`, `secret_access_key`, `session_token` and `expires_at_unix_seconds`, with `Cache-Control: no-store`. The Controller verifies the returned delegation and owner against the accepted caller before delivery. Credentials must never enter logs, metrics or task result manifests.
|
||||
|
||||
Missing records and records owned by a different user have the same read response. Revoked or expired records reject access. Storage failures remain errors. Post-persistence failures carry static `error_code`, `issued` and `issuance_unknown` facts without credentials; callers must reconcile an unknown outcome rather than automatically mint another credential.
|
||||
|
||||
The route/action inventory is maintained in `rustfs/src/admin/route_policy.rs`. This contract does not imply event capture, physical container cleanup, restart reconciliation or upstream release acceptance.
|
||||
|
||||
|
||||
## Cross-bucket restriction profile v2
|
||||
|
||||
The existing registration endpoint accepts this explicit v2 restriction:
|
||||
|
||||
```json
|
||||
{
|
||||
"version": 2,
|
||||
"deployment": "runner-production",
|
||||
"bucket": "source-images",
|
||||
"input_prefix": "inputs/",
|
||||
"output_bucket": "plugin-artifacts",
|
||||
"output_prefix": "outputs/",
|
||||
"expires_at_unix_seconds": 1893456000
|
||||
}
|
||||
```
|
||||
|
||||
The example expiry must be replaced by a future value within the existing
|
||||
24-hour limit. `bucket` still identifies the input bucket. The existing
|
||||
`issue-attempt` request and credential response do not change: its
|
||||
`input_bucket` must equal `bucket`, and `output_bucket` must equal the explicit
|
||||
v2 output bucket. Neither a different bucket nor a sibling attempt prefix can
|
||||
be supplied by the broker. The exact input version and deterministic output
|
||||
prefix checks remain in force.
|
||||
|
||||
A v1 restriction has neither `version` nor `output_bucket`; its JSON fields
|
||||
and same-bucket behavior are unchanged. V2 requires both `version: 2` and a
|
||||
nonempty, bounded, literal `output_bucket`. Missing pairs, explicit nulls,
|
||||
unknown versions and unknown fields are rejected rather than downgraded to v1.
|
||||
The immutable record envelope carries version 1 or 2 to match its restriction
|
||||
profile. Both remain in the existing IAM record namespace; no data migration
|
||||
or mutable record update is introduced. Readers reject mismatched envelope
|
||||
and restriction versions. Older readers reject v2, so deploy compatible
|
||||
readers before creating v2 records.
|
||||
|
||||
V2 does not grant the original user additional permissions. Issuance retains
|
||||
its current-parent checks and post-persistence recheck/invalidation, and each
|
||||
S3 request still requires both the original user's current IAM policy and the
|
||||
attempt session policy to allow it. An explicit parent Deny or removal of
|
||||
output permission prevents writes even with an already issued token. No
|
||||
administrator credential substitutes for missing parent permission.
|
||||
|
||||
Focused tests are `delegation_v1_json_remains_compatible`,
|
||||
`delegation_v2_requires_explicit_output_bucket`,
|
||||
`attempt_v2_policy_keeps_input_version_and_output_bucket` and
|
||||
`delegation_v2_persists_and_vends_with_real_parent_intersection`.
|
||||
The last uses the actual issuance handler, persistent IAM and four-disk
|
||||
storage, including a real input version and a third bucket allowed by the
|
||||
parent but forbidden by the delegation. Removing only the output-bucket
|
||||
comparison must fail `A03_CROSS_BUCKET_OUTPUT_BOUND`; parent intersection is
|
||||
checked independently with issued temporary credentials. These are internal
|
||||
handler/IAM tests, not signed HTTP or complete cross-bucket S3 execution.
|
||||
|
||||
This profile adds no bucket-creation API, Runner binding support, credential
|
||||
endpoint or GC permission. Coordinating Runner's pinned binding with its
|
||||
result storage bucket remains a separate integration requirement.
|
||||
@@ -182,18 +182,6 @@ requires a compatibility window and a dedicated cleanup entry.
|
||||
| `.scanner-cycle.lock` | scanner runtime lock | Serializes cycle-level work. A missing lock object is not itself usage evidence. |
|
||||
| `.scanner-pause-backlog.json` | scanner pause and catch-up ledger | Tracks dirty usage, discovered lifecycle work, and full-scan catch-up while authoritative publication is fenced by data movement. It never grants publication admission. |
|
||||
|
||||
The authoritative snapshot may include an optional `bucket_incarnation` in each
|
||||
bucket usage entry. The coordinator writes it only when every contributing set
|
||||
reports the same non-nil bucket UUID. Missing or conflicting identities leave
|
||||
that entry uncertified; they do not reject the usage publication or change quota
|
||||
admission. Veeam SOSAPI capacity reads require this proof to match the bucket
|
||||
incarnation read from authoritative storage. An old snapshot, a mixed-version
|
||||
writer that omits the field, a pending target bucket, or an unavailable identity
|
||||
therefore yields a retryable capacity error until a compatible scanner publishes
|
||||
a certified entry. The optional field is omitted when unavailable so older
|
||||
snapshot readers continue to see the original shape. This proof identifies the
|
||||
bucket generation; it does not make scanner usage a real-time quota ledger.
|
||||
|
||||
## Observed Snapshots
|
||||
|
||||
Observed snapshots are a diagnostic and availability layer. They may be served
|
||||
|
||||
@@ -529,21 +529,17 @@ The OTLP exporter records these node-local histograms for completed manager admi
|
||||
|
||||
The two new histograms aggregate all observed admission sources and results without per-request labels. An ordinary uninterrupted admission partitions the phase into wait and hold. Admin forceStart releases these guards while cancelling overlaps, then reacquires them: the cancellation gap is included only in the original total phase, and the second acquisition contributes to wait. Cancellation subroutine work is outside these outer admission guard intervals. Recording happens after all three guards are released. They measure manager admission ownership, not namespace/object-lock waiting during repair. The status field `maxLockPhaseMicros` remains a manager-lifetime maximum, not a p95 sample. Keep same-window histogram counts and bucket resolution when deriving percentiles; missing observations do not mean zero latency. These metrics do not establish performance acceptance by themselves.
|
||||
|
||||
## Experimental shared node admission
|
||||
## Experimental heal node admission
|
||||
|
||||
`RUSTFS_HEAL_ADAPTIVE_ADMISSION=true` enables Linux cgroup-v2 feedback shared by the heal manager’s four object-heal entry points and local Scanner namespace reads and object accounting. It is off by default while full SSD performance acceptance is pending. Unsupported platforms reject an enabled setting. This does not yet control the abandoned-child streaming list coordinator, bucket/format repair or physical devices, and it is not a replacement for existing worker, disk or byte budgets.
|
||||
`RUSTFS_HEAL_ADAPTIVE_ADMISSION=true` enables Linux cgroup-v2 feedback for the four object-heal entry points owned by the heal manager. It is off by default while full SSD performance acceptance is pending. Unsupported platforms reject an enabled setting. This does not yet control scanner walks, bucket/format repair or physical devices, and it is not a replacement for existing worker, disk or byte budgets.
|
||||
|
||||
The node samples its effective CPU quota/cpuset, ancestor memory headroom, CPU usage/throttling and CPU/memory/I/O pressure once per second. Sampling uses one blocking worker at a time. Resource reads retain their real start/end times: reads spanning over 20 ms or older than one second after all inputs return cannot renew admission. Counter rates use both read brackets conservatively. The concurrency cap is at most the rounded-up effective CPU count and 256 scheduling units; existing operator limits still apply independently. At most 1% memory headroom blocks new work. This is a pressure safeguard, not a memory reservation or a claim that concurrent repair buffers fit in the remaining bytes.
|
||||
|
||||
Each complete sample leases admission for three seconds. Missing resource caps block new work; missing or low-confidence feedback retains at most one maintenance unit. CPU use above 90%, throttling or pressure above 1% of elapsed time, memory headroom at most 10%, foreground errors/cancellations, a foreground queue or a comparable foreground p99 regression reduce concurrency immediately. Recovery requires CPU use at most 70%, throttling/stalls at most 0.1% of elapsed time, at least 20% memory headroom, fresh foreground evidence and actual successful work. The existing controller probes one additional unit only after eight consecutive healthy seconds and cooldown. Limits affect new admission and do not revoke active work.
|
||||
|
||||
The Scanner captures the same node owner once per bucket walk. Directory open/refill, entry type and size lookup, and object accounting try admission before their first storage poll; each unit ends when its operation future finishes. On contention, local and remote coordinators suspend the same traversal, release the bucket cache lease, and join the shared FIFO queue. They reacquire the cache lease and verify both cache revisions before resuming. A changed cache rejects the suspended result. Cancellation also drops the queued request; the existing cycle budget still bounds the walk. This retains directory and recursion state while allowing Heal to advance at capacity one, without repeatedly replaying a partially classified directory.
|
||||
|
||||
Calls without a coordinating cache lease retain immediate resource deferral and useful partial-cache handling. Existing remote single-session ownership and local-disk admission shares remain in force. Disabled admission creates no request channel. Enabled walks use one bounded channel, with a response allocation and cache revision reads only on contention; the uncontended per-entry path adds no global lookup or task. The streaming abandoned-child coordinator requires a separate ownership boundary: retaining a node unit while it waits for a bounded-channel consumer that needs the same unit would deadlock at capacity one.
|
||||
|
||||
Foreground comparison uses the existing complete response-body windows and shared admission snapshots. Each active class needs at least 100 completions and a finite p99 interval; this permits the percentile rank but is not a statistical confidence guarantee. Comparisons require the same active classes and rates within 80–125% of a retained reference. A changed workload resets recovery. The reference is an observed workload window, not an independent background-off baseline. A p99 interval can justify stability only when its upper bound is within 5% of the reference lower bound; a lower bound above 105% of the reference upper bound is pressure. Overlapping/uncertain comparisons cannot justify growth. Missing queues, stale or repeated cuts, uncertain cut boundaries and low counts are not idle evidence.
|
||||
|
||||
Heal admission waits at most 250 ms before returning the existing typed transient deferral, before polling storage or taking namespace locks. No-lock callers never wait. Queued read repair uses the same node gate; direct foreground ECStore calls remain outside this heal-manager adapter. Cancellation releases the non-cloneable node scheduling unit. Native work retains separate physical-I/O units, and unsuccessful/cancelled/dry-run work cannot increment the node's completed-work counter. This scheduling counter is not an authoritative heal receipt and cannot discharge repair responsibility.
|
||||
Admission waits at most 250 ms before returning the existing typed transient deferral, before polling storage or taking namespace locks. No-lock callers never wait. Queued read repair uses the same node gate; direct foreground ECStore calls remain outside this heal-manager adapter. Cancellation releases the non-cloneable node scheduling unit. Native work retains separate physical-I/O units, and unsuccessful/cancelled/dry-run work cannot increment the node's completed-work counter. This scheduling counter is not an authoritative heal receipt and cannot discharge repair responsibility.
|
||||
|
||||
The `rustfs_background_node_admission_limit` and `rustfs_background_node_admission_active` gauges describe the last published sample, not a live reservation proof. A blocked sampler can leave these exports stale even though the admission lease has expired. Full disk-owner feedback, shared scanner scheduling, escaping-buffer byte ownership and the matched-release SSD matrix/hot-shrink/72-hour soak remain required before enabling this by default or claiming optimal performance.
|
||||
|
||||
@@ -627,7 +623,7 @@ typed terminal result:
|
||||
|
||||
| Metric | Meaning |
|
||||
|---|---|
|
||||
| `rustfs_scanner_heal_pending_tasks` | Canonical tasks awaiting a terminal observation. |
|
||||
| `rustfs_scanner_heal_pending_tasks` | Pending task ID and owner-generation pairs awaiting a terminal observation. |
|
||||
| `rustfs_scanner_heal_pending_oldest_seconds` | Age of the oldest retained pending candidate; refreshed every five seconds. |
|
||||
| `rustfs_scanner_heal_candidate_terminal_total` | Associated candidates, labeled by object `disposition`, expected `scan_mode`, and unresolved `scope`. |
|
||||
| `rustfs_scanner_heal_task_terminal_observations_total` | Associated task observations, deduplicated within the bounded recent history. This is not an execution count. |
|
||||
@@ -644,16 +640,25 @@ verified-byte or full-bucket coverage counter is advanced here.
|
||||
The scanner status response also exposes `heal_observation` without requiring
|
||||
a metrics exporter. Reading status does not start an observer. `state` is
|
||||
`not_started`, `active`, or `stopped`; unavailable pending counts are null.
|
||||
`retained_pending_tasks` counts canonical IDs in the existing bounded map,
|
||||
while `retained_pending_candidates` counts their associated discoveries.
|
||||
`retained_pending_tasks` counts distinct canonical task ID and process-local
|
||||
owner-generation pairs in the bounded map. Different generations of the same
|
||||
task ID count separately. `retained_pending_candidates` counts their associated
|
||||
discoveries. The JSON field names are unchanged. The pending-tasks metric uses
|
||||
the same pair count when periodically refreshed, so it can lag the status.
|
||||
`queued_admissions` samples the local admission channel and is not an atomic
|
||||
cluster backlog. `terminal_task_observations_total` keeps the same bounded
|
||||
deduplication semantics as the exporter counter.
|
||||
|
||||
`terminal_candidates` preserves execution, object disposition, scan mode, and
|
||||
unresolved scope. `unknown_candidates` includes admission rejection, overflow,
|
||||
loss, expiry, and missing terminal proof. These categories overlap: a completed
|
||||
task with a repaired or verified-healthy object can still have unknown scanner
|
||||
loss, expiry, and missing terminal proof. The `not_admitted` reason covers an
|
||||
explicit `Full` or `Dropped` decision. The `admission_unknown` reason means no
|
||||
decision was received because of a channel or processor error. A lost reply
|
||||
does not establish whether work was admitted; a failure known to occur before
|
||||
enqueue separately rules out submission. Both reasons remain part of the
|
||||
unknown total. Monitoring that filters by reason must include the new
|
||||
`admission_unknown` label to retain those errors. These categories overlap: a
|
||||
completed task with a repaired or verified-healthy object can still have unknown scanner
|
||||
integrity. `integrity_state` therefore remains `unknown`, including when retained
|
||||
pending is zero. `lost_completion_notifications` counts skipped messages, not
|
||||
objects. Counts belong to the named local observer `generation`; runtime
|
||||
|
||||
+1
-1
@@ -297,7 +297,7 @@ tokio-rustls = { workspace = true, default-features = false, features = ["loggin
|
||||
aws-smithy-runtime-api = { workspace = true, features = ["http-1x"] }
|
||||
aws-smithy-types = { workspace = true }
|
||||
google-cloud-auth = { workspace = true, optional = true }
|
||||
moka = { workspace = true, features = ["future", "sync"] }
|
||||
moka = { workspace = true, features = ["sync"] }
|
||||
xxhash-rust = { workspace = true, features = ["xxh3"] }
|
||||
aws-sdk-s3 = { workspace = true, default-features = false, features = ["sigv4a", "default-https-client", "rt-tokio"] }
|
||||
tokio-stream.workspace = true
|
||||
|
||||
@@ -52,8 +52,6 @@ pub mod object_data_cache;
|
||||
pub mod object_zip_download;
|
||||
pub mod oidc;
|
||||
pub mod on_demand_migration;
|
||||
pub mod plugin_attempt;
|
||||
pub mod plugin_delegation;
|
||||
pub mod plugins_catalog;
|
||||
pub mod plugins_instances;
|
||||
pub mod policies;
|
||||
|
||||
@@ -1,568 +0,0 @@
|
||||
// Copyright 2026 RustFS Team
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
//! Restricted vending for explicitly configured brokers, never AssumeRole chaining.
|
||||
use super::plugin_delegation::{owner, response, storage_error};
|
||||
use crate::{
|
||||
admin::{
|
||||
router::{AdminOperation, Operation, S3Router},
|
||||
runtime_sources,
|
||||
storage_api::s3::{self, Body, S3Error, S3ErrorCode, S3Request, S3Response, S3Result},
|
||||
},
|
||||
auth::check_key_valid_with_context,
|
||||
server::ADMIN_PREFIX,
|
||||
};
|
||||
use http::{Method, StatusCode};
|
||||
use matchit::Params;
|
||||
use rustfs_iam::{
|
||||
delegation::Delegation,
|
||||
sys::{PLUGIN_ATTEMPT_CREDENTIAL_CLAIM, SESSION_POLICY_NAME},
|
||||
};
|
||||
use rustfs_policy::{
|
||||
auth::get_new_credentials_with_metadata,
|
||||
policy::{
|
||||
Args, Policy,
|
||||
action::{Action, AdminAction, S3Action},
|
||||
},
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
sync::OnceLock,
|
||||
time::{Duration, SystemTime, UNIX_EPOCH},
|
||||
};
|
||||
use time::OffsetDateTime;
|
||||
|
||||
// Operator configuration contains public signer access keys, not credentials.
|
||||
// Empty/invalid configuration disables the endpoint. It is immutable per process.
|
||||
static BROKERS: OnceLock<Option<HashMap<String, String>>> = OnceLock::new();
|
||||
fn configured_deployment(key: &str) -> Option<&'static str> {
|
||||
BROKERS
|
||||
.get_or_init(|| {
|
||||
let raw = std::env::var("RUSTFS_PLUGIN_BROKERS").ok()?;
|
||||
let map: HashMap<String, String> = serde_json::from_str(&raw).ok()?;
|
||||
if map.is_empty()
|
||||
|| map
|
||||
.iter()
|
||||
.any(|(k, v)| k.is_empty() || v.is_empty() || k.len() > 1024 || v.len() > 1024)
|
||||
{
|
||||
return None;
|
||||
}
|
||||
Some(map)
|
||||
})
|
||||
.as_ref()?
|
||||
.get(key)
|
||||
.map(String::as_str)
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct Attempt {
|
||||
tenant: String,
|
||||
run_id: uuid::Uuid,
|
||||
attempt_id: uuid::Uuid,
|
||||
revision: String,
|
||||
deployment: String,
|
||||
input_bucket: String,
|
||||
input_key: String,
|
||||
input_version: String,
|
||||
output_bucket: String,
|
||||
output_prefix: String,
|
||||
ttl_seconds: u64,
|
||||
}
|
||||
#[derive(Serialize)]
|
||||
struct Issued {
|
||||
version: u32,
|
||||
delegation_id: String,
|
||||
delegation_revision: String,
|
||||
owner_access_key: String,
|
||||
access_key_id: String,
|
||||
secret_access_key: String,
|
||||
session_token: String,
|
||||
expires_at_unix_seconds: i64,
|
||||
}
|
||||
|
||||
pub fn register_plugin_attempt_route(router: &mut S3Router<AdminOperation>) -> std::io::Result<()> {
|
||||
router.insert(
|
||||
Method::POST,
|
||||
&format!("{ADMIN_PREFIX}/v3/plugin-delegations/{{id}}/issue-attempt"),
|
||||
AdminOperation(&Issue),
|
||||
)?;
|
||||
Ok(())
|
||||
}
|
||||
fn now() -> S3Result<u64> {
|
||||
SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.map(|d| d.as_secs())
|
||||
.map_err(|_| s3::error(S3ErrorCode::InternalError, "clock unavailable"))
|
||||
}
|
||||
fn literal(value: &str) -> bool {
|
||||
!value.is_empty()
|
||||
&& value.len() <= 1024
|
||||
&& !value.contains("${")
|
||||
&& !value.chars().any(|c| c.is_control() || matches!(c, '*' | '?'))
|
||||
}
|
||||
fn session_policy(record: &Delegation, attempt: &Attempt) -> S3Result<Policy> {
|
||||
let restriction = &record.restrictions;
|
||||
// Stored records from earlier versions must obey the same literal rules.
|
||||
restriction.validate(record.created_at_unix_seconds).map_err(storage_error)?;
|
||||
let exact_output = format!(
|
||||
"{}{}/{}/{}/",
|
||||
restriction.output_prefix,
|
||||
hex_simd::encode_to_string(attempt.tenant.as_bytes(), hex_simd::AsciiCase::Lower),
|
||||
attempt.run_id,
|
||||
attempt.attempt_id
|
||||
);
|
||||
if attempt.tenant.is_empty()
|
||||
|| attempt.tenant.len() > 1024
|
||||
|| attempt.run_id.is_nil()
|
||||
|| attempt.attempt_id.is_nil()
|
||||
|| attempt.output_prefix != exact_output
|
||||
|| attempt.revision != record.revision
|
||||
|| attempt.deployment != restriction.deployment
|
||||
|| attempt.input_bucket != restriction.bucket
|
||||
|| attempt.output_bucket != restriction.output_bucket().map_err(storage_error)?
|
||||
|| !literal(&attempt.input_key)
|
||||
|| !attempt.input_key.starts_with(&restriction.input_prefix)
|
||||
|| !literal(&attempt.input_version)
|
||||
|| attempt.input_version == "null"
|
||||
|| !literal(&attempt.output_prefix)
|
||||
|| !attempt.output_prefix.starts_with(&restriction.output_prefix)
|
||||
|| attempt.output_prefix == restriction.output_prefix
|
||||
|| !attempt.output_prefix.ends_with('/')
|
||||
|| !(1..=900).contains(&attempt.ttl_seconds)
|
||||
{
|
||||
return Err(s3::error(S3ErrorCode::AccessDenied, "attempt restriction rejected"));
|
||||
}
|
||||
let value = serde_json::json!({"Version":"2012-10-17","Statement":[
|
||||
{"Effect":"Allow","Action":["s3:GetObjectVersion"],"Resource":[format!("arn:aws:s3:::{}/{}",attempt.input_bucket,attempt.input_key)],"Condition":{"StringEquals":{"s3:VersionId":attempt.input_version}}},
|
||||
{"Effect":"Allow","Action":["s3:PutObject"],"Resource":[format!("arn:aws:s3:::{}/{}*",attempt.output_bucket,attempt.output_prefix)]}
|
||||
]});
|
||||
// Condition operators borrow their keys while the policy is decoded.
|
||||
let bytes = serde_json::to_vec(&value).map_err(|_| s3::error(S3ErrorCode::InternalError, "attempt policy unavailable"))?;
|
||||
serde_json::from_slice(&bytes).map_err(|_| s3::error(S3ErrorCode::InternalError, "attempt policy unavailable"))
|
||||
}
|
||||
|
||||
fn issuance_error(code: &'static str, issued: bool, unknown: bool) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let mut answer = response(&serde_json::json!({"error_code":code,"issued":issued,"issuance_unknown":unknown}))?;
|
||||
answer.output.0 = StatusCode::SERVICE_UNAVAILABLE;
|
||||
Ok(answer)
|
||||
}
|
||||
fn same_parent_authority(before_names: &[String], before_policy: &Policy, after_names: &[String], after_policy: &Policy) -> bool {
|
||||
fn names(names: &[String]) -> Vec<&str> {
|
||||
let mut names: Vec<_> = names.iter().map(String::as_str).collect();
|
||||
names.sort_unstable();
|
||||
names.dedup();
|
||||
names
|
||||
}
|
||||
fn statements(policy: &Policy) -> Option<Vec<Vec<u8>>> {
|
||||
let mut statements = policy
|
||||
.statements
|
||||
.iter()
|
||||
.map(serde_json::to_vec)
|
||||
.collect::<Result<Vec<_>, _>>()
|
||||
.ok()?;
|
||||
statements.sort_unstable();
|
||||
Some(statements)
|
||||
}
|
||||
|
||||
names(before_names) == names(after_names)
|
||||
&& matches!(
|
||||
(statements(before_policy), statements(after_policy)),
|
||||
(Some(before), Some(after)) if before == after
|
||||
)
|
||||
}
|
||||
async fn require_builtin_authorization() -> S3Result<()> {
|
||||
rustfs_iam::sys::IamSys::<rustfs_iam::store::object::ObjectStore>::ensure_restricted_credential_vending()
|
||||
.await
|
||||
.map_err(|_| s3::error(S3ErrorCode::AccessDenied, "external policy plugin unsupported for attempt credentials"))
|
||||
}
|
||||
|
||||
struct Issue;
|
||||
#[async_trait::async_trait]
|
||||
impl Operation for Issue {
|
||||
async fn call(&self, mut req: S3Request<Body>, params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
require_builtin_authorization().await?;
|
||||
let (iam, broker) = owner(&req, AdminAction::IssuePluginAttemptAction).await?;
|
||||
let deployment =
|
||||
configured_deployment(&broker).ok_or_else(|| s3::error(S3ErrorCode::AccessDenied, "broker deployment rejected"))?;
|
||||
let context = runtime_sources::app_context_from_req(&req)
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InternalError, "application context unavailable"))?;
|
||||
let bytes = tokio::time::timeout(Duration::from_secs(10), req.input.store_all_limited(16384))
|
||||
.await
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "attempt body unavailable"))?
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "attempt body unavailable"))?;
|
||||
let attempt: Attempt =
|
||||
serde_json::from_slice(&bytes).map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "invalid attempt request"))?;
|
||||
if attempt.deployment != deployment {
|
||||
return Err(s3::error(S3ErrorCode::AccessDenied, "broker deployment rejected"));
|
||||
}
|
||||
let id = params
|
||||
.get("id")
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InvalidRequest, "delegation id required"))?;
|
||||
let record = iam
|
||||
.read_active_plugin_delegation_for_broker(id, now()?)
|
||||
.await
|
||||
.map_err(storage_error)?;
|
||||
let policy = session_policy(&record, &attempt)?;
|
||||
let (principal, root) = check_key_valid_with_context("", &record.owner_access_key, Some(context.as_ref())).await?;
|
||||
if root || principal.is_temp() || principal.is_service_account() {
|
||||
return Err(s3::error(S3ErrorCode::AccessDenied, "original user required"));
|
||||
}
|
||||
// A broker request cannot reconstruct the original user's IP/MFA/tag
|
||||
// conditions. This first profile rejects conditional parent policies.
|
||||
let policies = iam
|
||||
.policy_db_get(&principal.access_key, &principal.groups)
|
||||
.await
|
||||
.map_err(|_| s3::error(S3ErrorCode::InternalError, "parent policy unavailable"))?;
|
||||
let parent_policy = iam.get_combined_policy(&policies).await;
|
||||
if policies.is_empty() || parent_policy.statements.iter().any(|s| !s.conditions.is_empty()) {
|
||||
return Err(s3::error(S3ErrorCode::AccessDenied, "parent condition context unsupported"));
|
||||
}
|
||||
let mut conditions = HashMap::new();
|
||||
conditions.insert("s3:VersionId".to_owned(), vec![attempt.input_version.clone()]);
|
||||
if !iam
|
||||
.is_allowed(&Args {
|
||||
account: &principal.access_key,
|
||||
groups: &principal.groups,
|
||||
action: Action::S3Action(S3Action::GetObjectVersionAction),
|
||||
bucket: &attempt.input_bucket,
|
||||
object: &attempt.input_key,
|
||||
conditions: &conditions,
|
||||
is_owner: false,
|
||||
claims: principal.claims_or_empty(),
|
||||
deny_only: false,
|
||||
})
|
||||
.await
|
||||
{
|
||||
return Err(s3::error(S3ErrorCode::AccessDenied, "parent input rejected"));
|
||||
}
|
||||
let expiration = now()?
|
||||
.checked_add(attempt.ttl_seconds)
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InvalidRequest, "invalid expiration"))?
|
||||
.min(record.restrictions.expires_at_unix_seconds);
|
||||
let expires_at = OffsetDateTime::from_unix_timestamp(
|
||||
i64::try_from(expiration).map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "invalid expiration"))?,
|
||||
)
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "invalid expiration"))?;
|
||||
let mut claims = principal.claims.clone().unwrap_or_default();
|
||||
claims.insert(PLUGIN_ATTEMPT_CREDENTIAL_CLAIM.into(), serde_json::Value::Bool(true));
|
||||
claims.insert("exp".into(), serde_json::json!(expires_at.unix_timestamp()));
|
||||
claims.insert("parent".into(), serde_json::json!(principal.access_key));
|
||||
let bytes =
|
||||
serde_json::to_vec(&policy).map_err(|_| s3::error(S3ErrorCode::InternalError, "attempt policy unavailable"))?;
|
||||
claims.insert(
|
||||
SESSION_POLICY_NAME.into(),
|
||||
serde_json::json!(base64_simd::URL_SAFE_NO_PAD.encode_to_string(&bytes)),
|
||||
);
|
||||
let fresh = iam
|
||||
.read_active_plugin_delegation_for_broker(id, now()?)
|
||||
.await
|
||||
.map_err(storage_error)?;
|
||||
if fresh != record {
|
||||
return Err(s3::error(S3ErrorCode::AccessDenied, "attempt authority changed"));
|
||||
}
|
||||
owner(&req, AdminAction::IssuePluginAttemptAction).await?;
|
||||
require_builtin_authorization().await?;
|
||||
let signing = context
|
||||
.action_credentials()
|
||||
.get()
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InternalError, "token signer unavailable"))?;
|
||||
// The server key seals the token only. Authorization above uses the
|
||||
// original user's current IAM, and S3 continues its parent intersection.
|
||||
let mut credential = get_new_credentials_with_metadata(&claims, &signing.secret_key)
|
||||
.map_err(|_| s3::error(S3ErrorCode::InternalError, "attempt credential unavailable"))?;
|
||||
credential.parent_user = principal.access_key.clone();
|
||||
if iam.set_temp_user(&credential.access_key, &credential, None).await.is_err() {
|
||||
return issuance_error("PLUGIN_ATTEMPT_ISSUANCE_UNKNOWN", false, true);
|
||||
}
|
||||
// No atomic IAM/delegation transaction spans persistence. Recheck and
|
||||
// invalidate the generated credential if any authority changed.
|
||||
let valid = async {
|
||||
require_builtin_authorization().await?;
|
||||
let after = iam
|
||||
.read_active_plugin_delegation_for_broker(id, now()?)
|
||||
.await
|
||||
.map_err(storage_error)?;
|
||||
let (current, current_root) =
|
||||
check_key_valid_with_context("", &record.owner_access_key, Some(context.as_ref())).await?;
|
||||
let names = iam
|
||||
.policy_db_get(¤t.access_key, ¤t.groups)
|
||||
.await
|
||||
.map_err(|_| s3::error(S3ErrorCode::InternalError, "parent policy unavailable"))?;
|
||||
let current_policy = iam.get_combined_policy(&names).await;
|
||||
if after != record
|
||||
|| current_root
|
||||
|| current.is_temp()
|
||||
|| current.is_service_account()
|
||||
|| current.secret_key != principal.secret_key
|
||||
|| !same_parent_authority(&policies, &parent_policy, &names, ¤t_policy)
|
||||
{
|
||||
return Err(s3::error(S3ErrorCode::AccessDenied, "attempt authority changed"));
|
||||
}
|
||||
// Re-evaluate the broker against its real signed request context.
|
||||
owner(&req, AdminAction::IssuePluginAttemptAction).await?;
|
||||
Ok::<(), S3Error>(())
|
||||
}
|
||||
.await;
|
||||
if valid.is_err() {
|
||||
if iam.delete_temp_account(&credential.access_key, true).await.is_err() {
|
||||
return issuance_error("PLUGIN_ATTEMPT_INVALIDATION_UNKNOWN", true, true);
|
||||
}
|
||||
return issuance_error("PLUGIN_ATTEMPT_POST_ISSUANCE_REJECTED", true, false);
|
||||
}
|
||||
response(&Issued {
|
||||
version: 1,
|
||||
delegation_id: record.id,
|
||||
delegation_revision: record.revision,
|
||||
owner_access_key: record.owner_access_key,
|
||||
access_key_id: credential.access_key,
|
||||
secret_access_key: credential.secret_key,
|
||||
session_token: credential.session_token,
|
||||
expires_at_unix_seconds: expires_at.unix_timestamp(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
#[path = "plugin_attempt_v2_tests.rs"]
|
||||
mod v2_tests;
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn parent_authority_recheck_ignores_policy_order_but_detects_changes() {
|
||||
let first: Policy = serde_json::from_value(serde_json::json!({
|
||||
"Version":"2012-10-17",
|
||||
"Statement":[
|
||||
{"Effect":"Allow","Action":"s3:GetObject","Resource":"arn:aws:s3:::photos/input/*"},
|
||||
{"Effect":"Allow","Action":"s3:PutObject","Resource":"arn:aws:s3:::photos/output/*"}
|
||||
]
|
||||
}))
|
||||
.unwrap();
|
||||
let reordered: Policy = serde_json::from_value(serde_json::json!({
|
||||
"Version":"2012-10-17",
|
||||
"Statement":[
|
||||
{"Effect":"Allow","Action":"s3:PutObject","Resource":"arn:aws:s3:::photos/output/*"},
|
||||
{"Effect":"Allow","Action":"s3:GetObject","Resource":"arn:aws:s3:::photos/input/*"}
|
||||
]
|
||||
}))
|
||||
.unwrap();
|
||||
let before_names = vec!["owner-policy".to_owned(), "bucket-policy".to_owned()];
|
||||
let after_names = vec!["bucket-policy".to_owned(), "owner-policy".to_owned()];
|
||||
assert!(same_parent_authority(&before_names, &first, &after_names, &reordered));
|
||||
|
||||
let changed: Policy = serde_json::from_value(serde_json::json!({
|
||||
"Version":"2012-10-17",
|
||||
"Statement":[
|
||||
{"Effect":"Allow","Action":"s3:GetObject","Resource":"arn:aws:s3:::photos/input/*"},
|
||||
{"Effect":"Allow","Action":"s3:DeleteObject","Resource":"arn:aws:s3:::photos/output/*"}
|
||||
]
|
||||
}))
|
||||
.unwrap();
|
||||
assert!(!same_parent_authority(&before_names, &first, &after_names, &changed));
|
||||
let changed_resource: Policy = serde_json::from_value(serde_json::json!({
|
||||
"Version":"2012-10-17",
|
||||
"Statement":[
|
||||
{"Effect":"Allow","Action":"s3:GetObject","Resource":"arn:aws:s3:::photos/input/*"},
|
||||
{"Effect":"Allow","Action":"s3:PutObject","Resource":"arn:aws:s3:::photos/private/*"}
|
||||
]
|
||||
}))
|
||||
.unwrap();
|
||||
assert!(!same_parent_authority(&before_names, &first, &after_names, &changed_resource));
|
||||
let added_deny: Policy = serde_json::from_value(serde_json::json!({
|
||||
"Version":"2012-10-17",
|
||||
"Statement":[
|
||||
{"Effect":"Deny","Action":"s3:GetObject","Resource":"arn:aws:s3:::photos/input/private/*"},
|
||||
{"Effect":"Allow","Action":"s3:GetObject","Resource":"arn:aws:s3:::photos/input/*"},
|
||||
{"Effect":"Allow","Action":"s3:PutObject","Resource":"arn:aws:s3:::photos/output/*"}
|
||||
]
|
||||
}))
|
||||
.unwrap();
|
||||
assert!(!same_parent_authority(&before_names, &first, &after_names, &added_deny));
|
||||
assert!(!same_parent_authority(&before_names, &first, &["other-policy".to_owned()], &first));
|
||||
}
|
||||
#[tokio::test]
|
||||
async fn attempt_policy_keeps_exact_version_and_narrow_output() {
|
||||
let record = Delegation {
|
||||
version: 1,
|
||||
id: "a".repeat(32),
|
||||
revision: "a".repeat(32),
|
||||
owner_access_key: "user".into(),
|
||||
created_at_unix_seconds: 1,
|
||||
restrictions: rustfs_iam::delegation::Restrictions {
|
||||
version: None,
|
||||
output_bucket: None,
|
||||
deployment: "runner".into(),
|
||||
bucket: "photos".into(),
|
||||
input_prefix: "input/".into(),
|
||||
output_prefix: "output/".into(),
|
||||
expires_at_unix_seconds: 1000,
|
||||
},
|
||||
};
|
||||
let run_id = uuid::Uuid::new_v4();
|
||||
let attempt_id = uuid::Uuid::new_v4();
|
||||
let output_prefix = format!(
|
||||
"output/{}/{}/{}/",
|
||||
hex_simd::encode_to_string(b"tenant", hex_simd::AsciiCase::Lower),
|
||||
run_id,
|
||||
attempt_id
|
||||
);
|
||||
let mut attempt = Attempt {
|
||||
tenant: "tenant".into(),
|
||||
run_id,
|
||||
attempt_id,
|
||||
revision: record.revision.clone(),
|
||||
deployment: "runner".into(),
|
||||
input_bucket: "photos".into(),
|
||||
input_key: "input/photo.png".into(),
|
||||
input_version: "version-1".into(),
|
||||
output_bucket: "photos".into(),
|
||||
output_prefix: output_prefix.clone(),
|
||||
ttl_seconds: 60,
|
||||
};
|
||||
let policy = session_policy(&record, &attempt).unwrap();
|
||||
let scoped_output = format!("{output_prefix}result");
|
||||
let groups = None;
|
||||
let claims = HashMap::new();
|
||||
for (action, object, version, expected) in [
|
||||
(S3Action::GetObjectVersionAction, "input/photo.png", Some("version-1"), true),
|
||||
(S3Action::GetObjectVersionAction, "input/photo.png", Some("version-2"), false),
|
||||
(S3Action::GetObjectVersionAction, "input/photo.png", None, false),
|
||||
(S3Action::GetObjectAction, "input/photo.png", None, false),
|
||||
(S3Action::PutObjectAction, scoped_output.as_str(), None, true),
|
||||
(S3Action::PutObjectAction, "outside/result", None, false),
|
||||
(S3Action::PutObjectAction, "output/result", None, false),
|
||||
] {
|
||||
let conditions = version
|
||||
.map(|value| HashMap::from([("versionid".into(), vec![value.into()])]))
|
||||
.unwrap_or_default();
|
||||
assert_eq!(
|
||||
policy
|
||||
.is_allowed(&Args {
|
||||
account: "user",
|
||||
groups: &groups,
|
||||
action: Action::S3Action(action),
|
||||
bucket: "photos",
|
||||
object,
|
||||
conditions: &conditions,
|
||||
is_owner: false,
|
||||
claims: &claims,
|
||||
deny_only: false,
|
||||
})
|
||||
.await,
|
||||
expected,
|
||||
"attempt policy action={action:?} object={object} version={version:?}"
|
||||
);
|
||||
}
|
||||
attempt.output_bucket = "artifacts".into();
|
||||
assert!(
|
||||
session_policy(&record, &attempt).is_err(),
|
||||
"v1 still requires the input bucket for output"
|
||||
);
|
||||
attempt.output_bucket = "photos".into();
|
||||
attempt.output_prefix = "output/".into();
|
||||
assert!(session_policy(&record, &attempt).is_err());
|
||||
attempt.output_prefix = output_prefix;
|
||||
attempt.input_key = "outside/photo.png".into();
|
||||
assert!(session_policy(&record, &attempt).is_err());
|
||||
}
|
||||
#[tokio::test]
|
||||
async fn attempt_v2_policy_keeps_input_version_and_output_bucket() {
|
||||
let record: Delegation = serde_json::from_value(serde_json::json!({
|
||||
"version":2,"id":"a".repeat(32),"revision":"a".repeat(32),"owner_access_key":"user",
|
||||
"created_at_unix_seconds":1,"restrictions":{"version":2,"deployment":"runner","bucket":"photos",
|
||||
"input_prefix":"input/","output_bucket":"artifacts","output_prefix":"output/","expires_at_unix_seconds":1000}
|
||||
}))
|
||||
.expect("explicit v2 delegation");
|
||||
let run_id = uuid::Uuid::new_v4();
|
||||
let attempt_id = uuid::Uuid::new_v4();
|
||||
let output = format!("output/74656e616e74/{run_id}/{attempt_id}/");
|
||||
let mut attempt = Attempt {
|
||||
tenant: "tenant".into(),
|
||||
run_id,
|
||||
attempt_id,
|
||||
revision: record.revision.clone(),
|
||||
deployment: "runner".into(),
|
||||
input_bucket: "photos".into(),
|
||||
input_key: "input/photo.png".into(),
|
||||
input_version: "version-1".into(),
|
||||
output_bucket: "artifacts".into(),
|
||||
output_prefix: output.clone(),
|
||||
ttl_seconds: 60,
|
||||
};
|
||||
let policy = session_policy(&record, &attempt).expect("v2 scope");
|
||||
let result = format!("{output}result");
|
||||
for (action, bucket, object, version, expected) in [
|
||||
(S3Action::GetObjectVersionAction, "photos", "input/photo.png", Some("version-1"), true),
|
||||
(S3Action::GetObjectVersionAction, "photos", "input/photo.png", Some("version-2"), false),
|
||||
(S3Action::GetObjectVersionAction, "artifacts", "input/photo.png", Some("version-1"), false),
|
||||
(S3Action::PutObjectAction, "artifacts", result.as_str(), None, true),
|
||||
(S3Action::PutObjectAction, "photos", result.as_str(), None, false),
|
||||
(S3Action::PutObjectAction, "third", result.as_str(), None, false),
|
||||
(S3Action::PutObjectAction, "artifacts", "output/other/result", None, false),
|
||||
] {
|
||||
let conditions = version
|
||||
.map(|v| HashMap::from([("versionid".into(), vec![v.into()])]))
|
||||
.unwrap_or_default();
|
||||
assert_eq!(
|
||||
policy
|
||||
.is_allowed(&Args {
|
||||
account: "user",
|
||||
groups: &None,
|
||||
action: Action::S3Action(action),
|
||||
bucket,
|
||||
object,
|
||||
conditions: &conditions,
|
||||
claims: &HashMap::new(),
|
||||
is_owner: false,
|
||||
deny_only: false
|
||||
})
|
||||
.await,
|
||||
expected,
|
||||
"A03_CROSS_BUCKET_SCOPE: bucket={bucket} object={object}"
|
||||
);
|
||||
}
|
||||
attempt.output_bucket = "third".into();
|
||||
assert!(session_policy(&record, &attempt).is_err(), "A03_CROSS_BUCKET_OUTPUT_BOUND");
|
||||
attempt.output_bucket = "photos".into();
|
||||
assert!(session_policy(&record, &attempt).is_err(), "A03_CROSS_BUCKET_OUTPUT_BOUND");
|
||||
attempt.output_bucket = "artifacts".into();
|
||||
attempt.input_bucket = "artifacts".into();
|
||||
assert!(session_policy(&record, &attempt).is_err(), "A03_CROSS_BUCKET_INPUT_BOUND");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn actual_policy_variable_resolution_is_rejected_by_literal_scope() {
|
||||
let resource = rustfs_policy::policy::resource::Resource::S3("photos/input/${aws:username}.png".into());
|
||||
let conditions = HashMap::from([("username".into(), vec!["alice".into()])]);
|
||||
let resolver =
|
||||
rustfs_policy::policy::variables::VariableResolver::new(rustfs_policy::policy::variables::VariableContext {
|
||||
username: Some("alice".into()),
|
||||
..Default::default()
|
||||
});
|
||||
assert!(
|
||||
resource
|
||||
.is_match_with_resolver("photos/input/alice.png", &conditions, Some(&resolver))
|
||||
.await,
|
||||
"C07_LITERAL_SCOPE_BOUND: actual policy engine substitutes resource variables"
|
||||
);
|
||||
assert!(
|
||||
!literal("input/${aws:username}.png"),
|
||||
"C07_LITERAL_SCOPE_BOUND: requested resources must stay literal"
|
||||
);
|
||||
let restriction = rustfs_iam::delegation::Restrictions {
|
||||
version: None,
|
||||
output_bucket: None,
|
||||
deployment: "runner".into(),
|
||||
bucket: "photos".into(),
|
||||
input_prefix: "input/${aws:username}/".into(),
|
||||
output_prefix: "output/".into(),
|
||||
expires_at_unix_seconds: 200,
|
||||
};
|
||||
assert!(
|
||||
restriction.validate(100).is_err(),
|
||||
"C07_LITERAL_SCOPE_BOUND: legacy stored variable restrictions are rejected"
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,365 +0,0 @@
|
||||
// Copyright 2026 RustFS Team
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
//! Real handler, persisted IAM and four-disk storage; this is not a signed HTTP/S3 end-to-end test.
|
||||
use super::*;
|
||||
use crate::admin::{
|
||||
runtime_sources::{AppContext, IamInterface, KmsInterface, ServerContextSlot},
|
||||
storage_api::{
|
||||
ECStore,
|
||||
contract::bucket::{BucketOperations as _, MakeBucketOptions},
|
||||
contract::object::ObjectIO as _,
|
||||
},
|
||||
};
|
||||
use crate::storage::storage_api::{StorageObjectOptions, StoragePutObjReader};
|
||||
use http_body_util::BodyExt as _;
|
||||
use rustfs_iam::{
|
||||
store::{
|
||||
Store as _, UserType,
|
||||
object::{IAM_CONFIG_PREFIX, ObjectStore},
|
||||
},
|
||||
sys::IamSys,
|
||||
};
|
||||
use rustfs_madmin::{AccountStatus, AddOrUpdateUserReq};
|
||||
use serde_json::{Value, json};
|
||||
use std::sync::Arc;
|
||||
|
||||
const PARENT: &str = "cross-parent";
|
||||
const BROKER: &str = "cross-broker";
|
||||
const SECRET: &str = "cross-bucket-test-secret";
|
||||
const ROOT: &str = "cross-root";
|
||||
const ROOT_SECRET: &str = "cross-bucket-root-test-secret";
|
||||
|
||||
struct RequestIam(Arc<IamSys<ObjectStore>>);
|
||||
impl IamInterface for RequestIam {
|
||||
fn handle(&self) -> Arc<IamSys<ObjectStore>> {
|
||||
self.0.clone()
|
||||
}
|
||||
fn is_ready(&self) -> bool {
|
||||
true
|
||||
}
|
||||
}
|
||||
struct RequestKms;
|
||||
impl KmsInterface for RequestKms {
|
||||
fn handle(&self) -> Arc<rustfs_kms::KmsServiceManager> {
|
||||
Arc::new(rustfs_kms::KmsServiceManager::new())
|
||||
}
|
||||
}
|
||||
struct Fixture {
|
||||
_root: tempfile::TempDir,
|
||||
store: Arc<ECStore>,
|
||||
iam: Arc<IamSys<ObjectStore>>,
|
||||
context: Arc<AppContext>,
|
||||
input_version: String,
|
||||
}
|
||||
impl Fixture {
|
||||
async fn new() -> Self {
|
||||
let root = tempfile::tempdir().expect("cross-bucket storage root");
|
||||
let env = rustfs_test_utils::TestECStoreEnv::builder()
|
||||
.base_dir(root.path())
|
||||
.disk_count(4)
|
||||
.build()
|
||||
.await;
|
||||
assert_eq!(env.disk_paths.len(), 4);
|
||||
let store = env.ecstore;
|
||||
for bucket in ["photos", "artifacts", "third"] {
|
||||
store
|
||||
.make_bucket(
|
||||
bucket,
|
||||
&MakeBucketOptions {
|
||||
versioning_enabled: true,
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.await
|
||||
.expect("real versioned bucket");
|
||||
}
|
||||
let object = store
|
||||
.put_object(
|
||||
"photos",
|
||||
"input/photo.png",
|
||||
&mut StoragePutObjReader::from_vec(vec![0xA5; 273]),
|
||||
&StorageObjectOptions {
|
||||
versioned: true,
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.await
|
||||
.expect("real input version");
|
||||
let input_version = object.version_id.expect("exact input version").to_string();
|
||||
ObjectStore::new(store.clone())
|
||||
.save_iam_config(json!({"version":1}), format!("{}/format.json", *IAM_CONFIG_PREFIX))
|
||||
.await
|
||||
.expect("persistent IAM format");
|
||||
let iam = rustfs_iam::build_iam_sys(store.clone()).await.expect("real IAM");
|
||||
let context = Arc::new(AppContext::new(store.clone(), Arc::new(RequestIam(iam.clone())), Arc::new(RequestKms)));
|
||||
assert!(context.publish_action_credentials(rustfs_credentials::Credentials {
|
||||
access_key: ROOT.into(),
|
||||
secret_key: ROOT_SECRET.into(),
|
||||
status: "on".into(),
|
||||
..Default::default()
|
||||
}));
|
||||
let fixture = Self {
|
||||
_root: root,
|
||||
store,
|
||||
iam,
|
||||
context,
|
||||
input_version,
|
||||
};
|
||||
fixture.user(PARENT, Self::parent_policy(true, false)).await;
|
||||
fixture
|
||||
.user(
|
||||
BROKER,
|
||||
json!({"Version":"2012-10-17","Statement":[{
|
||||
"Effect":"Allow","Action":"admin:IssuePluginAttempt"}]}),
|
||||
)
|
||||
.await;
|
||||
fixture
|
||||
}
|
||||
fn parent_policy(output: bool, deny: bool) -> Value {
|
||||
let mut resources = vec!["arn:aws:s3:::photos/output/*", "arn:aws:s3:::third/output/*"];
|
||||
if output {
|
||||
resources.push("arn:aws:s3:::artifacts/output/*");
|
||||
}
|
||||
let mut statements = vec![
|
||||
json!({"Effect":"Allow","Action":"s3:GetObjectVersion","Resource":"arn:aws:s3:::photos/input/*"}),
|
||||
json!({"Effect":"Allow","Action":"s3:PutObject","Resource":resources}),
|
||||
];
|
||||
if deny {
|
||||
statements.push(json!({"Effect":"Deny","Action":"s3:PutObject","Resource":"arn:aws:s3:::artifacts/*"}));
|
||||
}
|
||||
json!({"Version":"2012-10-17","Statement":statements})
|
||||
}
|
||||
async fn policy(&self, name: &str, value: Value) {
|
||||
let policy = Policy::parse_config(&serde_json::to_vec(&value).expect("policy JSON")).expect("real IAM policy");
|
||||
self.iam.set_policy(name, policy).await.expect("persist policy");
|
||||
}
|
||||
async fn user(&self, name: &str, policy: Value) {
|
||||
self.iam
|
||||
.create_user(
|
||||
name,
|
||||
&AddOrUpdateUserReq {
|
||||
secret_key: SECRET.into(),
|
||||
policy: None,
|
||||
status: AccountStatus::Enabled,
|
||||
},
|
||||
)
|
||||
.await
|
||||
.expect("create real user");
|
||||
self.policy(name, policy).await;
|
||||
self.iam
|
||||
.policy_db_set(name, UserType::Reg, false, name)
|
||||
.await
|
||||
.expect("attach actual IAM policy");
|
||||
}
|
||||
fn request(&self, body: &Value) -> S3Request<Body> {
|
||||
let slot = ServerContextSlot::new();
|
||||
assert!(slot.install(self.context.clone()));
|
||||
let mut req = S3Request {
|
||||
input: Body::from(serde_json::to_vec(body).expect("attempt JSON")),
|
||||
method: Method::POST,
|
||||
uri: http::Uri::default(),
|
||||
headers: http::HeaderMap::new(),
|
||||
extensions: http::Extensions::new(),
|
||||
credentials: None,
|
||||
region: None,
|
||||
service: None,
|
||||
trailing_headers: None,
|
||||
};
|
||||
req.extensions.insert(slot);
|
||||
req.method = Method::POST;
|
||||
req.credentials = Some(s3::auth::Credentials {
|
||||
access_key: BROKER.into(),
|
||||
secret_key: s3::auth::SecretKey::from(SECRET.to_owned()),
|
||||
});
|
||||
req
|
||||
}
|
||||
async fn issue(&self, record: &Delegation, body: &Value) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let mut router = matchit::Router::new();
|
||||
router.insert("/{id}", ()).expect("parameter route");
|
||||
let path = format!("/{}", record.id);
|
||||
Issue
|
||||
.call(self.request(body), router.at(&path).expect("actual delegation ID").params)
|
||||
.await
|
||||
}
|
||||
async fn allowed(
|
||||
&self,
|
||||
credential: &rustfs_credentials::Credentials,
|
||||
action: S3Action,
|
||||
bucket: &str,
|
||||
object: &str,
|
||||
version: Option<&str>,
|
||||
) -> bool {
|
||||
let conditions = version
|
||||
.map(|v| HashMap::from([("versionid".into(), vec![v.into()])]))
|
||||
.unwrap_or_default();
|
||||
self.iam
|
||||
.is_allowed(&Args {
|
||||
account: &credential.access_key,
|
||||
groups: &credential.groups,
|
||||
action: Action::S3Action(action),
|
||||
bucket,
|
||||
object,
|
||||
conditions: &conditions,
|
||||
claims: credential.claims_or_empty(),
|
||||
is_owner: false,
|
||||
deny_only: false,
|
||||
})
|
||||
.await
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||||
#[serial_test::serial]
|
||||
async fn delegation_v2_persists_and_vends_with_real_parent_intersection() {
|
||||
temp_env::async_with_vars(
|
||||
[
|
||||
("RUSTFS_PLUGIN_BROKERS", Some(r#"{"cross-broker":"runner"}"#)),
|
||||
("RUSTFS_SKIP_BACKGROUND_TASK", Some("1")),
|
||||
],
|
||||
async {
|
||||
let fixture = Fixture::new().await;
|
||||
let now = now().expect("clock");
|
||||
let legacy = json!({"deployment":"runner","bucket":"photos","input_prefix":"input/",
|
||||
"output_prefix":"output/","expires_at_unix_seconds":now+3600});
|
||||
let v1 = fixture
|
||||
.iam
|
||||
.create_plugin_delegation(PARENT, serde_json::from_value(legacy.clone()).expect("v1"), now)
|
||||
.await
|
||||
.expect("persist legacy delegation");
|
||||
assert_eq!(v1.version, 1);
|
||||
assert_eq!(serde_json::to_value(&v1.restrictions).expect("v1 wire"), legacy);
|
||||
let mut v2 = legacy;
|
||||
v2["version"] = json!(2);
|
||||
v2["output_bucket"] = json!("artifacts");
|
||||
let record = fixture
|
||||
.iam
|
||||
.create_plugin_delegation(PARENT, serde_json::from_value(v2.clone()).expect("v2"), now)
|
||||
.await
|
||||
.expect("persist v2 delegation");
|
||||
assert_eq!(record.version, 2);
|
||||
let loaded = fixture
|
||||
.iam
|
||||
.read_active_plugin_delegation(PARENT, &record.id, now)
|
||||
.await
|
||||
.expect("strict stored v2");
|
||||
assert!(loaded == record, "same persisted v2 identity");
|
||||
assert_eq!(serde_json::to_value(&loaded.restrictions).expect("v2 wire"), v2);
|
||||
// The record envelope and restriction profile cannot disagree on a persisted read.
|
||||
let path = format!("config/iam/plugin-delegations/v1/{}/record.json", record.id);
|
||||
let mut corrupt = serde_json::to_value(&record).expect("record JSON");
|
||||
corrupt["version"] = json!(1);
|
||||
ObjectStore::new(fixture.store.clone())
|
||||
.save_iam_config(corrupt, &path)
|
||||
.await
|
||||
.expect("inject incompatible stored version");
|
||||
assert!(
|
||||
fixture
|
||||
.iam
|
||||
.read_active_plugin_delegation(PARENT, &record.id, now)
|
||||
.await
|
||||
.is_err(),
|
||||
"mixed v1/v2 stored profiles fail closed"
|
||||
);
|
||||
ObjectStore::new(fixture.store.clone())
|
||||
.save_iam_config(&record, &path)
|
||||
.await
|
||||
.expect("restore exact stored record");
|
||||
let run = uuid::Uuid::new_v4();
|
||||
let attempt = uuid::Uuid::new_v4();
|
||||
let prefix = format!("output/74656e616e74/{run}/{attempt}/");
|
||||
let body = json!({"tenant":"tenant","run_id":run,"attempt_id":attempt,"revision":record.revision,
|
||||
"deployment":"runner","input_bucket":"photos","input_key":"input/photo.png","input_version":fixture.input_version,
|
||||
"output_bucket":"artifacts","output_prefix":prefix,"ttl_seconds":60});
|
||||
let loaded_v1 = fixture
|
||||
.iam
|
||||
.read_active_plugin_delegation(PARENT, &v1.id, now)
|
||||
.await
|
||||
.expect("read legacy record");
|
||||
assert!(loaded_v1 == v1, "legacy persistent identity");
|
||||
let mut legacy_body = body.clone();
|
||||
legacy_body["revision"] = json!(v1.revision);
|
||||
legacy_body["output_bucket"] = json!("photos");
|
||||
let legacy_response = fixture.issue(&v1, &legacy_body).await.expect("legacy same-bucket issuance");
|
||||
assert_eq!(legacy_response.output.0, StatusCode::OK);
|
||||
let mut wrong = body.clone();
|
||||
wrong["output_bucket"] = json!("third");
|
||||
match fixture.issue(&record, &wrong).await {
|
||||
Err(error) => assert_eq!(error.code(), &S3ErrorCode::AccessDenied),
|
||||
Ok(_) => panic!("A03_CROSS_BUCKET_OUTPUT_BOUND"),
|
||||
}
|
||||
let response = fixture.issue(&record, &body).await.expect("actual v2 issuance");
|
||||
assert_eq!(response.output.0, StatusCode::OK);
|
||||
assert_eq!(response.headers[http::header::CACHE_CONTROL], "no-store");
|
||||
let issued: Value =
|
||||
serde_json::from_slice(&response.output.1.collect().await.expect("issued body").to_bytes()).expect("issued JSON");
|
||||
let (credential, root) = check_key_valid_with_context(
|
||||
issued["session_token"].as_str().expect("token"),
|
||||
issued["access_key_id"].as_str().expect("access key"),
|
||||
Some(fixture.context.as_ref()),
|
||||
)
|
||||
.await
|
||||
.expect("persisted actual temporary identity");
|
||||
assert!(!root && credential.is_temp());
|
||||
let output = format!("{prefix}image.png");
|
||||
for (action, bucket, object, version, expected) in [
|
||||
(
|
||||
S3Action::GetObjectVersionAction,
|
||||
"photos",
|
||||
"input/photo.png",
|
||||
Some(fixture.input_version.as_str()),
|
||||
true,
|
||||
),
|
||||
(
|
||||
S3Action::GetObjectVersionAction,
|
||||
"photos",
|
||||
"input/photo.png",
|
||||
Some("wrong-version"),
|
||||
false,
|
||||
),
|
||||
(S3Action::GetObjectAction, "photos", "input/photo.png", None, false),
|
||||
(S3Action::PutObjectAction, "artifacts", output.as_str(), None, true),
|
||||
(S3Action::PutObjectAction, "photos", output.as_str(), None, false),
|
||||
(S3Action::PutObjectAction, "third", output.as_str(), None, false),
|
||||
(S3Action::PutObjectAction, "artifacts", "output/other/image.png", None, false),
|
||||
] {
|
||||
assert_eq!(
|
||||
fixture.allowed(&credential, action, bucket, object, version).await,
|
||||
expected,
|
||||
"A03_CROSS_BUCKET_PARENT_INTERSECTION: bucket={bucket} object={object}"
|
||||
);
|
||||
}
|
||||
fixture.policy(PARENT, Fixture::parent_policy(true, true)).await;
|
||||
assert!(
|
||||
!fixture
|
||||
.allowed(&credential, S3Action::PutObjectAction, "artifacts", &output, None)
|
||||
.await,
|
||||
"explicit parent Deny remains effective"
|
||||
);
|
||||
fixture.policy(PARENT, Fixture::parent_policy(false, false)).await;
|
||||
assert!(
|
||||
!fixture
|
||||
.allowed(&credential, S3Action::PutObjectAction, "artifacts", &output, None)
|
||||
.await,
|
||||
"removing parent output permission remains effective"
|
||||
);
|
||||
assert!(
|
||||
fixture
|
||||
.allowed(
|
||||
&credential,
|
||||
S3Action::GetObjectVersionAction,
|
||||
"photos",
|
||||
"input/photo.png",
|
||||
Some(&fixture.input_version)
|
||||
)
|
||||
.await
|
||||
);
|
||||
fixture
|
||||
.iam
|
||||
.revoke_plugin_delegation(PARENT, &record.id)
|
||||
.await
|
||||
.expect("revoke v2");
|
||||
assert!(fixture.issue(&record, &body).await.is_err(), "revoked v2 cannot issue again");
|
||||
},
|
||||
)
|
||||
.await;
|
||||
}
|
||||
@@ -1,624 +0,0 @@
|
||||
// Copyright 2026 RustFS Team
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
//! Restriction registration only. These endpoints do not vend credentials.
|
||||
use crate::admin::{
|
||||
auth::{AdminResourceScope, validate_admin_action_with_bucket_object_for_iam},
|
||||
plugin_runner::{self, ObjectReference, SubmitRequest},
|
||||
router::{AdminOperation, Operation, S3Router},
|
||||
runtime_sources,
|
||||
storage_api::s3::{self, Body, S3Error, S3ErrorCode, S3Request, S3Response, S3Result},
|
||||
};
|
||||
use crate::{
|
||||
auth::{check_key_valid_with_context, get_session_token},
|
||||
server::{ADMIN_PREFIX, RemoteAddr},
|
||||
};
|
||||
use http::{HeaderMap, HeaderValue, Method, StatusCode};
|
||||
use matchit::Params;
|
||||
use rustfs_iam::delegation::{DelegationError, Restrictions};
|
||||
use rustfs_policy::policy::action::{Action, AdminAction};
|
||||
use serde::Deserialize;
|
||||
use std::time::{Duration, SystemTime, UNIX_EPOCH};
|
||||
|
||||
pub fn register_plugin_delegation_route(router: &mut S3Router<AdminOperation>) -> std::io::Result<()> {
|
||||
router.insert(Method::POST, &format!("{ADMIN_PREFIX}/v3/plugin-delegations"), AdminOperation(&Create))?;
|
||||
router.insert(Method::GET, &format!("{ADMIN_PREFIX}/v3/plugin-delegations/{{id}}"), AdminOperation(&Get))?;
|
||||
router.insert(
|
||||
Method::POST,
|
||||
&format!("{ADMIN_PREFIX}/v3/plugin-delegations/{{id}}/revoke"),
|
||||
AdminOperation(&Revoke),
|
||||
)?;
|
||||
router.insert(
|
||||
Method::POST,
|
||||
&format!("{ADMIN_PREFIX}/v3/plugin-delegations/{{id}}/submit"),
|
||||
AdminOperation(&Submit),
|
||||
)?;
|
||||
router.insert(
|
||||
Method::POST,
|
||||
&format!("{ADMIN_PREFIX}/v3/plugin-delegations/{{id}}/runs/query"),
|
||||
AdminOperation(&QueryRun),
|
||||
)?;
|
||||
router.insert(
|
||||
Method::POST,
|
||||
&format!("{ADMIN_PREFIX}/v3/plugin-delegations/{{id}}/runs/history"),
|
||||
AdminOperation(&HistoryRun),
|
||||
)?;
|
||||
router.insert(
|
||||
Method::POST,
|
||||
&format!("{ADMIN_PREFIX}/v3/plugin-delegations/{{id}}/runs/cancel"),
|
||||
AdminOperation(&CancelRun),
|
||||
)?;
|
||||
router.insert(
|
||||
Method::POST,
|
||||
&format!("{ADMIN_PREFIX}/v3/plugin-delegations/{{id}}/runs/page"),
|
||||
AdminOperation(&PageRuns),
|
||||
)?;
|
||||
router.insert(
|
||||
Method::POST,
|
||||
&format!("{ADMIN_PREFIX}/v3/plugin-delegations/{{id}}/runs/replay"),
|
||||
AdminOperation(&ReplayRun),
|
||||
)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(super) fn storage_error(error: DelegationError) -> S3Error {
|
||||
match error {
|
||||
DelegationError::Invalid => s3::error(S3ErrorCode::InvalidRequest, "invalid delegation restriction"),
|
||||
DelegationError::NotFound | DelegationError::OwnerRejected => s3::error(S3ErrorCode::NoSuchKey, "delegation not found"),
|
||||
DelegationError::Unavailable => s3::error(S3ErrorCode::InternalError, "delegation unavailable"),
|
||||
_ => s3::error(S3ErrorCode::AccessDenied, "delegation rejected"),
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) async fn owner(
|
||||
req: &S3Request<Body>,
|
||||
action: AdminAction,
|
||||
) -> S3Result<(std::sync::Arc<rustfs_iam::sys::IamSys<rustfs_iam::store::object::ObjectStore>>, String)> {
|
||||
let signed = req
|
||||
.credentials
|
||||
.as_ref()
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::AccessDenied, "authentication required"))?;
|
||||
if get_session_token(&req.uri, &req.headers).is_some() {
|
||||
return Err(s3::error(S3ErrorCode::AccessDenied, "original user required"));
|
||||
}
|
||||
let context = runtime_sources::app_context_from_req(req)
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InternalError, "application context unavailable"))?;
|
||||
let (credentials, root) = check_key_valid_with_context("", &signed.access_key, Some(context.as_ref())).await?;
|
||||
if root || credentials.is_temp() || credentials.is_service_account() {
|
||||
return Err(s3::error(S3ErrorCode::AccessDenied, "original user required"));
|
||||
}
|
||||
if !context.iam().is_ready() {
|
||||
return Err(s3::error(S3ErrorCode::InternalError, "iam unavailable"));
|
||||
}
|
||||
let iam = context.iam().handle();
|
||||
validate_admin_action_with_bucket_object_for_iam(
|
||||
iam.clone(),
|
||||
&req.headers,
|
||||
&credentials,
|
||||
false,
|
||||
Action::AdminAction(action),
|
||||
req.extensions.get::<Option<RemoteAddr>>().and_then(|a| a.map(|a| a.0)),
|
||||
AdminResourceScope::bucket_object("", ""),
|
||||
)
|
||||
.await?;
|
||||
Ok((iam, credentials.access_key))
|
||||
}
|
||||
|
||||
pub(super) fn response<T: serde::Serialize>(value: &T) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let bytes =
|
||||
serde_json::to_vec(value).map_err(|_| s3::error(S3ErrorCode::InternalError, "delegation response unavailable"))?;
|
||||
let mut headers = HeaderMap::new();
|
||||
headers.insert(http::header::CONTENT_TYPE, HeaderValue::from_static("application/json"));
|
||||
headers.insert(http::header::CACHE_CONTROL, HeaderValue::from_static("no-store"));
|
||||
Ok(S3Response::with_headers((StatusCode::OK, Body::from(bytes)), headers))
|
||||
}
|
||||
|
||||
struct Create;
|
||||
#[async_trait::async_trait]
|
||||
impl Operation for Create {
|
||||
async fn call(&self, mut req: S3Request<Body>, _params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let (iam, owner) = owner(&req, AdminAction::CreatePluginDelegationAction).await?;
|
||||
let bytes = tokio::time::timeout(Duration::from_secs(10), req.input.store_all_limited(16384))
|
||||
.await
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "delegation body unavailable"))?
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "delegation body unavailable"))?;
|
||||
let restriction: Restrictions = serde_json::from_slice(&bytes)
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "invalid delegation restriction"))?;
|
||||
let now = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.map_err(|_| s3::error(S3ErrorCode::InternalError, "clock unavailable"))?
|
||||
.as_secs();
|
||||
let record = iam
|
||||
.create_plugin_delegation(&owner, restriction, now)
|
||||
.await
|
||||
.map_err(storage_error)?;
|
||||
response(&record)
|
||||
}
|
||||
}
|
||||
|
||||
struct Get;
|
||||
#[async_trait::async_trait]
|
||||
impl Operation for Get {
|
||||
async fn call(&self, req: S3Request<Body>, params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let (iam, owner) = owner(&req, AdminAction::GetPluginDelegationAction).await?;
|
||||
let id = params
|
||||
.get("id")
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InvalidRequest, "delegation id required"))?;
|
||||
let now = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.map_err(|_| s3::error(S3ErrorCode::InternalError, "clock unavailable"))?
|
||||
.as_secs();
|
||||
let record = iam
|
||||
.read_active_plugin_delegation(&owner, id, now)
|
||||
.await
|
||||
.map_err(storage_error)?;
|
||||
response(&record)
|
||||
}
|
||||
}
|
||||
|
||||
struct Revoke;
|
||||
#[async_trait::async_trait]
|
||||
impl Operation for Revoke {
|
||||
async fn call(&self, req: S3Request<Body>, params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let (iam, owner) = owner(&req, AdminAction::RevokePluginDelegationAction).await?;
|
||||
let id = params
|
||||
.get("id")
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InvalidRequest, "delegation id required"))?;
|
||||
iam.revoke_plugin_delegation(&owner, id).await.map_err(storage_error)?;
|
||||
response(&serde_json::json!({"revoked":true,"id":id}))
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct SubmitInput {
|
||||
version: u32,
|
||||
instance_id: String,
|
||||
idempotency_key: String,
|
||||
object: SubmitObject,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct SubmitObject {
|
||||
bucket: String,
|
||||
key: String,
|
||||
version_id: String,
|
||||
}
|
||||
|
||||
struct Submit;
|
||||
#[async_trait::async_trait]
|
||||
impl Operation for Submit {
|
||||
async fn call(&self, mut req: S3Request<Body>, params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let (iam, signer) = owner(&req, AdminAction::SubmitPluginJobAction).await?;
|
||||
let id = params
|
||||
.get("id")
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InvalidRequest, "delegation id required"))?;
|
||||
let bytes = tokio::time::timeout(Duration::from_secs(10), req.input.store_all_limited(16384))
|
||||
.await
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "submit body unavailable"))?
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "submit body unavailable"))?;
|
||||
let input: SubmitInput =
|
||||
serde_json::from_slice(&bytes).map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "invalid submit request"))?;
|
||||
if input.version != 1
|
||||
|| !plugin_runner::literal(&input.instance_id)
|
||||
|| !plugin_runner::valid_idempotency_key(&input.idempotency_key)
|
||||
{
|
||||
return Err(s3::error(S3ErrorCode::InvalidRequest, "invalid submit request"));
|
||||
}
|
||||
let now = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.map_err(|_| s3::error(S3ErrorCode::InternalError, "clock unavailable"))?
|
||||
.as_secs();
|
||||
let record = iam
|
||||
.read_active_plugin_delegation(&signer, id, now)
|
||||
.await
|
||||
.map_err(storage_error)?;
|
||||
let deployment = plugin_runner::configured_deployment()?;
|
||||
if !plugin_runner::validate_delegation_scope(
|
||||
&record,
|
||||
&signer,
|
||||
id,
|
||||
&deployment,
|
||||
ObjectReference {
|
||||
bucket: &input.object.bucket,
|
||||
key: &input.object.key,
|
||||
version_id: &input.object.version_id,
|
||||
},
|
||||
now,
|
||||
) {
|
||||
return Err(s3::error(S3ErrorCode::AccessDenied, "submit restriction rejected"));
|
||||
}
|
||||
let receipt = plugin_runner::submit(&SubmitRequest {
|
||||
version: input.version,
|
||||
instance_id: &input.instance_id,
|
||||
idempotency_key: &input.idempotency_key,
|
||||
object: ObjectReference {
|
||||
bucket: &input.object.bucket,
|
||||
key: &input.object.key,
|
||||
version_id: &input.object.version_id,
|
||||
},
|
||||
delegation_id: &record.id,
|
||||
delegation_revision: &record.revision,
|
||||
actual_signer_access_key: &signer,
|
||||
})
|
||||
.await?;
|
||||
response(&receipt)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct QueryRunInput {
|
||||
version: u32,
|
||||
run_id: uuid::Uuid,
|
||||
}
|
||||
|
||||
struct QueryRun;
|
||||
#[async_trait::async_trait]
|
||||
impl Operation for QueryRun {
|
||||
async fn call(&self, mut req: S3Request<Body>, params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let (iam, signer) = owner(&req, AdminAction::GetPluginRunAction).await?;
|
||||
let id = params
|
||||
.get("id")
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InvalidRequest, "delegation id required"))?;
|
||||
let bytes = tokio::time::timeout(Duration::from_secs(10), req.input.store_all_limited(16384))
|
||||
.await
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "query body unavailable"))?
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "query body unavailable"))?;
|
||||
let input: QueryRunInput =
|
||||
serde_json::from_slice(&bytes).map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "invalid query request"))?;
|
||||
if input.version != 1 || input.run_id.is_nil() {
|
||||
return Err(s3::error(S3ErrorCode::InvalidRequest, "invalid query request"));
|
||||
}
|
||||
let record = iam.read_owned_plugin_delegation(&signer, id).await.map_err(storage_error)?;
|
||||
let result = plugin_runner::query(&plugin_runner::QueryRequest {
|
||||
version: input.version,
|
||||
run_id: input.run_id,
|
||||
delegation_id: &record.id,
|
||||
delegation_revision: &record.revision,
|
||||
actual_signer_access_key: &signer,
|
||||
})
|
||||
.await?;
|
||||
response(&result)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct HistoryRunInput {
|
||||
version: u32,
|
||||
run_id: uuid::Uuid,
|
||||
}
|
||||
|
||||
fn valid_history_run_input(input: &HistoryRunInput) -> bool {
|
||||
input.version == 1 && !input.run_id.is_nil()
|
||||
}
|
||||
|
||||
struct HistoryRun;
|
||||
#[async_trait::async_trait]
|
||||
impl Operation for HistoryRun {
|
||||
async fn call(&self, mut req: S3Request<Body>, params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let (iam, signer) = owner(&req, AdminAction::ListPluginRunsAction).await?;
|
||||
let id = params
|
||||
.get("id")
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InvalidRequest, "delegation id required"))?;
|
||||
let bytes = tokio::time::timeout(Duration::from_secs(10), req.input.store_all_limited(16384))
|
||||
.await
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "history body unavailable"))?
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "history body unavailable"))?;
|
||||
let input: HistoryRunInput =
|
||||
serde_json::from_slice(&bytes).map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "invalid history request"))?;
|
||||
if !valid_history_run_input(&input) {
|
||||
return Err(s3::error(S3ErrorCode::InvalidRequest, "invalid history request"));
|
||||
}
|
||||
let record = iam.read_owned_plugin_delegation(&signer, id).await.map_err(storage_error)?;
|
||||
let result = plugin_runner::history(&plugin_runner::HistoryRequest {
|
||||
version: input.version,
|
||||
run_id: input.run_id,
|
||||
delegation_id: &record.id,
|
||||
delegation_revision: &record.revision,
|
||||
actual_signer_access_key: &signer,
|
||||
})
|
||||
.await?;
|
||||
response(&result)
|
||||
}
|
||||
}
|
||||
|
||||
struct CancelRun;
|
||||
#[async_trait::async_trait]
|
||||
impl Operation for CancelRun {
|
||||
async fn call(&self, mut req: S3Request<Body>, params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let (iam, signer) = owner(&req, AdminAction::CancelPluginRunAction).await?;
|
||||
let id = params
|
||||
.get("id")
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InvalidRequest, "delegation id required"))?;
|
||||
let bytes = tokio::time::timeout(Duration::from_secs(10), req.input.store_all_limited(16384))
|
||||
.await
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "cancel body unavailable"))?
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "cancel body unavailable"))?;
|
||||
let input: QueryRunInput =
|
||||
serde_json::from_slice(&bytes).map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "invalid cancel request"))?;
|
||||
if input.version != 1 || input.run_id.is_nil() {
|
||||
return Err(s3::error(S3ErrorCode::InvalidRequest, "invalid cancel request"));
|
||||
}
|
||||
let record = iam.read_owned_plugin_delegation(&signer, id).await.map_err(storage_error)?;
|
||||
let result = plugin_runner::cancel(&plugin_runner::CancelRequest {
|
||||
version: input.version,
|
||||
run_id: input.run_id,
|
||||
delegation_id: &record.id,
|
||||
delegation_revision: &record.revision,
|
||||
actual_signer_access_key: &signer,
|
||||
})
|
||||
.await?;
|
||||
response(&result)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct PageRunsInput {
|
||||
version: u32,
|
||||
limit: u32,
|
||||
#[serde(default)]
|
||||
cursor: Option<plugin_runner::RunPageCursor>,
|
||||
}
|
||||
|
||||
fn valid_page_runs_input(input: &PageRunsInput) -> bool {
|
||||
input.version == 1 && (1..=100).contains(&input.limit) && !input.cursor.is_some_and(|cursor| cursor.run_id.is_nil())
|
||||
}
|
||||
|
||||
struct PageRuns;
|
||||
#[async_trait::async_trait]
|
||||
impl Operation for PageRuns {
|
||||
async fn call(&self, mut req: S3Request<Body>, params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let (iam, signer) = owner(&req, AdminAction::ListPluginRunsAction).await?;
|
||||
let id = params
|
||||
.get("id")
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InvalidRequest, "delegation id required"))?;
|
||||
let bytes = tokio::time::timeout(Duration::from_secs(10), req.input.store_all_limited(16384))
|
||||
.await
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "page body unavailable"))?
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "page body unavailable"))?;
|
||||
let input: PageRunsInput =
|
||||
serde_json::from_slice(&bytes).map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "invalid page request"))?;
|
||||
if !valid_page_runs_input(&input) {
|
||||
return Err(s3::error(S3ErrorCode::InvalidRequest, "invalid page request"));
|
||||
}
|
||||
let record = iam.read_owned_plugin_delegation(&signer, id).await.map_err(storage_error)?;
|
||||
let result = plugin_runner::page(&plugin_runner::PageRequest {
|
||||
version: input.version,
|
||||
actual_signer_access_key: &signer,
|
||||
delegation_id: &record.id,
|
||||
delegation_revision: &record.revision,
|
||||
limit: input.limit,
|
||||
cursor: input.cursor,
|
||||
})
|
||||
.await?;
|
||||
response(&result)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct ReplayRunInput {
|
||||
version: u32,
|
||||
origin_run_id: uuid::Uuid,
|
||||
idempotency_key: String,
|
||||
deadline_unix_micros: i64,
|
||||
}
|
||||
|
||||
fn valid_replay_run_input(input: &ReplayRunInput) -> bool {
|
||||
input.version == 1
|
||||
&& !input.origin_run_id.is_nil()
|
||||
&& plugin_runner::valid_idempotency_key(&input.idempotency_key)
|
||||
&& input.deadline_unix_micros > 0
|
||||
}
|
||||
|
||||
struct ReplayRun;
|
||||
#[async_trait::async_trait]
|
||||
impl Operation for ReplayRun {
|
||||
async fn call(&self, mut req: S3Request<Body>, params: Params<'_, '_>) -> S3Result<S3Response<(StatusCode, Body)>> {
|
||||
let (iam, signer) = owner(&req, AdminAction::ReplayPluginRunAction).await?;
|
||||
let id = params
|
||||
.get("id")
|
||||
.ok_or_else(|| s3::error(S3ErrorCode::InvalidRequest, "delegation id required"))?;
|
||||
let bytes = tokio::time::timeout(Duration::from_secs(10), req.input.store_all_limited(16384))
|
||||
.await
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "replay body unavailable"))?
|
||||
.map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "replay body unavailable"))?;
|
||||
let input: ReplayRunInput =
|
||||
serde_json::from_slice(&bytes).map_err(|_| s3::error(S3ErrorCode::InvalidRequest, "invalid replay request"))?;
|
||||
if !valid_replay_run_input(&input) {
|
||||
return Err(s3::error(S3ErrorCode::InvalidRequest, "invalid replay request"));
|
||||
}
|
||||
let now = SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.map_err(|_| s3::error(S3ErrorCode::InternalError, "clock unavailable"))?
|
||||
.as_secs();
|
||||
let record = iam
|
||||
.read_active_plugin_delegation(&signer, id, now)
|
||||
.await
|
||||
.map_err(storage_error)?;
|
||||
let result = plugin_runner::replay(&plugin_runner::ReplayRequest {
|
||||
version: input.version,
|
||||
origin_run_id: input.origin_run_id,
|
||||
idempotency_key: &input.idempotency_key,
|
||||
deadline_unix_micros: input.deadline_unix_micros,
|
||||
actual_signer_access_key: &signer,
|
||||
delegation_id: &record.id,
|
||||
delegation_revision: &record.revision,
|
||||
})
|
||||
.await?;
|
||||
response(&result)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[tokio::test]
|
||||
async fn delegation_mutations_require_authenticated_original_user() {
|
||||
for operation in 0..8 {
|
||||
let req = S3Request {
|
||||
input: Body::from("{}".to_owned()),
|
||||
method: Method::POST,
|
||||
uri: http::Uri::from_static("/rustfs/admin/v3/plugin-delegations"),
|
||||
headers: HeaderMap::new(),
|
||||
extensions: http::Extensions::new(),
|
||||
credentials: None,
|
||||
region: None,
|
||||
service: None,
|
||||
trailing_headers: None,
|
||||
};
|
||||
let result = if operation == 0 {
|
||||
Get.call(req, Params::new()).await
|
||||
} else if operation == 1 {
|
||||
Revoke.call(req, Params::new()).await
|
||||
} else if operation == 2 {
|
||||
Submit.call(req, Params::new()).await
|
||||
} else if operation == 3 {
|
||||
QueryRun.call(req, Params::new()).await
|
||||
} else if operation == 4 {
|
||||
HistoryRun.call(req, Params::new()).await
|
||||
} else if operation == 5 {
|
||||
CancelRun.call(req, Params::new()).await
|
||||
} else if operation == 6 {
|
||||
PageRuns.call(req, Params::new()).await
|
||||
} else if operation == 7 {
|
||||
ReplayRun.call(req, Params::new()).await
|
||||
} else {
|
||||
Create.call(req, Params::new()).await
|
||||
};
|
||||
let error = result.expect_err("unsigned mutations must not reach persistence");
|
||||
assert_eq!(error.code(), &S3ErrorCode::AccessDenied);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn submit_dto_rejects_client_authority_fields_and_null_versions() {
|
||||
assert!(serde_json::from_str::<SubmitInput>(
|
||||
r#"{"version":1,"instance_id":"img","idempotency_key":"k","object":{"bucket":"b","key":"k","version_id":"v"},"actual_signer_access_key":"forged"}"#
|
||||
)
|
||||
.is_err());
|
||||
let input: SubmitInput = serde_json::from_str(
|
||||
r#"{"version":1,"instance_id":"img","idempotency_key":"k","object":{"bucket":"b","key":"a/x","version_id":"null"}}"#,
|
||||
)
|
||||
.unwrap();
|
||||
let record = rustfs_iam::delegation::Delegation {
|
||||
version: 1,
|
||||
id: "a".repeat(32),
|
||||
revision: "a".repeat(32),
|
||||
owner_access_key: "owner".into(),
|
||||
created_at_unix_seconds: 1,
|
||||
restrictions: Restrictions {
|
||||
version: None,
|
||||
output_bucket: None,
|
||||
deployment: "prod".into(),
|
||||
bucket: "b".into(),
|
||||
input_prefix: "a/".into(),
|
||||
output_prefix: "out/".into(),
|
||||
expires_at_unix_seconds: 100,
|
||||
},
|
||||
};
|
||||
assert!(!plugin_runner::validate_delegation_scope(
|
||||
&record,
|
||||
"owner",
|
||||
&record.id,
|
||||
"prod",
|
||||
ObjectReference {
|
||||
bucket: &input.object.bucket,
|
||||
key: &input.object.key,
|
||||
version_id: &input.object.version_id,
|
||||
},
|
||||
2,
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn query_run_dto_rejects_client_authority_fields() {
|
||||
let run_id = uuid::Uuid::from_u128(1);
|
||||
let input: QueryRunInput =
|
||||
serde_json::from_str(&format!(r#"{{"version":1,"run_id":"{run_id}"}}"#)).expect("valid run query");
|
||||
assert_eq!(input.run_id, run_id);
|
||||
assert!(
|
||||
serde_json::from_str::<QueryRunInput>(&format!(
|
||||
r#"{{"version":1,"run_id":"{run_id}","actual_signer_access_key":"forged"}}"#
|
||||
))
|
||||
.is_err()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn history_run_dto_is_strict_and_rejects_nil_run() {
|
||||
let run_id = uuid::Uuid::from_u128(1);
|
||||
let input: HistoryRunInput =
|
||||
serde_json::from_str(&format!(r#"{{"version":1,"run_id":"{run_id}"}}"#)).expect("valid history request");
|
||||
assert!(valid_history_run_input(&input));
|
||||
for raw in [
|
||||
r#"{"version":1,"run_id":"00000000-0000-0000-0000-000000000000"}"#,
|
||||
r#"{"version":2,"run_id":"00000000-0000-0000-0000-000000000001"}"#,
|
||||
r#"{"version":1,"run_id":"00000000-0000-0000-0000-000000000001","actual_signer_access_key":"forged"}"#,
|
||||
] {
|
||||
let rejected = match serde_json::from_str::<HistoryRunInput>(raw) {
|
||||
Ok(input) => !valid_history_run_input(&input),
|
||||
Err(_) => true,
|
||||
};
|
||||
assert!(rejected, "accepted invalid history request: {raw}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_runs_dto_is_strict_and_bounded() {
|
||||
let cursor = plugin_runner::RunPageCursor {
|
||||
created_at_unix_micros: 10,
|
||||
run_id: uuid::Uuid::from_u128(1),
|
||||
};
|
||||
let input: PageRunsInput = serde_json::from_str(
|
||||
r#"{"version":1,"limit":100,"cursor":{"created_at_unix_micros":10,"run_id":"00000000-0000-0000-0000-000000000001"}}"#,
|
||||
)
|
||||
.expect("valid page request");
|
||||
assert_eq!(input.cursor, Some(cursor));
|
||||
for raw in [
|
||||
r#"{"version":1,"limit":0}"#,
|
||||
r#"{"version":1,"limit":101}"#,
|
||||
r#"{"version":1,"limit":1,"unknown":true}"#,
|
||||
r#"{"version":1,"limit":1,"actual_signer_access_key":"forged"}"#,
|
||||
r#"{"version":1,"limit":1,"cursor":{"created_at_unix_micros":10,"run_id":"00000000-0000-0000-0000-000000000000"}}"#,
|
||||
] {
|
||||
let rejected = match serde_json::from_str::<PageRunsInput>(raw) {
|
||||
Ok(input) => !valid_page_runs_input(&input),
|
||||
Err(_) => true,
|
||||
};
|
||||
assert!(rejected, "accepted invalid page request: {raw}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn replay_run_dto_is_strict_and_bounded() {
|
||||
let run_id = uuid::Uuid::from_u128(1);
|
||||
let input: ReplayRunInput = serde_json::from_str(&format!(
|
||||
r#"{{"version":1,"origin_run_id":"{run_id}","idempotency_key":"retry-1","deadline_unix_micros":123}}"#
|
||||
))
|
||||
.expect("valid replay request");
|
||||
assert!(valid_replay_run_input(&input));
|
||||
for raw in [
|
||||
r#"{"version":1,"origin_run_id":"00000000-0000-0000-0000-000000000000","idempotency_key":"k","deadline_unix_micros":123}"#.to_string(),
|
||||
format!(r#"{{"version":1,"origin_run_id":"{run_id}","idempotency_key":"","deadline_unix_micros":123}}"#),
|
||||
format!(r#"{{"version":1,"origin_run_id":"{run_id}","idempotency_key":"k","deadline_unix_micros":0}}"#),
|
||||
format!(
|
||||
r#"{{"version":1,"origin_run_id":"{run_id}","idempotency_key":"k","deadline_unix_micros":123,"actual_signer_access_key":"forged"}}"#
|
||||
),
|
||||
format!(
|
||||
r#"{{"version":1,"origin_run_id":"{run_id}","idempotency_key":"{}","deadline_unix_micros":123}}"#,
|
||||
"x".repeat(1025)
|
||||
),
|
||||
] {
|
||||
let rejected = match serde_json::from_str::<ReplayRunInput>(&raw) {
|
||||
Ok(input) => !valid_replay_run_input(&input),
|
||||
Err(_) => true,
|
||||
};
|
||||
assert!(rejected, "accepted invalid replay request: {raw}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -17,7 +17,6 @@ mod auth;
|
||||
pub mod console;
|
||||
pub mod handlers;
|
||||
mod plugin_contract;
|
||||
pub(crate) mod plugin_runner;
|
||||
pub(crate) mod replication_metrics_wire;
|
||||
// Contract inventory is validated by tests before later runtime integration.
|
||||
pub(crate) mod route_policy;
|
||||
@@ -65,8 +64,6 @@ pub fn make_admin_route(
|
||||
fn register_admin_routes(r: &mut S3Router<AdminOperation>) -> std::io::Result<()> {
|
||||
health::register_health_route(r)?;
|
||||
sts::register_admin_auth_route(r)?;
|
||||
handlers::plugin_delegation::register_plugin_delegation_route(r)?;
|
||||
handlers::plugin_attempt::register_plugin_attempt_route(r)?;
|
||||
|
||||
account::register_account_route(r)?;
|
||||
mfa::register_mfa_route(r)?;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -25,15 +25,6 @@ const TLS_CERTIFICATE_PUBLISH: AdminActionRef = AdminActionRef::new("TLSCertific
|
||||
const TLS_CERTIFICATE_STATUS: AdminActionRef = AdminActionRef::new("TLSCertificateStatusAdminAction");
|
||||
const CONSOLE_LOG: AdminActionRef = AdminActionRef::new("ConsoleLogAdminAction");
|
||||
const COMMIT_TABLE: AdminActionRef = AdminActionRef::new("CommitTableAction");
|
||||
const ISSUE_PLUGIN_ATTEMPT: AdminActionRef = AdminActionRef::new("IssuePluginAttemptAction");
|
||||
const SUBMIT_PLUGIN_JOB: AdminActionRef = AdminActionRef::new("SubmitPluginJobAction");
|
||||
const GET_PLUGIN_RUN: AdminActionRef = AdminActionRef::new("GetPluginRunAction");
|
||||
const CANCEL_PLUGIN_RUN: AdminActionRef = AdminActionRef::new("CancelPluginRunAction");
|
||||
const LIST_PLUGIN_RUNS: AdminActionRef = AdminActionRef::new("ListPluginRunsAction");
|
||||
const REPLAY_PLUGIN_RUN: AdminActionRef = AdminActionRef::new("ReplayPluginRunAction");
|
||||
const GET_PLUGIN_DELEGATION: AdminActionRef = AdminActionRef::new("GetPluginDelegationAction");
|
||||
const CREATE_PLUGIN_DELEGATION: AdminActionRef = AdminActionRef::new("CreatePluginDelegationAction");
|
||||
const REVOKE_PLUGIN_DELEGATION: AdminActionRef = AdminActionRef::new("RevokePluginDelegationAction");
|
||||
const CREATE_POLICY: AdminActionRef = AdminActionRef::new("CreatePolicyAdminAction");
|
||||
const CREATE_USER: AdminActionRef = AdminActionRef::new("CreateUserAdminAction");
|
||||
const CREATE_SERVICE_ACCOUNT: AdminActionRef = AdminActionRef::new("CreateServiceAccountAdminAction");
|
||||
@@ -665,66 +656,6 @@ pub const ADMIN_ROUTE_POLICY_SPECS: &[AdminRouteSpec] = &[
|
||||
SERVER_INFO,
|
||||
RouteRiskLevel::Sensitive,
|
||||
),
|
||||
admin(
|
||||
HttpMethod::Post,
|
||||
"/rustfs/admin/v3/plugin-delegations/{id}/issue-attempt",
|
||||
ISSUE_PLUGIN_ATTEMPT,
|
||||
RouteRiskLevel::High,
|
||||
),
|
||||
admin(
|
||||
HttpMethod::Post,
|
||||
"/rustfs/admin/v3/plugin-delegations/{id}/submit",
|
||||
SUBMIT_PLUGIN_JOB,
|
||||
RouteRiskLevel::High,
|
||||
),
|
||||
admin(
|
||||
HttpMethod::Post,
|
||||
"/rustfs/admin/v3/plugin-delegations/{id}/runs/query",
|
||||
GET_PLUGIN_RUN,
|
||||
RouteRiskLevel::Sensitive,
|
||||
),
|
||||
admin(
|
||||
HttpMethod::Post,
|
||||
"/rustfs/admin/v3/plugin-delegations/{id}/runs/history",
|
||||
LIST_PLUGIN_RUNS,
|
||||
RouteRiskLevel::Sensitive,
|
||||
),
|
||||
admin(
|
||||
HttpMethod::Post,
|
||||
"/rustfs/admin/v3/plugin-delegations/{id}/runs/cancel",
|
||||
CANCEL_PLUGIN_RUN,
|
||||
RouteRiskLevel::Sensitive,
|
||||
),
|
||||
admin(
|
||||
HttpMethod::Post,
|
||||
"/rustfs/admin/v3/plugin-delegations/{id}/runs/page",
|
||||
LIST_PLUGIN_RUNS,
|
||||
RouteRiskLevel::Sensitive,
|
||||
),
|
||||
admin(
|
||||
HttpMethod::Post,
|
||||
"/rustfs/admin/v3/plugin-delegations/{id}/runs/replay",
|
||||
REPLAY_PLUGIN_RUN,
|
||||
RouteRiskLevel::Sensitive,
|
||||
),
|
||||
admin(
|
||||
HttpMethod::Get,
|
||||
"/rustfs/admin/v3/plugin-delegations/{id}",
|
||||
GET_PLUGIN_DELEGATION,
|
||||
RouteRiskLevel::Sensitive,
|
||||
),
|
||||
admin(
|
||||
HttpMethod::Post,
|
||||
"/rustfs/admin/v3/plugin-delegations",
|
||||
CREATE_PLUGIN_DELEGATION,
|
||||
RouteRiskLevel::High,
|
||||
),
|
||||
admin(
|
||||
HttpMethod::Post,
|
||||
"/rustfs/admin/v3/plugin-delegations/{id}/revoke",
|
||||
REVOKE_PLUGIN_DELEGATION,
|
||||
RouteRiskLevel::High,
|
||||
),
|
||||
admin(
|
||||
HttpMethod::Get,
|
||||
"/rustfs/admin/v4/plugins/catalog",
|
||||
@@ -2002,72 +1933,6 @@ mod tests {
|
||||
assert!(validate_admin_route_policy_specs().is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn plugin_submit_route_is_registered_as_high_risk_authenticated_action() {
|
||||
let path = "/rustfs/admin/v3/plugin-delegations/{id}/submit";
|
||||
assert_action(HttpMethod::Post, path, SUBMIT_PLUGIN_JOB);
|
||||
let spec = ADMIN_ROUTE_POLICY_SPECS
|
||||
.iter()
|
||||
.find(|spec| spec.method() == HttpMethod::Post && spec.path() == path)
|
||||
.expect("submit route policy");
|
||||
assert_eq!(spec.risk_level(), RouteRiskLevel::High);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn plugin_run_query_route_uses_dedicated_authenticated_action() {
|
||||
let path = "/rustfs/admin/v3/plugin-delegations/{id}/runs/query";
|
||||
assert_action(HttpMethod::Post, path, GET_PLUGIN_RUN);
|
||||
let spec = ADMIN_ROUTE_POLICY_SPECS
|
||||
.iter()
|
||||
.find(|spec| spec.method() == HttpMethod::Post && spec.path() == path)
|
||||
.expect("plugin run query route policy");
|
||||
assert_eq!(spec.risk_level(), RouteRiskLevel::Sensitive);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn plugin_run_history_route_uses_list_action() {
|
||||
let path = "/rustfs/admin/v3/plugin-delegations/{id}/runs/history";
|
||||
assert_action(HttpMethod::Post, path, LIST_PLUGIN_RUNS);
|
||||
let spec = ADMIN_ROUTE_POLICY_SPECS
|
||||
.iter()
|
||||
.find(|spec| spec.method() == HttpMethod::Post && spec.path() == path)
|
||||
.expect("plugin run history route policy");
|
||||
assert_eq!(spec.risk_level(), RouteRiskLevel::Sensitive);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn plugin_run_cancel_route_uses_dedicated_authenticated_action() {
|
||||
let path = "/rustfs/admin/v3/plugin-delegations/{id}/runs/cancel";
|
||||
assert_action(HttpMethod::Post, path, CANCEL_PLUGIN_RUN);
|
||||
let spec = ADMIN_ROUTE_POLICY_SPECS
|
||||
.iter()
|
||||
.find(|spec| spec.method() == HttpMethod::Post && spec.path() == path)
|
||||
.expect("plugin run cancel route policy");
|
||||
assert_eq!(spec.risk_level(), RouteRiskLevel::Sensitive);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn plugin_run_page_route_uses_dedicated_authenticated_action() {
|
||||
let path = "/rustfs/admin/v3/plugin-delegations/{id}/runs/page";
|
||||
assert_action(HttpMethod::Post, path, LIST_PLUGIN_RUNS);
|
||||
let spec = ADMIN_ROUTE_POLICY_SPECS
|
||||
.iter()
|
||||
.find(|spec| spec.method() == HttpMethod::Post && spec.path() == path)
|
||||
.expect("plugin run page route policy");
|
||||
assert_eq!(spec.risk_level(), RouteRiskLevel::Sensitive);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn plugin_run_replay_route_uses_dedicated_authenticated_action() {
|
||||
let path = "/rustfs/admin/v3/plugin-delegations/{id}/runs/replay";
|
||||
assert_action(HttpMethod::Post, path, REPLAY_PLUGIN_RUN);
|
||||
let spec = ADMIN_ROUTE_POLICY_SPECS
|
||||
.iter()
|
||||
.find(|spec| spec.method() == HttpMethod::Post && spec.path() == path)
|
||||
.expect("plugin run replay route policy");
|
||||
assert_eq!(spec.risk_level(), RouteRiskLevel::Sensitive);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn route_policy_inventory_has_no_internal_overlap() {
|
||||
let mut seen = BTreeSet::new();
|
||||
|
||||
@@ -116,48 +116,6 @@ fn registered_admin_router() -> S3Router<AdminOperation> {
|
||||
|
||||
fn expected_admin_route_matrix() -> Vec<RouteMatrixEntry> {
|
||||
vec![
|
||||
admin_route(Method::POST, "/v3/plugin-delegations"),
|
||||
admin_route_sample(Method::GET, "/v3/plugin-delegations/{id}", "/v3/plugin-delegations/test-delegation"),
|
||||
admin_route_sample(
|
||||
Method::POST,
|
||||
"/v3/plugin-delegations/{id}/revoke",
|
||||
"/v3/plugin-delegations/test-delegation/revoke",
|
||||
),
|
||||
admin_route_sample(
|
||||
Method::POST,
|
||||
"/v3/plugin-delegations/{id}/submit",
|
||||
"/v3/plugin-delegations/test-delegation/submit",
|
||||
),
|
||||
admin_route_sample(
|
||||
Method::POST,
|
||||
"/v3/plugin-delegations/{id}/runs/query",
|
||||
"/v3/plugin-delegations/test-delegation/runs/query",
|
||||
),
|
||||
admin_route_sample(
|
||||
Method::POST,
|
||||
"/v3/plugin-delegations/{id}/runs/history",
|
||||
"/v3/plugin-delegations/test-delegation/runs/history",
|
||||
),
|
||||
admin_route_sample(
|
||||
Method::POST,
|
||||
"/v3/plugin-delegations/{id}/runs/cancel",
|
||||
"/v3/plugin-delegations/test-delegation/runs/cancel",
|
||||
),
|
||||
admin_route_sample(
|
||||
Method::POST,
|
||||
"/v3/plugin-delegations/{id}/runs/page",
|
||||
"/v3/plugin-delegations/test-delegation/runs/page",
|
||||
),
|
||||
admin_route_sample(
|
||||
Method::POST,
|
||||
"/v3/plugin-delegations/{id}/runs/replay",
|
||||
"/v3/plugin-delegations/test-delegation/runs/replay",
|
||||
),
|
||||
admin_route_sample(
|
||||
Method::POST,
|
||||
"/v3/plugin-delegations/{id}/issue-attempt",
|
||||
"/v3/plugin-delegations/test-delegation/issue-attempt",
|
||||
),
|
||||
route(Method::GET, HEALTH_PREFIX),
|
||||
route(Method::HEAD, HEALTH_PREFIX),
|
||||
route(Method::GET, HEALTH_READY_PATH),
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user