fix(heal): query automatic tasks on their owning node

.agents/references/adversarial-validation.md

@@ -27,4 +27,7 @@ Risk and review shape:
   and list verified and unverified target classes in the PR Impact section.
 
 Available domain lenses are security, concurrency/durability, compatibility,
-and performance; select only those matched by the change.
+and performance. Select `.agents/skills/adversarial-validation/SKILL.md` for an
+explicit adversarial request, a high-risk change, or a substantial PR review;
+then read only its matching role references. A routine standard pass does not
+load the playbook unless the reviewer needs a RustFS-specific probe.

.agents/skills/adversarial-validation/SKILL.md

@@ -0,0 +1,48 @@
+---
+name: adversarial-validation
+description: Review RustFS diffs or designs for explicit adversarial requests, high-risk changes under the repository review policy, or substantial PR reviews. Skip ordinary questions, diagnosis, planning, status, routine low-risk implementation, and prose with no execution effect.
+---
+
+# RustFS Adversarial Validation
+
+Use the [repository risk tiers and review shape](../../references/adversarial-validation.md). This skill
+routes a review to RustFS-specific probes without loading unrelated domains.
+
+## Select Lenses
+
+Read only the references required by the diff:
+
+| Lens | When to read |
+|---|---|
+| [Correctness](references/correctness.md) | Every non-exempt adversarial review |
+| [Simplicity](references/simplicity.md) | Mechanical/standard changes and production growth |
+| [Test coverage](references/test-coverage.md) | Behavior or test changes |
+| [Security](references/security.md) | Authn/authz, IAM, RPC trust, paths, secrets, parsing, browser, encryption |
+| [Concurrency/durability](references/concurrency-durability.md) | Async shared state, locks, storage commit, cancellation, persisted queues |
+| [Compatibility](references/compatibility.md) | S3 surface, MinIO interop, metadata, wire/disk formats, mixed versions |
+| [Performance](references/performance.md) | Request/object hot paths, allocation, blocking work, fsync, fan-out |
+
+Do not read all references as a precaution. A path name alone is insufficient;
+the changed behavior must touch the lens's domain.
+
+For a dedicated security audit or advisory analysis, use
+`security-advisory-lessons` instead of loading it automatically during every
+adversarial review.
+
+## Review Protocol
+
+1. Freeze the exact final diff/head (or the design under review) and list the
+   selected lenses.
+2. Run the review shape required by the repository risk tier.
+3. For each selected lens, either report a concrete finding or a null verdict
+   naming the attacks performed.
+4. Apply root `AGENTS.md`'s finding standard. Test each candidate against callers,
+   existing coverage, and invariants before accepting it; an adversarial role
+   does not have to produce a defect.
+5. Fix or rebut supported findings with code-path, test, or invariant evidence.
+6. After a non-trivial edit, rerun only lenses affected by that edit against the
+   new exact diff.
+
+Do not turn a null verdict into a long checklist. Record concise evidence that
+the relevant failure classes were attacked, then stop under the root completion
+rule. Keep the required per-lens verdicts for high-risk PRs.

.agents/skills/adversarial-validation/references/compatibility.md

@@ -0,0 +1,38 @@
+# Compatibility Lens
+
+- Internal metadata uses `metadata_compat` helpers for dual RustFS/MinIO keys,
+  including mixed casing and removal of both twins.
+- Binary UUID metadata treats absent, empty, and nil as no value. Unversioned
+  remote tiers receive no `versionId`; versioned purge requests retain the real
+  version ID.
+- `xl.meta` changes preserve supported header/meta versions, recompute
+  signatures, decode legacy fixtures, and remain readable by old RustFS/MinIO.
+- Foreign/corrupt metadata validates parallel array lengths and missing fields;
+  it returns a decode error rather than indexing, panicking, or fabricating data.
+- Do not “correct” byte-for-byte MinIO ports without legacy fixture evidence.
+  Bitrot framing, shard math, distribution, and inline prefixes are contracts.
+- Client-visible metadata/events strip both internal prefixes
+  case-insensitively.
+- Proto fields are appended, never reused/renumbered; FlatBuffers tables extend
+  compatibly and absent new fields fail closed where authorization/quorum is
+  involved.
+- Replay real client request shapes and exact pagination boundaries for S3
+  handler changes.
+- Bucket metadata/IAM/config parsing remains compatible with pinned real MinIO
+  fixtures and encrypted migration data.
+- Compatibility shims use `RUSTFS_COMPAT_TODO(<task-id>)`, have a removal
+  condition, and default toward reading old data safely.
+
+## Outbound targets
+
+- A change to what the replication or migration client sends by default
+  (checksum policy, payload framing, headers, version-id addressing) is judged
+  against every target class, not the one it fixes. Name each target-side rule
+  the current default satisfies — checksum required with Object Lock
+  parameters, `aws-chunked` decoding, version-id adoption, ETag equals content
+  MD5 — and show which cell of
+  `crates/e2e_test/src/replication_target_matrix_test.rs` covers each.
+- A test that asserts the fix ("no trailer header") is not evidence; the
+  matrix cell that asserts the target accepted and stored the object is.
+- Every new environment escape hatch appears in
+  `docs/operations/replication-outbound-transport.md` in the same diff.

.agents/skills/adversarial-validation/references/concurrency-durability.md

@@ -0,0 +1,27 @@
+# Concurrency and Durability Lens
+
+- For every changed lock, enumerate overlapping lock sets and construct the
+  ABBA interleaving. Multiple-lock order must be documented and consistent.
+- Mark guard lifetimes and every `.await`, disk,
+  and RPC call; estimate contention/timeouts. Tokio read/write guards across
+  `.await` need bounded hold time; long-lived reads can wedge writers (#4195).
+  Keep `std::sync::Mutex` holds brief and never across `.await`.
+- Use direct `fetch_*` for unconditional atomic read-modify-write and
+  `compare_exchange` for conditional updates.
+- Object commits remain fenced if the distributed lock is lost after shard
+  writes and before metadata rename.
+- For write/rename changes, trace `write tmp -> sync tmp -> rename -> sync parent
+  -> sync required ancestors`; simulate a crash after each step and honor the
+  configured durability gate.
+- Multi-disk fan-out counts every result. Quorum-minus-one cannot become success;
+  heal remains best-effort per target where that is the established contract.
+- At every new cancellable await between mutation and cleanup/commit, drop the
+  future and inspect leftover files, counters, permits, and replay state.
+- Multipart operations on the same upload ID are serialized where required;
+  abort/complete/list races cannot delete parts before durable commit.
+- Post-commit cleanup is best-effort, retry-safe, and cannot fail an already
+  committed write or delete the last surviving copy.
+- Persisted read-modify-write uses serialization/CAS. Queue replay is crash-safe
+  and duplicate delivery has an idempotency contract.
+- Streaming reconstruction failures after partial output surface as errors, not
+  successful EOF.

.agents/skills/adversarial-validation/references/correctness.md

@@ -0,0 +1,31 @@
+# Correctness Lens
+
+Attack the changed behavior, not every subsystem in the repository.
+
+- Trace new error paths to the caller. Inject the ignored/wildcard variants and
+  verify they cannot become success, not-found, or a plausible default.
+- Exercise zero/empty/missing, maximum, and exact-boundary inputs for every
+  changed count, size, index, page limit, or optional value.
+- For aggregation/quorum changes, test exactly quorum and quorum-minus-one with
+  mixed disk errors and nil/placeholder entries.
+- For listing/pagination, test `n == max`, `n == max + 1`, delimiter folding,
+  continuation markers, and object/prefix name collisions.
+- For EC/read/streaming changes, inject failure after partial output and verify
+  the client receives an error rather than a clean truncated body. Assert exact
+  bytes and length.
+- For multipart/object commits, fail before/after rename and cleanup; committed
+  data must remain readable and pre-commit cleanup must not destroy parts.
+- Bound recursion over untrusted or persisted input; handle corrupted/cyclic
+  tree and cache traversals safely.
+- For version/index ordering, test `len - 1`, `len`, equal timestamps, missing
+  versions, and deterministic tie-breaking.
+- For directory-object behavior, trace `__XLDIR__` at the store layer; branches
+  below the layer that sees trailing slashes are dead.
+- For binary UUID metadata, absent, empty, and nil all mean no value. Never send
+  nil/empty `versionId` to an unversioned tier.
+- For agent rules/skill routers, test a trigger matrix covering ordinary
+  inquiry, low-risk implementation, explicit review, high-risk code, PR
+  creation, release, and post-PR monitoring. Each case must select only the
+  intended workflow and retain required safety/authorization boundaries.
+
+Null verdicts name only the probes relevant to the diff.

.agents/skills/adversarial-validation/references/performance.md

@@ -0,0 +1,20 @@
+# Performance Lens
+
+- For added clones/allocations on request/object/block paths, quantify copied
+  data and frequency. Recommend borrowing, move, `Bytes`/`Arc`, `Cow`, or
+  capacity reservation only for a concrete repeated cost.
+- Route every new sync/flush through the durability-mode and bucket override
+  gates; mode `none` must not pay the new fsync.
+- Keep blocking filesystem/CPU work off async runtime threads, but do not split
+  one small operation into many `spawn_blocking` round trips.
+- Measure lock hold time across I/O and compare acquisition order for ABBA.
+- Keep cleanup, extra stat/rename, and diagnostics out of the PUT commit critical
+  section when they need not be there.
+- Detect per-item serial I/O/RPC in batch APIs and accidental quadratic scans;
+  use a gate or bounded concurrency when the concrete fan-out warrants it.
+- Count buffer growth and byte copies in EC/bitrot paths; preserve pool gauge
+  balance and avoid repeated metadata decode/fetch per object.
+- Repetitive success logs stay at `trace`; metrics/instrumentation on hot paths
+  require an existing gate.
+- Claims of no impact on PUT/GET/commit/erasure paths need relevant benchmark or
+  A/B evidence, especially for 4 KiB objects.

.agents/skills/adversarial-validation/references/security.md

@@ -0,0 +1,31 @@
+# Security Lens
+
+Use `security-advisory-lessons` only for a dedicated advisory/security audit.
+For an ordinary matched diff, attack these boundaries:
+
+- Admin routes: route registration, whitelist, handler authn, and the exact
+  `AdminAction` must agree. Read-only diagnostics still require admin authz.
+- IAM/service accounts: treat parent, claims, keys, groups, status, and policy
+  names as attacker-controlled; prove ownership/root authority before writes.
+- Protocol frontends: every changed/sibling command authorizes the matching S3
+  action before reaching storage.
+- Secrets/signatures: use constant-time comparison, normalize public failures,
+  keep RPC/root/STS keys independent, and fail closed when secrets are absent.
+- RPC: bind signatures to the exact method/path and timestamp; reject replay,
+  stale, malformed, truncated, and invalid-enum payloads without panic.
+- Paths/object/archive entries: reject traversal, absolute/platform escapes,
+  and normalization differences between authz and storage.
+- Copy/multipart/presigned POST: enforce source, destination, version-aware
+  actions, copy-source conditions, and every signed policy condition.
+- Logging/errors: never expose credentials, tokens, expected signatures, raw
+  secret-bearing input, or merged configs—including via `Debug` and parse errors.
+- Untrusted serde: reject unknown fields where compatible and validate
+  security-critical defaults/ranges before numeric conversion.
+- SSE/browser/CORS/trusted proxy: inspect stored ciphertext and wrapper order;
+  isolate user content; never reflect credentialed arbitrary origins or trust
+  forwarded identity from direct clients.
+- Object Lock: unreadable/fabricated/unparsable metadata fails closed across
+  foreground, lifecycle, scanner, and force-delete paths.
+
+Security findings distinguish unauthenticated compromise from a
+low-privileged authenticated bypass.

.agents/skills/adversarial-validation/references/simplicity.md

@@ -0,0 +1,22 @@
+# Simplicity Lens
+
+- Compare the production diff with the smallest equivalent local edit. Fewer
+  lines alone are not evidence; the replacement must preserve correctness,
+  compatibility, readability, and real boundaries.
+- Search the touched crate, domain owner, `crates/utils`, `crates/common`, and
+  relevant dependencies for each new helper, constant, wrapper, or fixture.
+- Reject forced reuse when normalization, error, deadline, or durability
+  semantics differ.
+- Require a concrete trigger for every new defensive branch. Keep boundary
+  checks for disk/RPC/version data and checks immediately before destructive
+  actions.
+- Flag one-caller helpers only when they merely forward or split a short linear
+  flow without adding domain naming, invariant isolation, or useful context.
+- Ensure a replacement removes the superseded in-scope path or keeps one
+  canonical core behind a documented compatibility adapter.
+- Remove narration/change-history comments; preserve concise safety, lock,
+  durability, and compatibility invariants.
+- Treat tests, fixtures, generated code, and documentation separately from
+  production growth. Do not optimize away meaningful regression coverage.
+
+A finding must include a concrete smaller design, not a style preference.

.agents/skills/adversarial-validation/references/test-coverage.md

@@ -0,0 +1,26 @@
+# Test-Coverage Lens
+
+- For every behavior claim, name the focused test/check that fails if the
+  changed hunk is reverted. If none is practical, require the reason and
+  residual risk.
+- Confirm tests exercise the real production path and distinguish the intended
+  behavior from the named regression. A success, `is_err()`, or no-panic check
+  can be sufficient when that is the actual contract; require exact values,
+  bytes, state, or error variants when those distinctions matter to the change.
+- For new flags/modes, verify each branch and ask which test fails if the branch
+  is inverted.
+- For new error propagation, inject the failure and assert the caller observes
+  it; mentally replacing `?`/`return Err` with success must break a test.
+- Streaming GET tests assert the complete body and length under degraded reads.
+- Disk/wire-format tests use pinned foreign/legacy fixtures; same-code
+  round-trips are insufficient for compatibility.
+- Concurrency tests use readiness polling, isolate global state, and avoid fixed
+  sleeps or unrealistically short timeouts. Use nextest groups when process-level
+  serialization is required.
+- Internal metadata tests assert both RustFS and MinIO keys, not only read-back
+  through a helper that prefers one key.
+- Avoid duplicate tests of the same production path and poison-value class.
+  Boundary companions are distinct coverage: `n == max` vs `max + 1`, and
+  absent vs empty vs nil UUID.
+- A focused test proves only the targets/features it builds. Add compilation or
+  Clippy only for uncovered changed targets.

.agents/skills/pr-review/SKILL.md

@@ -13,7 +13,7 @@ description: Review a GitHub PR using its exact base/head and repository risk po
    ```
 
    Record both SHAs; refresh if either moved during fetching. Follow relevant [implementation boundaries](../../references/implementation.md).
-2. Apply the [risk policy](../../references/adversarial-validation.md). Ordinary reviews use the root finding standard directly. File count does not authorize delegation; use exactly two independent reviewers only when authorized, otherwise two fresh sequential passes for that risk tier. Reviewers do not spawn further agents.
+2. Apply the [risk policy](../../references/adversarial-validation.md). Ordinary reviews use the root finding standard directly. For explicit adversarial, substantial, or high-risk reviews, use [the domain probes](../adversarial-validation/SKILL.md). File count does not authorize delegation; use exactly two independent reviewers only when authorized, otherwise two fresh sequential passes for that risk tier. Reviewers do not spawn further agents.
 3. Check `gh pr checks <N> --repo <owner/repo>`. Investigate failures when relevant to a finding or a requested CI/readiness diagnosis. Distinguish pending, unavailable, pre-existing, flaky, and PR-caused states using evidence; a code review does not authorize unrelated repairs.
 4. Report the reviewed SHAs, risk tier, supported findings or `No findings`, material verification limits, check state, and verdict. P0/P1 findings block approval. Severity: P0 = demonstrated data loss, security breach, remote crash, or deadlock; P1 = correctness, compatibility, or material hot-path regression; P2 = a concrete maintainability defect; P3 = optional style, only when requested.
 5. When posting is authorized, follow [Git and PR rules](../../references/pull-requests.md), recheck the remote head, and review any delta before submitting. Use `gh pr review` with `--approve`, `--request-changes`, or `--comment` and `--body-file`; use [the API example](references/posting.md) for authorized inline comments. Reuse existing authorization.

.agents/skills/rustfs-release-publish/SKILL.md

@@ -25,7 +25,7 @@ Read only the current phase's procedure; retain completed evidence across turns.
 | 4–5 | [Run the downloaded binary, Console CRUD, and latest-rc matrix](references/preview-acceptance.md). Every check must pass. |
 | Confirmation | Complete the gate below and end the turn. |
 | 6 | After fresh confirmation, [publish and verify the final tag](references/final-release.md) at `PREVIEW_HASH`. |
-| 7 | [Reconcile Security Advisories, milestones, installation references, and the website; reconcile main and remove the completed release branch](references/post-release-updates.md) only after complete publication. |
+| 7 | [Reconcile Security Advisories, milestones, installation references, and the website](references/post-release-updates.md) only after complete publication. |
 
 ## Human Confirmation
 
@@ -37,6 +37,6 @@ Only a new affirmative user reply to that exact report authorizes Phase 6. The o
 
 - Before the final tag exists, land fixes on main, backport to the candidate, verify target versions, and restart branch CI/acceptance. Use a new preview iteration once a preview was tagged; main may advance independently.
 - Once the final tag exists, retry publication jobs for that exact tag. A source fix requires a newly confirmed target, not retagging or a newer preview. Phase 7 retries recheck artifact availability and superseding releases.
-- If abandoned after the bump merged, report the unpublished version on main and record whether to revert or let the next release overwrite it. Deleting unpublished candidate branches or preview tags requires an explicit decision. Completed release branches follow Phase 7 cleanup; keep release tags.
+- If abandoned after the bump merged, report the unpublished version on main and record whether to revert or let the next release overwrite it. Deleting candidate branches or preview tags requires an explicit decision.
 
 Report completed phase results and incomplete work with evidence: Console previous/latest tags, release need, hash and run/Release URLs; target, branch CI/SHA, previews and hash, confirmation state; preview/final assets, latest-channel state, Console/rc results and cleanup; advisory reconciliation results and pending disclosure decisions; both milestone states, installation PR checks/merge state, and website text/link/PR/deployment state. Keep artifact publication separate from follow-up delivery; do not call an open PR a live update. Report deviations and their authorization.

.agents/skills/rustfs-release-publish/references/post-release-updates.md

@@ -48,10 +48,3 @@ Use the existing announcement configuration from [website PR #112](https://githu
 3. Use the site's current package manager and required checks. For this config-only change, type-check and lint the changed file, build the site, and inspect the generated homepage for the version, visible link text, and destination. Confirm `/download` actually offers the announced version before using that link.
 4. Commit, push, and create or update the website PR when included in the authorized release scope. Include the published RustFS Release URL and checks run. Keep merge and production-deployment authority separate; reuse permission already given, but this reference grants none by itself.
 5. After an authorized merge/deployment, verify the live `https://rustfs.com/` banner and its destination. If only the PR is ready, report that state and URL; do not report the banner as deployed. A website failure does not invalidate or move the published release tag: retry this phase after resolving the failure.
-
-## Reconcile main and remove the completed release branch
-
-1. Compare the exact published tag with current main. Audit every release-side commit since their merge base, including inherited backports. An ahead count is a history difference, not proof of missing changes. Use ancestry and patch equivalence, then inspect current code and regression evidence for squashed, adapted, superseded, or reverted changes. Record each commit as present, superseded, release-only, or missing; a positive `git cherry` result alone does not prove a missing fix.
-2. Bring missing shared changes to main through a reviewed PR and the required checks before closing the follow-up. Preserve main's later changes; decide version bumps and pinned Console configuration separately. If a history merge is needed, use a merge commit and verify the release commit is an ancestor of main; squash does not establish that ancestry. Do not merge main into the published release branch or move its tags. Report unresolved changes instead of claiming reconciliation is complete.
-3. After publication and authorized follow-ups are complete, delete the remote `release/<target>` branch. Immediately before deletion, verify its HEAD still equals the published tag's commit and no open PR targets or originates from it. Preserve a branch with newer work or open PRs and report the blocker. Use a deletion with an expected-old-SHA check to avoid removing a concurrently advanced branch.
-4. Verify the remote branch is absent and the final and preview tags still resolve to their recorded commits. Remove a local release branch only if it is task-owned, unchecked out, and has no unpreserved work. Record cleanup separately from artifact publication; an explicitly authorized deletion before reconciliation does not make unresolved main changes complete.

.agents/skills/security-advisory-lessons/SKILL.md

@@ -0,0 +1,41 @@
+---
+name: security-advisory-lessons
+description: Perform a dedicated RustFS security/advisory review for authn/authz, IAM, RPC trust, paths, secrets, browser isolation, encryption, Object Lock, or other security boundaries. Use only when the user requests a security/advisory review or an adversarial review explicitly escalates to the full advisory map; do not auto-load solely because code touches a sensitive path.
+---
+
+# RustFS Security Advisory Lessons
+
+Use this skill as the deep security lens. For a normal adversarial review with a
+matched security surface, the concise security reference under
+`adversarial-validation` is sufficient.
+
+## Workflow
+
+1. Freeze the exact diff/head and identify the changed trust boundaries.
+2. Inspect the headings in [advisory-patterns.md](references/advisory-patterns.md),
+   then read the matching sections. Read the full map only for a broad security
+   audit. Useful headings are
+   auth/admin, IAM/STS/OIDC, policy/plugins, S3/copy/multipart, protocols, paths,
+   secrets/logging/RPC, browser/CORS/proxy, SSE, Object Lock, and serde.
+3. Trace unauthenticated, low-privilege, wrong-action/owner/bucket, malformed,
+   and default-config cases. Security decisions must fail closed.
+4. Require a focused negative regression test for the bypass/exploit form, not
+   only the intended success path. State residual risk when a test is impractical.
+5. Report proven vulnerabilities separately from defense-in-depth hardening.
+
+When advisory currentness matters, fetch the live inventory instead of treating
+the reference as a status mirror:
+
+```bash
+gh api repos/rustfs/rustfs/security-advisories --paginate \
+  --jq '.[] | {ghsa_id,state,severity,summary,updated_at}'
+```
+
+Fetch an individual advisory only when the live summary indicates a new or
+changed lesson.
+
+## Finding Standard
+
+Each finding includes severity, `file:line`, attacker prerequisites, concrete
+input/path, impact, smallest safe fix, and a regression check. Do not exaggerate
+unauthenticated impact when the actual issue requires authenticated low privilege.

.agents/skills/security-advisory-lessons/references/advisory-patterns.md

@@ -0,0 +1,158 @@
+# RustFS Advisory Pattern Map
+
+This file is a lesson map, not an advisory inventory mirror. It keeps durable security patterns distilled from RustFS GitHub Security Advisories.
+
+When current advisory state, severity, URLs, or full text matters, fetch it live:
+
+```bash
+gh api repos/rustfs/rustfs/security-advisories --paginate \
+  --jq '.[] | {ghsa_id,state,severity,summary,updated_at}'
+gh api repos/rustfs/rustfs/security-advisories/<GHSA_ID>
+```
+
+Update this file only when an advisory adds or changes a reusable lesson, affected surface, validation pattern, or regression-test expectation. Do not update it for state-only, URL-only, count-only, or timestamp-only changes.
+
+## Pattern Index
+
+### Admin authorization and route exposure
+
+- `GHSA-pfcq-4gjr-6gjm`: notification target endpoints accepted authenticated users but skipped admin authorization. Lesson: distinguish authn from authz; admin target CRUD must call the operation-specific admin authorization path.
+- `GHSA-mm2q-qcmx-gw4w`: `ListServiceAccount` used `UpdateServiceAccountAdminAction`, while update lacked target ownership checks. Lesson: exact action constants and ownership checks are both required; information disclosure can chain into secret rotation and takeover.
+- `GHSA-vcwh-pff9-64cc`: `ImportIam` checked `ExportIAMAction` for an import/write operation. Lesson: every admin handler must authorize the action it actually performs.
+- `GHSA-jqmc-mg33-v45g` and `GHSA-8784-9m7f-c6p6`: `/profile/cpu` and `/profile/memory` were whitelisted from auth and allowed expensive diagnostics plus path disclosure. Lesson: profiling/debug endpoints need admin auth, opt-in, rate limits, and non-sensitive responses.
+- `GHSA-f5cv-v44x-2xgf`: `/rustfs/admin/v3/metrics` accepted any authenticated IAM user and skipped admin authorization. Lesson: read-only metrics and diagnostic admin endpoints still require an operation-specific admin action check.
+- `GHSA-796f-j7xp-hwf4`: `/rustfs/admin/v3/list-remote-targets` checked only that credentials existed and leaked replication target credentials. Lesson: replication target reads are privileged admin operations, and stored remote credentials require strict authz plus response redaction review.
+- `GHSA-xp32-gxq2-3v52`: console license metadata endpoint was public and exposed subject and expiration fields. Lesson: management metadata endpoints should require admin auth or return only coarse public status.
+
+### IAM import, service accounts, and privilege boundaries
+
+- `GHSA-566f-q62r-wcr8`: `ImportIam` accepted attacker-controlled service account `parent`, `claims`, `accessKey`, and `secretKey`, enabling persistent backdoor accounts under root. Lesson: imported IAM payloads are untrusted data and must be validated against privilege boundaries.
+- `GHSA-3495-h8r9-gfqg`: `ExportIAM` wrote regular-user and service-account secret keys into exported ZIP data. Lesson: IAM export is a credential-disclosure boundary; redact, seal, or strictly justify every exported secret before treating export permission as safe.
+- `GHSA-5354-r3w2-34m8`: `AddServiceAccount` checked `CreateServiceAccountAdminAction` but trusted caller-supplied `target_user`, allowing service accounts under the root parent. Lesson: service-account create paths must validate parent ownership or root/admin authority, not only the create action.
+- `GHSA-xgr5-qc6w-vcg9`: `deny_only=true` skipped allow checks and let restricted service accounts mint unrestricted children. Lesson: deny-only logic must never become implicit allow for privilege creation.
+- `GHSA-mm2q-qcmx-gw4w`: leaked service account access keys plus update-without-ownership formed an escalation chain. Lesson: service-account identifiers are security-sensitive because update APIs consume them.
+
+### STS, OIDC, and federation flows
+
+- `GHSA-5qfg-mf7r-jp3w` and `GHSA-3473-5353-xhwh`: `AssumeRoleWithWebIdentity` was reachable through unauthenticated `POST /` routing and could issue temporary credentials from crafted web identity input. Lesson: every STS route needs explicit SigV4 or trusted identity-provider validation before role assumption, and unauthenticated exemptions must be narrowed to the exact action with uniform failure responses.
+- `GHSA-jxrr-r6pv-h958`: unsigned JWT issuer data was decoded before verification to select an OIDC provider, and distinguishable failures could expose provider configuration. Lesson: web-identity routing may be unauthenticated, but pre-verification claims are untrusted routing hints; bound and rate-limit the request, normalize public errors, and verify signature, issuer, audience, and expiration before issuing credentials.
+- `GHSA-ccrv-v8v9-ch9q`, `GHSA-48rf-7j3q-3hfv`, and `GHSA-xvfh-7c9g-hpw2`: service-account-controlled material could self-sign JWT session tokens with forged policy claims, and missing `exp` was accepted for service-account tokens. Lesson: session tokens must be signed by a trusted issuer/key path, enforce required claims and expiration, and reject self-signed or principal-controlled tokens.
+- `GHSA-9pjf-w3c2-m32r`, `GHSA-4x2q-cpx9-9h26`, and `GHSA-xvpm-p3f7-34c3`: public OIDC authorize/callback flows trusted request `Host` or forwarded scheme when building credential-bearing redirects. Lesson: OIDC redirects must use configured allowlisted origins and trusted-proxy handling; never derive the post-login credential destination from direct client headers.
+- `GHSA-m479-9x88-94w6`, `GHSA-frwq-mfqx-83p8`, `GHSA-q9q8-rf9r-fg9f`, and `GHSA-j5c2-hhf7-6gf5`: OIDC validation accepted attacker-controlled discovery URLs because hostname checks rejected only literal forbidden IPs, allowing DNS rebinding SSRF. Lesson: outbound federation URL validation must resolve and classify hostnames at the connection boundary and reject loopback, private, link-local, and rebound addresses.
+
+### IAM policy conditions and external policy plugins
+
+- `GHSA-6r96-hmgc-726c`: request headers collided with lowercase server-derived condition keys such as `userid`, `groups`, `versionid`, and JWT/LDAP claims. Lesson: never let caller-controlled headers append to or replace server-derived policy context; reserve trusted condition keys and keep intentional request-header keys separate.
+- `GHSA-v9cp-qfw9-9pfp`: quantified negated string conditions applied negation after aggregation, transposing `ForAllValues` and `ForAnyValue` semantics. Lesson: push negation into the per-value predicate for quantified operators and test partially overlapping multi-value sets.
+- `GHSA-5w8r-p896-6vq2`: OPA policy mode skipped `ExistingObjectTag/*` loading, so tagged objects looked untagged to external policies. Lesson: external authorization plugins need the same object-tag and request context as built-in policy evaluation before they decide.
+- `GHSA-9wgh-5r68-49p7`: substituted policy-variable values could recreate `${...}` and loop inside a single resolution pass, never reaching the outer iteration limit. Lesson: bound substitutions within each pass and test cycles formed across otherwise literal resolver values; confirm whether attacker-controlled claims can reach those values before assigning remote impact.
+
+### S3 object actions, copy, multipart, and upload policy validation
+
+- `GHSA-g8w9-qw9q-fghr` and `GHSA-xm99-m3gq-83g8`: a valid presigned `PutObject` accepted extra `x-amz-*` headers omitted from `SignedHeaders`; `x-amz-copy-source` could turn that upload capability into a cross-bucket read performed as the signer. Lesson: a presigned URL is a bounded capability; inspect all received security-sensitive headers and reject unsigned ones before selecting the S3 operation or reaching storage.
+- `GHSA-3ppv-fx5m-m749`: explicit `versionId` reads and copy sources authorized `s3:GetObject` instead of `s3:GetObjectVersion`. Lesson: version-specific object access must select version-specific actions for direct reads, `CopyObject`, and `UploadPartCopy`, with tests proving the backend is not reached on denial.
+- `GHSA-cg33-pxfp-qcj3` and `GHSA-65wq-gjw8-xr9w`: `HeadObject` and object-tagging paths authorized current-object actions while operating on an explicit historical `versionId`. Lesson: select the corresponding version action for metadata and tag reads and writes too; audit every operation that accepts a version ID.
+- `GHSA-gjph-xcgw-4p7w`: `PutObject` and browser POST accepted a caller-supplied `versionId` and replaced an unlocked historical version with only `s3:PutObject`. Lesson: only replication-authorized writes may choose an existing version ID; ordinary uploads must not rewrite version history.
+- `GHSA-x298-9x87-fvjq`: anonymous `ListObjectVersions` fell back to `ListBucket` and returned before public-access-block gates. Lesson: compatibility fallbacks must converge on the same post-authorization checks as direct grants, especially `RestrictPublicBuckets` and anonymous data-plane denies.
+- `GHSA-mx42-j6wv-px98`: `UploadPartCopy` missed source authorization and allowed cross-bucket object exfiltration. Lesson: multipart copy must enforce the same source and destination contract as `CopyObject`.
+- `GHSA-wfxj-ph3v-7mjf`: `UploadPartCopy` checked source and destination independently but missed destination copy-source policy constraints. Lesson: source read and destination write checks are not sufficient when policy constrains allowed copy sources.
+- `GHSA-w5fh-f8xh-5x3p`: presigned POST accepted uploads without enforcing signed policy conditions. Lesson: parse and enforce all POST policy constraints server-side, including size, key prefix, and content type.
+
+### Protocol frontends and IAM parity
+
+- `GHSA-3g29-xff2-92vp`: FTP `RETR` and `SIZE`/`MDTM` read paths authenticated the user but skipped IAM before calling storage. Lesson: non-HTTP protocol frontends must enforce the same per-operation authorization as the S3 API before backend access.
+- `GHSA-g3vq-vv42-f647`: FTPS `MKD` called `create_bucket` without checking `s3:CreateBucket`. Lesson: protocol command handlers need action-specific checks even when sibling handlers already authorize correctly.
+- `GHSA-3p3x-734c-h5vx`: FTPS and WebDAV compared secret keys with early-return string equality, while FTPS also returned distinguishable invalid-user and invalid-password failures. Lesson: password-style protocol auth needs constant-time secret comparison, indistinguishable failures where practical, and rate limiting.
+- `GHSA-rhg6-jrf2-29c4`: WebDAV, FTP/FTPS, and SFTP used identity-policy checks with empty conditions and bypassed S3 bucket-policy explicit denies and condition-key denies. Lesson: alternate listeners must evaluate the same effective policy and trustworthy request context before storage access.
+
+### Filesystem paths and object key traversal
+
+- `GHSA-pq29-69jg-9mxc`: RPC `read_file_stream` joined untrusted paths under a volume directory without canonical boundary checks. Lesson: `PathBuf::join` plus length checks are not path security.
+- `GHSA-8r6f-hmq2-28rg`: object keys containing traversal sequences bypassed bucket/object authorization when mapped to filesystem paths. Lesson: reject traversal at object-key parsing and verify final storage paths remain under the expected bucket/key root.
+- `GHSA-f4vq-9ffr-m8m3`: Snowball auto-extract accepted archive entries such as `../victim-bucket/object`, authorized the raw attacker-bucket path, then storage path cleaning crossed bucket boundaries. Lesson: archive entries become object keys and need traversal rejection plus consistent authz/storage normalization before writes.
+- `GHSA-g7fq-6xjm-mxf4`: versioned `DeleteObjects` accepted dot-segment keys, authorized the literal prefix, then wrote delete markers under a resolved sibling prefix. Lesson: validate each batch key before authorization and storage normalization, using the same object-name rules as single delete.
+
+### Secrets, defaults, and cryptographic misuse
+
+- `GHSA-j59h-h7q5-q348`, `GHSA-3wm5-wpm5-hmfm`, `GHSA-6wc8-xm48-qhmx`, `GHSA-9gf3-jx4p-4xxf`, `GHSA-63xc-c3w3-m2cf`, and `GHSA-ch63-6q4v-hwp5`: RustFS shipped known default root credentials that could authenticate to S3, admin APIs, IAM, KMS, console, and token-signing surfaces. Lesson: root credentials must be operator-provided or generated per install; known defaults and warnings are not acceptable for network-reachable deployments.
+- `GHSA-h956-rh7x-ppgj`: gRPC used the hard-coded token `rustfs rpc` on both client and server. Lesson: source-visible shared tokens are authentication bypasses.
+- `GHSA-r5qv-rc46-hv8q`: internode RPC HMAC secret fell back to the public default `rustfsadmin`. Lesson: RPC/internode auth must fail closed instead of silently using public defaults.
+- `GHSA-75fx-qg6f-8rm7` and `GHSA-68cw-96m3-h2cf`: internode RPC secrets were derivable from known root credentials, making raw storage RPC signatures forgeable when explicit RPC secrets were unset. Lesson: RPC auth keys must be independent random secrets, never derived from S3 root credentials, and raw storage RPC should not share the public S3 listener without an internode-only boundary.
+- `GHSA-m77q-r63m-pj89`: STS JWTs used the root secret key as the shared token signing key, allowing token forgery when the root secret was known. Lesson: STS signing keys need key separation, rotation, and key IDs; do not reuse root credentials for JWT/HMAC signing.
+- `GHSA-923g-jp7v-f97f`: license verification embedded a production RSA private key and used private-key decryption as authenticity. Lesson: ship verifying/public keys only and use real signature verification.
+
+### Sensitive logging and debug output
+
+- `GHSA-r54g-49rx-98cr`: STS credentials were logged at info level. Lesson: generated credentials must never be logged in plaintext.
+- `GHSA-8cm2-h255-v749`: debug logs leaked session tokens, secret keys, JWT claims, and raw STS response bodies. Lesson: redaction must cover custom `Debug` implementations and dependency response-body logging.
+- `GHSA-333v-68xh-8mmq`: invalid RPC signature logging included the shared HMAC secret and expected signature. Lesson: error paths often leak secrets; never log raw secrets or derived authenticators.
+
+### RPC input validation and panic safety
+
+- `GHSA-gw2x-q739-qhcr`: malformed gRPC `GetMetrics` payloads reached `unwrap()` on deserialization and caused remote DoS. Lesson: every network/RPC deserialization failure returns an error, not a panic.
+- `GHSA-h956-rh7x-ppgj` and `GHSA-r5qv-rc46-hv8q`: weak RPC auth increased reachability of otherwise internal handlers. Lesson: panic bugs become more severe when internode auth is weak or defaulted.
+- `GHSA-c667-rgrv-99vj`: NodeService authentication signed the service prefix instead of the concrete generated method path, so valid metadata for one RPC could be replayed to another method during the timestamp window. Lesson: RPC HMAC payloads must bind exact gRPC method path, HTTP method surrogate, timestamp, and secret.
+
+### Browser, CORS, and console isolation
+
+- `GHSA-v9fg-3cr2-277j`: object preview rendered attacker-controlled HTML in a same-origin iframe, exposing console credentials stored in `localStorage`. Lesson: user content must be origin-isolated from the console and protected with `nosniff`, CSP, and strict content-type handling.
+- `GHSA-7gcx-wg4x-q9x6`: an incomplete preview fix reintroduced extension-based PDF detection and bypassed the sandboxed fallback for attacker-controlled content. Lesson: browser-surface fixes need regression tests for alternate viewers and file-type branches, and preview trust must come from validated content type plus sandboxing rather than object names.
+- `GHSA-x5xv-223c-8vm7`: default CORS reflected arbitrary origins with credentials. Lesson: never combine reflected origins with `Access-Control-Allow-Credentials: true`; default should be fail-closed.
+
+### Trusted proxy and source IP conditions
+
+- `GHSA-fc6g-2gcp-2qrq`: `aws:SourceIp` trusted client-supplied `X-Forwarded-For` or `X-Real-IP`. Lesson: forwarded IP headers are valid only behind configured trusted proxies; direct clients use socket peer IP.
+
+### SSE and on-disk storage invariants
+
+- `GHSA-xrrf-67jm-3c2r`: SSE metadata reported encryption while reader composition bypassed `EncryptReader` and stored plaintext. Lesson: test actual bytes on disk and wrapper order, not only API metadata.
+- `GHSA-wqmc-vjgv-jrpw`: SSE-C persisted and listed the plaintext MD5 as the ETag, allowing list-only users to confirm or brute-force low-entropy content and correlate equal plaintext across keys. Lesson: encrypted-object ETags must not expose deterministic plaintext fingerprints; protect them with per-object key material and keep listing, conditional, copy, and multipart semantics consistent.
+
+### Object Lock and retention invariants
+
+- `GHSA-j548-9grx-fh4f`: Object Lock enforcement treated unreadable, fabricated, or unparsable bucket metadata as absent configuration and allowed retained objects to be deleted or expired. Lesson: retention must fail closed unless Object Lock absence is authoritative, and every delete, lifecycle, scanner, force-delete, and default-retention path needs the same state distinction.
+- `GHSA-28w4-rp2p-636w` and `GHSA-c7hx-vr97-45rg`: an authorized `DeleteBucket` with `x-rustfs-force-delete: true` removed active COMPLIANCE-retained versions even though ordinary version deletion was denied. Lesson: bucket force-delete must enforce retention across every version, including against root/owner callers.
+- `GHSA-q23w-fp7p-472v`: `PutObjectRetention` policy conditions read `x-amz-object-lock-*` headers while the handler applied mode and date from the XML body. Lesson: authorize the parsed retention that will be stored, or reject mismatched header/body values; compare retention dates as instants so offsets cannot change the applied bound.
+
+### Serde deserialization and input validation
+
+- Reject unknown fields in untrusted S3 API XML/JSON, lifecycle, policy, and replication input where compatibility permits. Check the current type and supported payload fixtures; do not infer the repository's current coverage from an older audit. Where extra fields are part of the compatibility contract, validate security-critical values explicitly.
+- `#[serde(default)]` on security-critical fields silently accepts missing values as zero/empty. Lesson: when a field has security implications (retention days, permissions, limits), validate the deserialized value explicitly rather than relying on defaults.
+- Integer fields deserialized from user input and cast with `as` (e.g., `i32 as u32`) can wrap negative values to large positives. Lesson: validate ranges before casting; use `try_into()` with a typed error, or clamp only when the domain explicitly requires saturation.
+- XML config typos (e.g., `"NoncurentDays"` instead of `"NoncurrentDays"`) are silently accepted when `deny_unknown_fields` is absent. Lesson: strict deserialization prevents silent misconfiguration that could cause data loss or unexpected retention behavior.
+
+## Useful Search Seeds
+
+Use these targeted searches when a diff touches security-sensitive code:
+
+```bash
+rg -n "validate_admin_request|check_permissions|AdminAction::|deny_only|is_allowed" rustfs crates
+rg -n "authorize_operation|FtpsDriver|SftpDriver|RETR|MKD|SIZE|MDTM|CreateBucket|GetObject|HeadObject" crates/protocols rustfs
+rg -n "UploadPartCopy|upload_part_copy|CompleteMultipart|PostObject|presign|SignedHeaders|x-amz-copy-source|collect_signed_headers|content-length-range|starts-with" rustfs crates
+rg -n "ListBucketVersions|GetObjectVersion|versionId|VersionId|ExistingObjectTag|ForAllValues|ForAnyValue|POLICY_PLUGIN|opa" rustfs crates
+rg -n "normalize_extract_entry_key|Snowball|auto-extract|PathBuf::join|canonicalize|\\.\\.|x-forwarded-for|x-real-ip|SourceIp" rustfs crates
+rg -n "DEFAULT_SECRET|DEFAULT_ACCESS|TEST_PRIVATE_KEY|rustfs rpc|RUSTFS_RPC_SECRET" rustfs crates
+rg -n "TONIC_RPC_PREFIX|verify_rpc_signature|check_auth|NodeServiceServer|x-rustfs-signature" rustfs crates
+rg -n "debug!|trace!|info!|error!|\\?resp|\\?merged_config|session_token|secret_key" rustfs crates
+rg -n "HashReader|EncryptReader|try_resolve_etag|ETag|SSE|server-side encryption|Access-Control-Allow-Credentials|Origin" rustfs crates
+rg -n "ObjectLock|object_lock|retention|COMPLIANCE|GOVERNANCE|delete_prefix|lifecycle|scanner" rustfs crates
+rg -n "deny_unknown_fields|serde.default|as u32|as usize|as i32" rustfs crates
+```
+
+## Minimum Regression Test Expectations
+
+- Authz fixes: include unauthenticated, valid low-privilege, wrong-action, correct-action, owner, non-owner, and root/admin cases as applicable.
+- Protocol frontend authz fixes: include denied `RETR`, `SIZE`/`MDTM`, `MKD`, bucket probe, and sibling allowed-operation cases; test bucket-policy explicit denies and condition-key denies on each enabled listener against an S3 control, and assert denied paths do not reach storage.
+- IAM fixes: include import/update/list service-account cases with attacker-controlled parent, claims, access key, secret key, and policy.
+- Copy/upload fixes: include cross-bucket, cross-user, source-denied, destination-denied, copy-source-condition, and multipart completion cases.
+- Presigned upload fixes: include a valid presign with extra unsigned tagging, redirect, storage-class, and cross-bucket copy-source headers; require rejection before source or destination storage access, and verify explicitly signed equivalents still work.
+- Version-action fixes: include historical UUID, explicit current version, `null`, range, partNumber, presigned, STS/session, service-account, anonymous bucket-policy, copy source, multipart-copy source, `HeadObject`, and tag read/write cases.
+- Version-write fixes: a `PutObject`-only principal must not replace an existing version through `PutObject` or browser POST `?versionId=`; verify replication-authorized writes and versioned, suspended, and unversioned buckets separately.
+- Policy-condition fixes: include reserved-key header collisions, missing keys, partially overlapping multi-value sets, cyclic variable substitutions, plugin mode, and built-in policy mode.
+- Path fixes: include encoded traversal, absolute path, nested traversal, archive entries with `..`, valid object keys that resemble traversal text but should be rejected, and canonical bucket/prefix boundary checks; test per-key `DeleteObjects` errors and prefix-scoped denials on versioned buckets.
+- Logging fixes: assert redacted output for structs and response bodies that may contain credentials.
+- IAM export fixes: assert exported archives omit plaintext user and service-account secrets unless the format deliberately encrypts or seals them.
+- RPC auth fixes: include captured metadata replay across two concrete methods, stale timestamps, wrong path, wrong method surrogate, wrong secret, and valid same-method calls.
+- Browser/CORS fixes: assert no credentials on reflected/default origins, correct behavior for explicit allowlists, and no same-origin script execution for previewed object content.
+- SSE fixes: inspect stored bytes and verify API metadata, read-back behavior, and on-disk ciphertext together; for ETags, upload equal plaintext under different keys and assert list-only callers cannot derive or correlate the plaintext digest, including multipart objects.
+- Object Lock fixes: include unreadable metadata, fabricated metadata defaults, unparsable config, confirmed absent config, COMPLIANCE/GOVERNANCE retention, lifecycle expiry, scanner sweeps, and force-delete paths; an authorized force-delete must preserve active COMPLIANCE versions. For `PutObjectRetention`, test conflicting header/body values and offset dates against policy bounds and read-back retention.

.config/e2e-distributed-selection.txt

@@ -1,2 +1,2 @@
-sha256-linux=eb33067d90ee66c0a97e8f3658e46c152e47f897d2fbfdc6cb5ad93cfa55414b
-sha256-darwin=eb33067d90ee66c0a97e8f3658e46c152e47f897d2fbfdc6cb5ad93cfa55414b
+sha256-linux=233bd7a68777eda1f044b6cb77128056be2b6492583c0dfd114b21e98a6102ef
+sha256-darwin=233bd7a68777eda1f044b6cb77128056be2b6492583c0dfd114b21e98a6102ef

.config/e2e-full-selection.txt

@@ -1,2 +1,2 @@
-sha256-darwin=a67a347f26be186c598b5beaf68e6bcbe1855350a35e1423dd5b8a81bcba06a5
-sha256-linux=ad4fabe811c6cca1aba89fad34ccd404b5832a6a955875c2826f6e0fa1ea4f1f
+sha256-darwin=3a7f52dd884ed269746029e983006ce69b62f260db2ad1acdcffdb2196c65d11
+sha256-linux=4af4bb607919b96e63e2a3fb7a78bd18fcb08e265f4ca4ce6afb09a8be798305

.config/e2e-nightly-selection.txt

@@ -1,2 +1,2 @@
-sha256-darwin=3814cdde8cacf4187e18188d342ed70931cc32e268e42e5bb438d565bb4d0f81
-sha256-linux=663025a80273579f95ae3f49af02c0afcbfce94df09701c360a13e607b7637db
+sha256-darwin=347a0d4e5e547d5388703062ce66a66167a845b6e57ec591ccb4c732a567c68d
+sha256-linux=4f9efa47194279185bb68249e82c788fa147abe944b6c764050e3d47f31e7926

.config/e2e-smoke-selection.txt

@@ -1 +1 @@
-sha256=f065e7071aac9d48a7c1b301f328fa7cc14f11c4e7dc46da3e55057c4ea29bd5
+sha256=ce16185f87c6cd30aa0891ebd22be3352aedc10040d48cc5b00652d72f7be3b5

.config/ecstore-required-tests.json

@@ -29,7 +29,7 @@
     {
       "invariant": "list-uncommitted-version",
       "suite": "rustfs-filemeta",
-      "name": "metacache::tests::resolve_merge_keeps_the_newest_version_at_listing_quorum"
+      "name": "metacache::tests::resolve_with_write_quorum_slack_keeps_partial_latest_hidden_during_merge"
     },
     {
       "invariant": "minio-object-fixture",
@@ -229,7 +229,7 @@
     {
       "invariant": "list-objects-shared-corpus-orphan-cleanup-requires-authoritative-evidence",
       "suite": "rustfs-ecstore",
-      "name": "store::list_objects::differential_tests::list_objects_shared_corpus_orphan_listing_preserves_inputs"
+      "name": "store::list_objects::differential_tests::list_objects_shared_corpus_orphan_cleanup_requires_authoritative_evidence"
     },
     {
       "invariant": "list-objects-shared-corpus-consumer-drop-joins-real-disk-producer",
@@ -241,6 +241,11 @@
       "suite": "rustfs-ecstore",
       "name": "store::list_objects::differential_tests::list_objects_shared_corpus_cancelled_quorum_walk_releases_senders_and_disk_lock"
     },
+    {
+      "invariant": "list-objects-shared-corpus-enabled-index-contracts",
+      "suite": "rustfs-ecstore",
+      "name": "store::list_objects::differential_tests::list_objects_shared_corpus_enabled_index_contracts"
+    },
     {
       "invariant": "borrowed-context-boundary",
       "suite": "rustfs-ecstore",

.config/make/tests.mak

@@ -52,7 +52,6 @@ script-tests: ## Run shell script tests
 	./scripts/check_embedded_secrets.sh --self-test
 	$(RUSTFS_PYTHON_BIN) ./scripts/check_test_wiring.py --self-test
 	$(RUSTFS_PYTHON_BIN) ./scripts/test_e2e_binary.py
-	$(RUSTFS_PYTHON_BIN) ./scripts/test_inspect_btf_prototypes.py
 	$(RUSTFS_PYTHON_BIN) ./scripts/test_release_build_workflow.py
 	$(RUSTFS_PYTHON_BIN) ./scripts/test_release_glibc.py
 	$(RUSTFS_PYTHON_BIN) ./scripts/test_upgrade_workflow.py

.config/nextest.toml

@@ -68,17 +68,6 @@ command = ['sh', '-c', 'echo RUST_MIN_STACK=33554432 >> "$NEXTEST_ENV"']
 # boundaries. Reserve the run's capacity so unrelated fixtures cannot starve
 # their existing deadlines and typed-failure assertions (rustfs/backlog#2706).
 # Keep each test's internal concurrency and zero-retry policy unchanged.
-[[profile.default.overrides]]
-filter = """
-package(rustfs-ecstore) & (
-    test(/^set_disk::ops::multipart::tests::complete_multipart_(quorum_success_releases_logical_guards_before_physical_tail|waits_for_tail_before_releasing_guards_and_marking_capacity)$/)
-    | test(=store::heal::tests::full_format_heal_lost_after_last_save_does_not_publish_or_renew_and_latches)
-    | test(/^store::init::tests::(decommission_durable_ilm_receipt_pagination_fails_closed_on_second_page|dispatch_manifest_shutdown_(drains_admitted_delete_batch_without_tail_admission|stops_aborting_validation_tail_reads|stops_authorized_tail_reads_before_receipt_or_cas))$/)
-    | (binary(metadata_read_lock_reuse_test) & test(=replica_multipart_completes_while_metadata_writer_waits_for_its_snapshot))
-)
-"""
-threads-required = "num-test-threads"
-
 [[profile.default.overrides]]
 filter = 'package(rustfs) & test(/^connect::diagnostics::schedule::tests::/)'
 threads-required = "num-test-threads"
@@ -94,29 +83,12 @@ threads-required = "num-test-threads"
 filter = '(package(rustfs-ecstore) & test(=core::pools_test::decommission_lock_order_tests::active_decommission_migration_does_not_invert_capacity_and_delete_object_tag_locks)) | (package(rustfs-heal) & test(=heal::mrf_queue::partial_write::tests::durable_retry_submission_error_keeps_checkpoint_and_uses_backoff))'
 threads-required = "num-test-threads"
 
-# These eight-disk decommission fixtures exercise concurrent retries,
-# free-version cleanup, and real capacity probes under production lock deadlines.
-# Reserve the run's capacity so unrelated IO cannot exhaust those budgets.
-[[profile.default.overrides]]
-filter = 'package(rustfs-ecstore) & (test(/^store::init::tests::decommission_entry_(retries_source_changed_without_canceling_other_bucket|skips_cleanup_only_marker_when_free_version_is_present)$/) | test(=core::pools::tests::decommission_capacity_mutation_limits_prewrite_sampling_to_target))'
-threads-required = "num-test-threads"
-
-# This registration/backup lock probe uses an isolated eight-disk store.
-# Reserve capacity so sibling disk-heavy tests cannot consume its 2s
-# registration budget; retain the queued backup and deadlock assertions.
-[[profile.default.overrides]]
-filter = 'package(rustfs) & test(=admin::handlers::table_catalog::tests::cold_strong_registration_completes_while_other_bucket_backup_waits)'
-threads-required = "num-test-threads"
-
 [[profile.default.overrides]]
 filter = 'package(rustfs-heal) & (binary(mrf_partial_write_test) | (binary(mrf_pipeline_test) & test(/^journal_replay_survives_/)) | test(=admin_selector_survives_sigkill_with_original_scope_and_receipts))'
 threads-required = "num-test-threads"
 
-# Native scanner backlog fixtures include 24-set and pool-expansion cases.
-# Reserve capacity across test processes while preserving each scenario's fixed
-# budget, assertions, and internal concurrency.
 [[profile.default.overrides]]
-filter = 'package(rustfs-scanner) & (test(/^scanner::backlog::tests::native_/) | test(=scanner_folder::tests::mrf_ownership::mrf_ownership_manager_completion_preserves_scanner_pending) | test(/^scanner_io::tests::service_cohort::/))'
+filter = 'package(rustfs-scanner) & (test(/^scanner::backlog::tests::native_(writer|retirement)_/) | test(=scanner_folder::tests::mrf_ownership::mrf_ownership_manager_completion_preserves_scanner_pending) | test(/^scanner_io::tests::service_cohort::/))'
 threads-required = "num-test-threads"
 
 [[profile.default.scripts]]
@@ -128,7 +100,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]]
@@ -362,17 +334,6 @@ path = "junit.xml"
 
 # Match the local durable-progress reservations. All members, deadlines,
 # assertions, and internal concurrency remain enabled without retries.
-[[profile.ci.overrides]]
-filter = """
-package(rustfs-ecstore) & (
-    test(/^set_disk::ops::multipart::tests::complete_multipart_(quorum_success_releases_logical_guards_before_physical_tail|waits_for_tail_before_releasing_guards_and_marking_capacity)$/)
-    | test(=store::heal::tests::full_format_heal_lost_after_last_save_does_not_publish_or_renew_and_latches)
-    | test(/^store::init::tests::(decommission_durable_ilm_receipt_pagination_fails_closed_on_second_page|dispatch_manifest_shutdown_(drains_admitted_delete_batch_without_tail_admission|stops_aborting_validation_tail_reads|stops_authorized_tail_reads_before_receipt_or_cas))$/)
-    | (binary(metadata_read_lock_reuse_test) & test(=replica_multipart_completes_while_metadata_writer_waits_for_its_snapshot))
-)
-"""
-threads-required = "num-test-threads"
-
 [[profile.ci.overrides]]
 filter = 'package(rustfs) & test(/^connect::diagnostics::schedule::tests::/)'
 threads-required = "num-test-threads"
@@ -388,29 +349,12 @@ threads-required = "num-test-threads"
 filter = '(package(rustfs-ecstore) & test(=core::pools_test::decommission_lock_order_tests::active_decommission_migration_does_not_invert_capacity_and_delete_object_tag_locks)) | (package(rustfs-heal) & test(=heal::mrf_queue::partial_write::tests::durable_retry_submission_error_keeps_checkpoint_and_uses_backoff))'
 threads-required = "num-test-threads"
 
-# These eight-disk decommission fixtures exercise concurrent retries,
-# free-version cleanup, and real capacity probes under production lock deadlines.
-# Reserve the run's capacity so unrelated IO cannot exhaust those budgets.
-[[profile.ci.overrides]]
-filter = 'package(rustfs-ecstore) & (test(/^store::init::tests::decommission_entry_(retries_source_changed_without_canceling_other_bucket|skips_cleanup_only_marker_when_free_version_is_present)$/) | test(=core::pools::tests::decommission_capacity_mutation_limits_prewrite_sampling_to_target))'
-threads-required = "num-test-threads"
-
-# This registration/backup lock probe uses an isolated eight-disk store.
-# Reserve capacity so sibling disk-heavy tests cannot consume its 2s
-# registration budget; retain the queued backup and deadlock assertions.
-[[profile.ci.overrides]]
-filter = 'package(rustfs) & test(=admin::handlers::table_catalog::tests::cold_strong_registration_completes_while_other_bucket_backup_waits)'
-threads-required = "num-test-threads"
-
 [[profile.ci.overrides]]
 filter = 'package(rustfs-heal) & (binary(mrf_partial_write_test) | (binary(mrf_pipeline_test) & test(/^journal_replay_survives_/)) | test(=admin_selector_survives_sigkill_with_original_scope_and_receipts))'
 threads-required = "num-test-threads"
 
-# Native scanner backlog fixtures include 24-set and pool-expansion cases.
-# Reserve capacity across test processes while preserving each scenario's fixed
-# budget, assertions, and internal concurrency.
 [[profile.ci.overrides]]
-filter = 'package(rustfs-scanner) & (test(/^scanner::backlog::tests::native_/) | test(=scanner_folder::tests::mrf_ownership::mrf_ownership_manager_completion_preserves_scanner_pending) | test(/^scanner_io::tests::service_cohort::/))'
+filter = 'package(rustfs-scanner) & (test(/^scanner::backlog::tests::native_(writer|retirement)_/) | test(=scanner_folder::tests::mrf_ownership::mrf_ownership_manager_completion_preserves_scanner_pending) | test(/^scanner_io::tests::service_cohort::/))'
 threads-required = "num-test-threads"
 
 [[profile.ci.scripts]]
@@ -419,7 +363,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]]

.github/actions/schedule-failure-issue/README.md

@@ -74,6 +74,7 @@ Notes:
 - `.github/workflows/e2e-s3tests.yml` (weekly full s3-tests sweep)
 - `.github/workflows/mint.yml` (weekly multi-SDK mint run)
 - `.github/workflows/fuzz.yml` (nightly fuzz corpus jobs)
+- `.github/workflows/performance-ab.yml` (nightly warp A/B gate)
 - **Pending:** the ci-7 e2e nightly-full workflow does not exist yet
   (backlog#1149 ci-7). When it lands, wire it up with the snippet above.
 

.github/scheduled-validations.json

@@ -18,6 +18,7 @@
     "never_ran_grace_until": "2026-09-08T00:00:00Z"
   },
   { "workflow": ".github/workflows/nightly-gnu.yml", "max_age_hours": 36 },
+  { "workflow": ".github/workflows/performance-ab.yml", "max_age_hours": 36 },
   {
     "workflow": ".github/workflows/runner-hygiene.yml",
     "max_age_hours": 792,

.github/workflows/README.md

@@ -7,7 +7,7 @@
 
 This repository is public. For a public repository, GitHub's standard hosted runners (`ubuntu-latest`, `windows-latest`, `macos-latest`) cost nothing and have no minute cap, whatever plan the organisation is on. GitHub bills only two things: larger hosted runners, which have custom labels and are not used here, and standard runners in private repositories.
 
-Every other label in this repository is capacity RustFS pays for. ARC pods and lab machines accrue cost while the machine exists. A Ubicloud label is metered for the minutes a job holds its VM:
+Every other label in this repository is capacity RustFS pays for by the hour whether or not a job is running well:
 
 | Label | Paid by | What it is | Use it for |
 |---|---|---|---|
@@ -15,8 +15,8 @@ Every other label in this repository is capacity RustFS pays for. ARC pods and l
 | `windows-latest`, `macos-latest` | nobody | GitHub-hosted standard runners | Windows and macOS targets |
 | `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 |
+| `sm-standard-4-arm` | RustFS | ARC pod, aarch64; reached through the `build.yml` matrix, so `actionlint.yaml` does not list it | native aarch64 release builds |
+| `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
@@ -44,7 +40,7 @@ A hosted runner is also the only choice for a few things the pods cannot do: `mo
 
 - Every `shared-key` has exactly one writer. `cache-warm.yml` owns `ci-dev`, `ci-feat-rio`, `ci-feat-proto` and `ci-uring`; every other `./.github/actions/setup` call states `cache-save-if` explicitly, and `scripts/security/check_cache_save_if.sh` fails the build when one does not.
 - All readers of a key run on the same image as its writer. Keys that live on hosted runners say so in their name (`ci-uring` is warmed on `ubuntu-latest`; `ci-e2e-distributed-hosted`, `e2e-upgrade-server-hosted`, `e2e-upgrade-tests-hosted`).
-- Moving a job between pools therefore means renaming its key. The new key is empty until a run from `main` (a scheduled run, or a manual dispatch of that workflow from `main`) saves it; until then that lane does a cold build. The `build.yml` aarch64 release legs append `-ubicloud-arm` for this reason. `cache-warm.yml` does not write those keys.
+- Moving a job between pools therefore means renaming its key. The new key is empty until a run from `main` (a scheduled run, or a manual dispatch of that workflow from `main`) saves it; until then that lane does a cold build.
 - `CARGO_BUILD_JOBS` and every other `CARGO*`, `CC*`, `CFLAGS*`, `CXX*`, `CMAKE*` and `RUST*` variable is hashed into the key. `ci.yml` sets `CARGO_BUILD_JOBS` at step level for that reason; promoting it to job level rotates the key for every lane that shares it.
 
 ## Where self-hosted minutes leak
@@ -66,7 +62,7 @@ gh api "repos/rustfs/rustfs/actions/runs/<run_id>/jobs?per_page=100" \
   --jq '.jobs[] | "\(.conclusion)\t\(.labels | join(","))\t\(.started_at)\t\(.completed_at)\t\(.name)"'
 ```
 
-Only rows whose label starts with `sm-`, `dind-`, `ubicloud-`, `smoke-` or `pf-` cost anything. At the October 2026 review, a full pull-request run of `ci.yml` spent about 150 self-hosted minutes, a third of it in jobs that never compiled; treat that as the scale of what a placement mistake costs, not as a current figure.
+Only rows whose label starts with `sm-`, `dind-`, `smoke-` or `pf-` cost anything. At the October 2026 review, a full pull-request run of `ci.yml` spent about 150 self-hosted minutes, a third of it in jobs that never compiled; treat that as the scale of what a placement mistake costs, not as a current figure.
 
 ## Checklist for a new or moved job
 

.github/workflows/audit.yml

@@ -29,6 +29,7 @@ on:
       - 'scripts/test_package_service_scripts.sh'
       - 'scripts/test_package_versions.sh'
       - 'scripts/test_docker_workflow.py'
+      - 'scripts/security/check_performance_ab_workflow.sh'
       - 'scripts/security/check_preview_release_workflow.sh'
       - 'scripts/security/check_tier_artifact_workflow.sh'
       - 'scripts/security/check_workflow_pins.sh'
@@ -47,6 +48,7 @@ on:
       - 'scripts/test_package_service_scripts.sh'
       - 'scripts/test_package_versions.sh'
       - 'scripts/test_docker_workflow.py'
+      - 'scripts/security/check_performance_ab_workflow.sh'
       - 'scripts/security/check_preview_release_workflow.sh'
       - 'scripts/security/check_tier_artifact_workflow.sh'
       - 'scripts/security/check_workflow_pins.sh'
@@ -153,6 +155,9 @@ jobs:
       - name: Check preview release workflow policy
         run: ./scripts/security/check_preview_release_workflow.sh
 
+      - name: Check performance A/B workflow trust boundary
+        run: ./scripts/security/check_performance_ab_workflow.sh
+
       - name: Check tier evidence workflow isolation
         run: ./scripts/security/check_tier_artifact_workflow.sh
 

.github/workflows/btf-prototype-reference.yml

@@ -1,75 +0,0 @@
-name: BTF prototype reference
-
-on:
-  pull_request:
-    paths:
-      - "scripts/inspect_btf_prototypes.py"
-      - "scripts/test_inspect_btf_prototypes.py"
-      - "scripts/fixtures/btf_prototypes.c"
-      - ".github/workflows/btf-prototype-reference.yml"
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: btf-prototype-reference-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  reference:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
-        with:
-          persist-credentials: false
-      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
-        with:
-          python-version: "3.12"
-      - name: Check prototype and CLI contracts
-        run: python3 -B scripts/test_inspect_btf_prototypes.py
-      - name: Install only missing native reference tools
-        run: |
-          select_bpftool() {
-            local candidate
-            local candidates=()
-            if command -v bpftool >/dev/null; then
-              candidates+=("$(command -v bpftool)")
-            fi
-            for candidate in /usr/lib/linux-tools-*/bpftool /usr/lib/linux-tools/*/bpftool; do
-              if [[ -x "$candidate" ]]; then
-                candidates+=("$candidate")
-              fi
-            done
-            while IFS= read -r candidate; do
-              if [[ -x "$candidate" ]] && file -Lb "$candidate" | grep -q 'ELF' \
-                && "$candidate" version >/dev/null 2>&1; then
-                printf '%s\n' "$candidate"
-                return 0
-              fi
-            done < <(printf '%s\n' "${candidates[@]}" | sort -Vr)
-            return 1
-          }
-          packages=()
-          command -v clang >/dev/null || packages+=(clang)
-          command -v llvm-objcopy >/dev/null || packages+=(llvm)
-          command -v gcc >/dev/null || packages+=(gcc)
-          select_bpftool >/dev/null || packages+=(linux-tools-generic)
-          if (( ${#packages[@]} )); then
-            sudo apt-get update
-            sudo apt-get install --no-install-recommends -y "${packages[@]}"
-          fi
-          # File parsing needs a working binary, not a host-kernel wrapper.
-          selected_bpftool="$(select_bpftool)"
-          "$selected_bpftool" version
-          printf 'BPFTOOL=%s\n' "$selected_bpftool" >> "$GITHUB_ENV"
-      - name: Compare declarations and layouts with independent references
-        run: |
-          clang -target bpf -O2 -g -c scripts/fixtures/btf_prototypes.c -o "$RUNNER_TEMP/prototypes.o"
-          llvm-objcopy --dump-section ".BTF=$RUNNER_TEMP/prototypes.btf" "$RUNNER_TEMP/prototypes.o"
-          gcc -std=c11 -Wall -Wextra -Werror -DRUSTFS_BTF_LAYOUT_REFERENCE \
-            scripts/fixtures/btf_prototypes.c -o "$RUNNER_TEMP/layout-reference"
-          "$RUNNER_TEMP/layout-reference" > "$RUNNER_TEMP/layout-reference.json"
-          python3 -B scripts/test_inspect_btf_prototypes.py --native-reference "$RUNNER_TEMP/prototypes.btf" \
-            --layout-reference "$RUNNER_TEMP/layout-reference.json"

.github/workflows/build.yml

@@ -181,18 +181,12 @@ jobs:
             selected="all"
           fi
 
-          # linux-aarch64-* need a real aarch64 host (placement rule: hardware)
-          # so the packaged binary and console smoke execute the artifact.
-          # ubicloud-standard-16-arm is that host: Ubuntu 24.04 arm64, alias of
-          # ubicloud-standard-16-arm-ubuntu-2404 (16 vCPU, 48 GB). linux-x86_64-* stay on the
-          # ARC sm-standard-4 pool. GNU rows keep cross=true so cargo-zigbuild
-          # pins the glibc 2.31 floor on the same architecture; musl stays a
-          # native cargo build.
+
           all='{"include":[
             {"target_id":"linux-x86_64-musl","os":"sm-standard-4","target":"x86_64-unknown-linux-musl","cross":false,"platform":"linux","rustflags":"","features":"","glibc":""},
-            {"target_id":"linux-aarch64-musl","os":"ubicloud-standard-16-arm","target":"aarch64-unknown-linux-musl","cross":false,"platform":"linux","rustflags":"","features":"","glibc":""},
+            {"target_id":"linux-aarch64-musl","os":"sm-standard-4-arm","target":"aarch64-unknown-linux-musl","cross":false,"platform":"linux","rustflags":"","features":"","glibc":""},
             {"target_id":"linux-x86_64-gnu","os":"sm-standard-4","target":"x86_64-unknown-linux-gnu","cross":true,"platform":"linux","rustflags":"","features":"pyroscope","glibc":"2.31"},
-            {"target_id":"linux-aarch64-gnu","os":"ubicloud-standard-16-arm","target":"aarch64-unknown-linux-gnu","cross":true,"platform":"linux","rustflags":"","features":"pyroscope","glibc":"2.31"},
+            {"target_id":"linux-aarch64-gnu","os":"sm-standard-4-arm","target":"aarch64-unknown-linux-gnu","cross":true,"platform":"linux","rustflags":"","features":"pyroscope","glibc":"2.31"},
             {"target_id":"macos-aarch64","os":"macos-latest","target":"aarch64-apple-darwin","cross":false,"platform":"macos","rustflags":"","features":"pyroscope","glibc":""},
             {"target_id":"windows-x86_64","os":"windows-latest","target":"x86_64-pc-windows-msvc","cross":false,"platform":"windows","rustflags":"","features":"","glibc":""}
           ]}'
@@ -250,11 +244,7 @@ jobs:
         with:
           rust-version: stable
           target: ${{ matrix.target }}
-          # rust-cache keys include OS and architecture but not the runner image.
-          # The Ubicloud aarch64 legs therefore use their own suffix so they
-          # cannot restore a cache written on a different arm64 image.
-          # x86_64, macOS, and Windows keys stay unsuffixed.
-          cache-shared-key: build-${{ matrix.target }}${{ matrix.glibc && format('-glibc-{0}', matrix.glibc) || '' }}${{ matrix.os == 'ubicloud-standard-16-arm' && '-ubicloud-arm' || '' }}
+          cache-shared-key: build-${{ matrix.target }}${{ matrix.glibc && format('-glibc-{0}', matrix.glibc) || '' }}
           # main only. A cache saved on refs/tags/X is scoped to that tag: no
           # other tag, no main run and no PR can restore it, so every release
           # cycle wrote up to 12 entries of 1-2GB (preview tag plus final tag,
@@ -774,9 +764,9 @@ jobs:
             exit 0
           fi
 
-          # ARC pods (the x86_64 legs) do not ship the aws CLI. Ubicloud arm64
-          # images follow the GitHub runner image and often do. Install the
-          # official CLI bundle when it is missing so R2 uploads work on either.
+          # The self-hosted Linux runners do not ship the aws CLI (GitHub-hosted
+          # images did). Install the official CLI bundle on demand so R2 uploads
+          # survive a fresh runner without relying on a distro package.
           if ! command -v aws >/dev/null 2>&1; then
             echo "aws CLI not found on runner; installing..."
             if command -v apt-get >/dev/null 2>&1; then

.github/workflows/coverage.yml

@@ -45,7 +45,7 @@ on:
     # 07:00 UTC Sunday — staggered clear of the other Sunday crons: ci (00:00),
     # build (01:00), e2e-s3tests (02:00), audit (03:00), nix-flake-update
     # (05:00), mint (06:00), and the daily fuzz (02:00), minio-interop (03:17),
-    # and e2e-replication-nightly (04:00) lanes.
+    # e2e-replication-nightly (04:00) and performance-ab (06:00) lanes.
     - cron: "43 7 * * 0"
 
 concurrency:

.github/workflows/docker.yml

@@ -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

.github/workflows/e2e-distributed.yml

@@ -153,7 +153,7 @@ jobs:
 
       - name: Build rustfs binary
         run: |
-          python3 scripts/e2e_binary.py build --bins --features e2e-test-hooks
+          python3 scripts/e2e_binary.py build --bins
 
       - name: Verify distributed e2e membership
         env:
@@ -170,9 +170,9 @@ jobs:
           set -euo pipefail
           rm -f target/nextest/e2e-distributed/junit.xml
           if [ -n "${FILTER}" ]; then
-            python3 scripts/e2e_binary.py run --features e2e-test-hooks -- cargo nextest run --profile e2e-distributed -p e2e_test -E "${FILTER}"
+            python3 scripts/e2e_binary.py run -- cargo nextest run --profile e2e-distributed -p e2e_test -E "${FILTER}"
           else
-            python3 scripts/e2e_binary.py run --features e2e-test-hooks -- cargo nextest run --profile e2e-distributed -p e2e_test --no-tests=fail
+            python3 scripts/e2e_binary.py run -- cargo nextest run --profile e2e-distributed -p e2e_test --no-tests=fail
           fi
           test -s target/nextest/e2e-distributed/junit.xml
 

.github/workflows/e2e-replication-nightly.yml

@@ -38,8 +38,8 @@ name: e2e-nightly
 on:
   workflow_dispatch:
   schedule:
-    # 04:00 UTC nightly — staggered clear of fuzz/e2e-s3tests (02:00)
-    # and stale (01:30).
+    # 04:00 UTC nightly — staggered clear of fuzz/e2e-s3tests (02:00),
+    # stale (01:30) and performance-ab (06:00).
     - cron: "29 4 * * *"
 
 # Only alert-on-failure needs more than read access; it declares its own

.github/workflows/e2e-upgrade.yml

@@ -19,15 +19,12 @@ on:
     paths:
       - ".github/workflows/e2e-upgrade.yml"
       - "crates/e2e_test/src/common.rs"
-      - "crates/e2e_test/src/distributed/**"
       - "crates/e2e_test/src/fake_s3_target/**"
       - "crates/e2e_test/src/lib.rs"
       - "crates/e2e_test/src/replication_extension_test.rs"
-      - "crates/e2e_test/src/rpc_fault_proxy.rs"
       - "crates/e2e_test/src/upgrade_compatibility_test.rs"
       - "crates/ecstore/**"
       - "crates/filemeta/**"
-      - "crates/heal/**"
       - "crates/kms/**"
       - "crates/storage-api/**"
       - "rustfs/**"
@@ -130,7 +127,6 @@ jobs:
         run: chmod +x target/debug/rustfs
 
       - name: Verify and unpack pinned previous release
-        id: verify_source
         env:
           SOURCE_DIR: ${{ runner.temp }}/rustfs-upgrade-source
         run: |
@@ -164,7 +160,6 @@ jobs:
           )
           if [[ "$UPGRADE_SOURCE_VERSION" == "1.0.0-rc.5" ]]; then
             cases+=(odm-config-rollback:rc5_rollback_requires_restoring_odm_configuration)
-            cases+=(checkpoint-upgrade:rc5_checkpoint_upgrade_rewinds_signed_progress_without_losing_objects)
           else
             cases+=(legacy-delete-reservation:stable_upgrade_deletes_foreign_reservations_without_losing_live_objects)
           fi
@@ -188,28 +183,6 @@ jobs:
           done
           exit "$status"
 
-      - name: Run mixed-version MPU recovery
-        if: ${{ !cancelled() && steps.verify_source.outcome == 'success' }}
-        timeout-minutes: 15
-        env:
-          NO_PROXY: 127.0.0.1,localhost,::1
-          HTTP_PROXY: ""
-          HTTPS_PROXY: ""
-          ALL_PROXY: ""
-          RUSTFS_E2E_LOG_FILTER: "warn,rustfs_ecstore::cluster::rpc::client=debug"
-        run: |
-          set -euo pipefail
-          export no_proxy="$NO_PROXY"
-          export RUSTFS_E2E_LOG_DIR="$RUNNER_TEMP/rustfs-upgrade-logs/mpu-mixed-recovery"
-          mkdir -p "$RUSTFS_E2E_LOG_DIR"
-          mpu_test='distributed::multipart_fence_acceptance_test::mixed_version_failed_complete_requires_current_coordinator_for_abort'
-          python3 scripts/e2e_binary.py run -- cargo test --locked -p e2e_test --lib \
-            "$mpu_test" -- --list --exact | tee "$RUSTFS_E2E_LOG_DIR/list.log"
-          test "$(grep -Fxc "${mpu_test}: test" "$RUSTFS_E2E_LOG_DIR/list.log")" -eq 1
-          python3 scripts/e2e_binary.py run -- cargo test --locked -p e2e_test --lib \
-            "$mpu_test" -- --exact --nocapture --test-threads=1 \
-            2>&1 | tee "$RUSTFS_E2E_LOG_DIR/test.log"
-
       - name: Upload scanner/heal G09 evidence
         if: always()
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1

.github/workflows/performance-ab.yml

@@ -0,0 +1,384 @@
+# 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.
+
+# Warp A/B budget gate for the hotpath series (rustfs/backlog#935 HP-14, item 4).
+#
+# Two entry points, honestly scoped:
+#   * schedule (nightly, on main): post-merge detection — catches a regression
+#     within 24h of landing, not before merge.
+#   * workflow_dispatch: an explicitly selected trusted ref.
+# The dispatch input can run the gate with --allow-regression so a deliberate
+# correctness cost (e.g. the #4221 fsync durability fix) is recorded, not
+# blocked (rustfs/backlog#935 correction 1).
+
+name: Performance A/B
+
+on:
+  schedule:
+    - cron: "31 6 * * *" # 06:31 UTC nightly, against main
+  workflow_dispatch:
+    inputs:
+      duration:
+        description: "warp duration per round"
+        required: false
+        default: "12s"
+        type: string
+      allow_regression:
+        description: "Pass the gate despite a FAIL (deliberate tradeoff)"
+        required: false
+        default: false
+        type: boolean
+permissions:
+  actions: read
+  contents: read
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: 1
+
+jobs:
+  warp-ab:
+    if: github.repository == 'rustfs/rustfs'
+    name: Warp A/B budget gate
+    runs-on: sm-standard-2
+    # A normal nightly restores the last successful binary and builds only the
+    # candidate; daily access keeps that cache warm. A cache miss may build both
+    # and needs room for the A/B run plus artifact and cache publication.
+    timeout-minutes: 180
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
+        with:
+          persist-credentials: false
+          fetch-depth: 0 # baseline may be an earlier successful scheduled head
+
+      - name: Setup Rust environment
+        uses: ./.github/actions/setup
+        with:
+          rust-version: stable
+          cache-shared-key: warp-ab-${{ hashFiles('**/Cargo.lock') }}
+          cache-save-if: ${{ github.ref == 'refs/heads/main' }}
+
+      - name: Install warp
+        run: |
+          set -euo pipefail
+          WARP_VERSION="1.0.0"
+          curl -fsSL "https://github.com/minio/warp/releases/download/v${WARP_VERSION}/warp_Linux_x86_64.tar.gz" \
+            | sudo tar -xz -C /usr/local/bin warp
+          warp --version
+
+      - name: Decide exemption
+        id: exempt
+        env:
+          INPUT_ALLOW_REGRESSION: ${{ github.event.inputs.allow_regression }}
+        run: |
+          allow="false"
+          if [[ "$INPUT_ALLOW_REGRESSION" == "true" ]]; then
+            allow="true"
+          fi
+          echo "allow_regression=$allow" >> "$GITHUB_OUTPUT"
+
+      # A failed regression run must keep comparing against the last known-good
+      # scheduled head. Otherwise the next nightly would absorb the regression
+      # into its baseline and turn green without a fix.
+      - name: Find last successful scheduled baseline
+        id: scheduled_baseline
+        if: github.event_name == 'schedule'
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          result-encoding: string
+          script: |
+            const { data } = await github.rest.actions.listWorkflowRuns({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: "performance-ab.yml",
+              event: "schedule",
+              status: "success",
+              per_page: 1,
+            });
+            return data.workflow_runs[0]?.head_sha ?? "";
+
+      # Manual runs compare a selected ref with current main. Scheduled runs
+      # compare current main with the last successful scheduled head. With no
+      # history, the first run measures the candidate against itself and seeds
+      # that head only if the complete rig succeeds.
+      - name: Resolve baseline / candidate commits
+        id: commits
+        env:
+          SCHEDULED_BASELINE_SHA: ${{ steps.scheduled_baseline.outputs.result }}
+        run: |
+          set -euo pipefail
+          candidate_sha="$(git rev-parse HEAD)"
+          if [[ "${{ github.event_name }}" == "schedule" ]]; then
+            baseline_sha="${SCHEDULED_BASELINE_SHA:-$candidate_sha}"
+          else
+            baseline_sha="$(git rev-parse origin/main)"
+          fi
+          git cat-file -e "${baseline_sha}^{commit}"
+          if ! git merge-base --is-ancestor "$baseline_sha" "$candidate_sha"; then
+            echo "::error::baseline $baseline_sha is not an ancestor of candidate $candidate_sha; update the selected ref before comparing" >&2
+            exit 1
+          fi
+          echo "baseline_sha=$baseline_sha" >> "$GITHUB_OUTPUT"
+          echo "candidate_sha=$candidate_sha" >> "$GITHUB_OUTPUT"
+          echo "baseline commit: $baseline_sha"
+          echo "candidate commit: $candidate_sha"
+
+      # Exact-key restore of the candidate binary saved by its successful
+      # scheduled run. A miss leaves cache-hit unset and falls back to a source
+      # build of that known-good head.
+      - name: Restore cached baseline binary
+        id: baseline_cache
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
+        with:
+          path: baseline-bin/rustfs
+          key: rustfs-baseline-${{ steps.commits.outputs.baseline_sha }}
+
+      # Self-heal: on a nightly/dispatch run where the candidate commit IS the
+      # baseline commit, a cache miss would make the rig build the same commit
+      # twice (~65min per side with the post-#4806 LTO profile — no job budget
+      # fits that). Build it once here, reuse it for both phases, and save it
+      # back to the cache so the next run hits.
+      - name: Build baseline on cache miss (same-commit self-heal)
+        id: selfheal
+        if: >-
+          steps.baseline_cache.outputs.cache-hit != 'true' &&
+          steps.commits.outputs.baseline_sha == steps.commits.outputs.candidate_sha
+        run: |
+          set -euo pipefail
+          cargo build --release --bin rustfs
+          mkdir -p baseline-bin
+          cp target/release/rustfs baseline-bin/rustfs
+          echo "built=true" >> "$GITHUB_OUTPUT"
+
+      - name: Build baseline on cache miss (different candidate)
+        id: baseline_build
+        if: >-
+          steps.baseline_cache.outputs.cache-hit != 'true' &&
+          steps.commits.outputs.baseline_sha != steps.commits.outputs.candidate_sha
+        run: |
+          set -euo pipefail
+          baseline_root="$RUNNER_TEMP/rustfs-baseline-${{ github.run_id }}"
+          baseline_target="$RUNNER_TEMP/rustfs-baseline-target-${{ github.run_id }}"
+          git worktree add --detach "$baseline_root" "${{ steps.commits.outputs.baseline_sha }}"
+          cargo build --release --manifest-path "$baseline_root/Cargo.toml" --bin rustfs --target-dir "$baseline_target"
+          mkdir -p baseline-bin
+          cp "$baseline_target/release/rustfs" baseline-bin/rustfs
+          git worktree remove --force "$baseline_root"
+          echo "built=true" >> "$GITHUB_OUTPUT"
+
+      - name: Build candidate binary
+        id: candidate_build
+        if: steps.commits.outputs.baseline_sha != steps.commits.outputs.candidate_sha
+        run: |
+          set -euo pipefail
+          cargo build --release --bin rustfs
+          mkdir -p candidate-bin
+          cp target/release/rustfs candidate-bin/rustfs
+          echo "built=true" >> "$GITHUB_OUTPUT"
+
+      - name: Save self-healed baseline to cache
+        if: steps.selfheal.outputs.built == 'true' || steps.baseline_build.outputs.built == 'true'
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
+        with:
+          path: baseline-bin/rustfs
+          key: rustfs-baseline-${{ steps.commits.outputs.baseline_sha }}
+
+      - name: Run warp A/B and gate
+        id: ab
+        env:
+          INPUT_DURATION: ${{ github.event.inputs.duration }}
+        run: |
+          set -euo pipefail
+          # The formal runner executes A1 baseline -> B1 candidate -> B2 candidate
+          # -> A2 baseline for each workload and drive-sync cell. It requires three
+          # rounds per leg to emit tail latency and error-rate evidence.
+          # --health-timeout 180 outlasts the server's own 120s startup-readiness
+          # budget, which the rig's previous 60s health poll undershot (the first
+          # two nightly failures). perf-6 recalibrates these once the noise study
+          # lands.
+          duration="${INPUT_DURATION:-12s}"
+          baseline_sha="${{ steps.commits.outputs.baseline_sha }}"
+          candidate_sha="${{ steps.commits.outputs.candidate_sha }}"
+          baseline_hit="${{ steps.baseline_cache.outputs.cache-hit }}"
+          selfheal_built="${{ steps.selfheal.outputs.built }}"
+          baseline_built="${{ steps.baseline_build.outputs.built }}"
+          candidate_built="${{ steps.candidate_build.outputs.built }}"
+
+          args=(--duration "$duration" --rounds 3 --cooldown 5 --health-timeout 180 --baseline-revision "$baseline_sha" --candidate-revision "$candidate_sha")
+
+          if [[ "$baseline_hit" == "true" || "$selfheal_built" == "true" || "$baseline_built" == "true" ]]; then
+            chmod +x baseline-bin/rustfs
+            base_bin="$PWD/baseline-bin/rustfs"
+            args+=(--baseline-bin "$base_bin")
+            if [[ "$baseline_hit" == "true" ]]; then
+              base_src="actions-cache (rustfs-baseline-$baseline_sha)"
+            elif [[ "$selfheal_built" == "true" ]]; then
+              base_src="source build (cache self-heal, saved as rustfs-baseline-$baseline_sha)"
+            else
+              base_src="isolated baseline source build (saved as rustfs-baseline-$baseline_sha)"
+            fi
+            if [[ "$candidate_sha" == "$baseline_sha" ]]; then
+              # No commits landed since the last successful baseline, so reuse
+              # the one binary for both phases and measure only rig drift.
+              args+=(--candidate-bin "$base_bin")
+              cand_src="same binary as baseline (same commit)"
+            elif [[ "$candidate_built" == "true" ]]; then
+              chmod +x candidate-bin/rustfs
+              args+=(--candidate-bin "$PWD/candidate-bin/rustfs")
+              cand_src="source build of the checked-out ref"
+            else
+              echo "::error::candidate binary was not built" >&2
+              exit 2
+            fi
+          else
+            echo "::error::baseline binary was not restored or built" >&2
+            exit 2
+          fi
+
+          echo "baseline binary: $base_src"
+          echo "candidate binary: $cand_src"
+
+          if [[ "${{ steps.exempt.outputs.allow_regression }}" == "true" ]]; then
+            args+=(--allow-regression --exemption-reason "workflow dispatch override")
+          fi
+          # Do not let a gate FAIL abort the job here; capture status and surface
+          # it after the step summary is written.
+          set +e
+          bash scripts/run_hotpath_warp_abba.sh "${args[@]}"
+          echo "status=$?" >> "$GITHUB_OUTPUT"
+          set -e
+          # Locate the newest run dir + gate.md for the summary/comment/artifact
+          # steps. On a startup failure there is no gate.md, but the run dir still
+          # holds server-logs/ for diagnosis.
+          # Run dirs are UTC-timestamp names (no special chars); ls is safe here.
+          # shellcheck disable=SC2012
+          run_dir="$(ls -td target/hotpath-abba/*/ 2>/dev/null | head -n1 || true)"
+          echo "run_dir=${run_dir%/}" >> "$GITHUB_OUTPUT"
+          # shellcheck disable=SC2012
+          gate_md="$(ls -t target/hotpath-abba/*/candidate_gate.md 2>/dev/null | head -n1 || true)"
+          echo "gate_md=$gate_md" >> "$GITHUB_OUTPUT"
+
+      - name: Upload A/B results
+        if: always()
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: hotpath-warp-ab-${{ github.run_number }}
+          # Includes per-cell median_summary.csv / baseline_compare.csv, both gates,
+          # and server-logs/ (rustfs.log + startup env per phase) so a failed run
+          # is diagnosable. Short retention: this is churny nightly debug data.
+          path: target/hotpath-abba/
+          if-no-files-found: warn
+          retention-days: 14
+
+      - name: Write gate summary
+        if: always()
+        run: |
+          set -euo pipefail
+          status="${{ steps.ab.outputs.status }}"
+          gate_md="${{ steps.ab.outputs.gate_md }}"
+          run_dir="${{ steps.ab.outputs.run_dir }}"
+          {
+            echo "## Hotpath warp A/B — run ${{ github.run_number }}"
+            echo
+            if [[ "$status" == "0" ]]; then
+              echo "Rig/gate exit: \`0\` (pass or warn)."
+            else
+              echo "Rig/gate exit: \`${status:-unknown}\` — **FAILED**."
+            fi
+            echo
+            if [[ -n "$gate_md" && -f "$gate_md" ]]; then
+              cat "$gate_md"
+            else
+              echo "No \`gate.md\` produced — the rig failed **before** the gate"
+              echo "(most likely server startup / health). Failing phase(s) below;"
+              echo "full logs in the \`hotpath-warp-ab-${{ github.run_number }}\` artifact."
+              if [[ -n "$run_dir" && -d "$run_dir/server-logs" ]]; then
+                for f in "$run_dir"/server-logs/*.log; do
+                  [[ -f "$f" ]] || continue
+                  echo
+                  echo "<details><summary>$(basename "$f")</summary>"
+                  echo
+                  echo '```'
+                  tail -n 30 "$f"
+                  echo '```'
+                  echo "</details>"
+                done
+              fi
+            fi
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Stage successful candidate baseline
+        if: >-
+          steps.ab.outputs.status == '0' &&
+          steps.commits.outputs.baseline_sha != steps.commits.outputs.candidate_sha
+        run: |
+          set -euo pipefail
+          cp candidate-bin/rustfs baseline-bin/rustfs
+
+      - name: Cache successful candidate baseline
+        if: >-
+          steps.ab.outputs.status == '0' &&
+          steps.commits.outputs.baseline_sha != steps.commits.outputs.candidate_sha
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
+        with:
+          path: baseline-bin/rustfs
+          key: rustfs-baseline-${{ steps.commits.outputs.candidate_sha }}
+
+      # Scheduled failure alerting is handled by the alert-on-failure job below
+      # (perf-2 consuming ci-8's schedule-failure-issue composite action).
+
+      - name: Enforce gate
+        if: always()
+        run: |
+          status="${{ steps.ab.outputs.status }}"
+          if [[ -z "$status" ]]; then
+            echo "::error::warp A/B setup failed before the rig ran. Check the first failed workflow step." >&2
+            exit 1
+          fi
+          if [[ "$status" != "0" ]]; then
+            echo "::error::warp A/B budget gate failed (exit $status). See the step summary / gate.md artifact." >&2
+            exit "$status"
+          fi
+          echo "warp A/B budget gate passed."
+
+  alert-on-failure:
+    name: Alert on scheduled failure
+    needs: [warp-ab]
+    # `always()` is required: without it this job is skipped when a needed
+    # job fails. Alerts only for scheduled (nightly) runs (backlog#1149
+    # ci-8); manual dispatch failures are already watched by a human.
+    # `cancelled` is included alongside `failure` on purpose: a job that hits
+    # timeout-minutes ends as `cancelled`, and the 2026-07-11..07-14 nightly
+    # timeouts went silent precisely because the guard was failure-only. The
+    # composite action already reports cancelled/timed-out jobs in the issue
+    # body.
+    if: >-
+      github.repository == 'rustfs/rustfs' && (
+        always() && github.event_name == 'schedule' &&
+        (contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled'))
+      )
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions:
+      contents: read
+      issues: write
+    steps:
+      - uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
+        with:
+          persist-credentials: false
+      - name: Open or update failure-tracking issue
+        uses: ./.github/actions/schedule-failure-issue
+        with:
+          github-token: ${{ secrets.BACKLOG_ISSUE_TOKEN }}

.github/workflows/runner-hygiene.yml

@@ -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

.github/workflows/rustfs-functional-chain.yml

@@ -20,13 +20,65 @@ on:
   workflow_dispatch:
     inputs:
       build_run_id:
-        description: Successful nightly build run on main
+        description: Successful nightly or validation package run; empty for package-only build
         type: string
-        required: true
+        required: false
+        default: ''
       build_run_attempt:
         description: Exact successful build attempt
         type: string
-        required: true
+        required: false
+        default: ''
+      validation_package_sha:
+        description: Exact source SHA for an isolated package-only build
+        type: string
+        required: false
+        default: ''
+      validation_case:
+        description: Canonical case ID, environment.inspect for read-only resources, or empty for functional chain
+        type: string
+        required: false
+        default: ''
+      auto_testing_sha:
+        description: Exact auto-testing commit for a validation case
+        type: string
+        required: false
+        default: ''
+      validation_tools_only:
+        description: Build candidate-bound validation tools without running a fleet case
+        type: boolean
+        required: false
+        default: false
+      validation_native_tools:
+        description: Include exact-source native regressions in a tools-only build
+        type: boolean
+        required: false
+        default: false
+      validation_shared_tools:
+        description: Include the controlled C10 shared-reference encoder in a tools-only build
+        type: boolean
+        required: false
+        default: false
+      validation_manager_tools:
+        description: Include exact checkpoint/MRF/incarnation regressions in a tools-only build
+        type: boolean
+        required: false
+        default: false
+      validation_cleanup_run_id:
+        description: Failed validation run whose supported retained environment needs evidence-based finalization
+        type: string
+        required: false
+        default: ''
+      validation_tools_run_id:
+        description: Successful tool build run; required by Heal physical metadata checks
+        type: string
+        required: false
+        default: ''
+      validation_tools_run_attempt:
+        description: Exact tool build attempt
+        type: string
+        required: false
+        default: '1'
   workflow_run:
     workflows: ["Nightly GNU Build"]
     types: [completed]
@@ -36,13 +88,48 @@ permissions:
   actions: read
 
 concurrency:
-  group: rustfs-functional-chain-runs
+  group: ${{ github.event_name == 'workflow_dispatch' && inputs.validation_package_sha != '' && format('rustfs-functional-validation-package-{0}', inputs.validation_package_sha) || github.event_name == 'workflow_dispatch' && inputs.validation_tools_only && 'rustfs-functional-validation-tools' || 'rustfs-functional-chain-runs' }}
   cancel-in-progress: false
 
 jobs:
-  prepare:
-    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.event == 'schedule' }}
+  validation-package-request:
+    if: ${{ github.event_name == 'workflow_dispatch' && inputs.validation_package_sha != '' }}
     runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Validate exclusive package-only request
+        env:
+          PACKAGE_INPUTS: ${{ toJSON(inputs) }}
+        run: |
+          python3 - <<'PY'
+          import json
+          import os
+          import re
+          value = json.loads(os.environ["PACKAGE_INPUTS"])
+          if re.fullmatch(r"[0-9a-f]{40}", value["validation_package_sha"]) is None:
+              raise ValueError("package build requires an exact source SHA")
+          exclusive = ("build_run_id", "build_run_attempt", "validation_case", "auto_testing_sha",
+                       "validation_tools_only", "validation_native_tools", "validation_shared_tools",
+                       "validation_manager_tools", "validation_cleanup_run_id", "validation_tools_run_id")
+          if any(value.get(name) for name in exclusive):
+              raise ValueError("package-only build cannot select existing candidate, tools, fleet or recovery execution")
+          PY
+
+  validation-package:
+    needs: validation-package-request
+    if: ${{ github.event_name == 'workflow_dispatch' && inputs.validation_package_sha != '' }}
+    uses: ./.github/workflows/rustfs-validation-package.yml
+    with:
+      source_sha: ${{ inputs.validation_package_sha }}
+    secrets:
+      R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+      R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+      R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
+      R2_BUCKET: ${{ secrets.R2_BUCKET }}
+
+  prepare:
+    if: ${{ (github.event_name == 'workflow_dispatch' && inputs.validation_package_sha == '' && inputs.validation_case == '' && !inputs.validation_tools_only && !inputs.validation_native_tools && !inputs.validation_shared_tools && !inputs.validation_manager_tools && inputs.validation_cleanup_run_id == '') || github.event.workflow_run.event == 'schedule' }}
+    runs-on: smoke-testing
     timeout-minutes: 10
     outputs:
       manifest: ${{ steps.candidate.outputs.manifest }}
@@ -89,6 +176,350 @@ jobs:
             echo "performance_ready=offline" >> "$GITHUB_OUTPUT"
           fi
 
+  validation:
+    if: ${{ github.event_name == 'workflow_dispatch' && inputs.validation_package_sha == '' && (inputs.validation_case != '' || inputs.validation_tools_only || inputs.validation_native_tools || inputs.validation_shared_tools || inputs.validation_manager_tools || inputs.validation_cleanup_run_id != '') }}
+    runs-on: ${{ inputs.validation_tools_only && 'ubuntu-latest' || 'smoke-testing' }}
+    timeout-minutes: 90
+    outputs:
+      source_sha: ${{ steps.candidate.outputs.source_sha }}
+    concurrency:
+      group: ${{ inputs.validation_tools_only && 'rustfs-validation-tools-resolver' || 'rustfs-shared-functional-tests-v2' }}
+      cancel-in-progress: false
+    env:
+      RUSTFS_ACCESS_KEY: ${{ !inputs.validation_tools_only && secrets.RUSTFS_ACCESS_KEY || '' }}
+      RUSTFS_SECRET_KEY: ${{ !inputs.validation_tools_only && secrets.RUSTFS_SECRET_KEY || '' }}
+      RUSTFS_API_ENDPOINT: ${{ !inputs.validation_tools_only && (secrets.RUSTFS_API_ENDPOINT || vars.RUSTFS_API_ENDPOINT || vars.RUSTFS_RC_ENDPOINT) || '' }}
+      RUSTFS_NODES: ${{ !inputs.validation_tools_only && (secrets.RUSTFS_NODES || vars.RUSTFS_NODES) || '' }}
+      RUSTFS_SSH_USER: ${{ !inputs.validation_tools_only && (secrets.RUSTFS_SSH_USER || vars.RUSTFS_SSH_USER) || '' }}
+    steps:
+      - name: Checkout candidate resolver
+        uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
+        with:
+          persist-credentials: false
+
+      - name: Initialize validation evidence
+        run: |
+          set -euo pipefail
+          umask 077
+          VALIDATION_ROOT="${RUNNER_TEMP}/rustfs-validation-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          mkdir -- "${VALIDATION_ROOT}"
+          printf 'VALIDATION_ROOT=%s\n' "${VALIDATION_ROOT}" >> "${GITHUB_ENV}"
+
+      - name: Resolve immutable candidate
+        id: candidate
+        env:
+          GH_TOKEN: ${{ secrets.PF_TESTING_GH_TOKEN }}
+          BUILD_RUN_ID: ${{ inputs.build_run_id }}
+          BUILD_RUN_ATTEMPT: ${{ inputs.build_run_attempt }}
+          AUTO_TESTING_SHA: ${{ inputs.auto_testing_sha }}
+          CLEANUP_RUN_ID: ${{ inputs.validation_cleanup_run_id }}
+          SELECTED_CASE: ${{ inputs.validation_case }}
+          TOOLS_ONLY: ${{ inputs.validation_tools_only }}
+          NATIVE_TOOLS: ${{ inputs.validation_native_tools }}
+          SHARED_TOOLS: ${{ inputs.validation_shared_tools }}
+          MANAGER_TOOLS: ${{ inputs.validation_manager_tools }}
+        run: |
+          set -euo pipefail
+          python3 - <<'PY'
+          import json
+          import os
+          from pathlib import Path
+          import re
+          from scripts.resolve_functional_candidate import resolve
+
+          revision = os.environ["AUTO_TESTING_SHA"]
+          cleanup = os.environ["CLEANUP_RUN_ID"]
+          if os.environ["TOOLS_ONLY"] == "true" and (cleanup or os.environ["SELECTED_CASE"]):
+              raise ValueError("tools-only execution cannot select a fleet case or cleanup")
+          if os.environ["NATIVE_TOOLS"] == "true" and (os.environ["TOOLS_ONLY"] != "true" or cleanup or os.environ["SELECTED_CASE"]):
+              raise ValueError("native regressions require tools-only execution, without a fleet case or cleanup")
+          if os.environ["SHARED_TOOLS"] == "true" and (os.environ["TOOLS_ONLY"] != "true" or cleanup or os.environ["SELECTED_CASE"]):
+              raise ValueError("shared fixture builds require tools-only execution, without a fleet case or cleanup")
+          if os.environ["MANAGER_TOOLS"] == "true" and (os.environ["TOOLS_ONLY"] != "true" or cleanup or os.environ["SELECTED_CASE"]):
+              raise ValueError("manager regressions require tools-only execution, without a fleet case or cleanup")
+          if cleanup and (not cleanup.isdigit() or int(cleanup) <= 0 or os.environ["SELECTED_CASE"] or os.environ["TOOLS_ONLY"] == "true"):
+              raise ValueError("cleanup requires one exact failed run and is exclusive with case/tool execution")
+          if re.fullmatch(r"[0-9a-f]{40}", revision) is None:
+              raise ValueError("validation requires an exact auto-testing commit SHA")
+          candidate = resolve(int(os.environ["BUILD_RUN_ID"]), int(os.environ["BUILD_RUN_ATTEMPT"]), allow_validation=True)
+          manifest = candidate["manifest"]
+          root = Path(os.environ["VALIDATION_ROOT"])
+          (root / "candidate-source.json").write_text(json.dumps(candidate, sort_keys=True) + "\n")
+          (root / "candidate.json").write_text(json.dumps({
+              "package_url": manifest["package_url"],
+              "package_sha256": manifest["package_sha256"],
+              "source_sha": manifest["source_sha"],
+          }, sort_keys=True) + "\n")
+          with open(os.environ["GITHUB_OUTPUT"], "a") as output:
+              output.write("source_sha=" + manifest["source_sha"] + "\n")
+          PY
+
+      - name: Checkout exact auto-testing revision
+        uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
+        with:
+          repository: rustfs/auto-testing
+          ref: ${{ inputs.auto_testing_sha }}
+          token: ${{ secrets.PF_TESTING_GH_TOKEN }}
+          path: auto-testing
+          persist-credentials: false
+
+      - name: Install validation Python client
+        if: ${{ !inputs.validation_tools_only && (startsWith(inputs.validation_case, 'ilm.') || startsWith(inputs.validation_case, 'pool.') || startsWith(inputs.validation_case, 'bucket-replication.') || startsWith(inputs.validation_case, 'site-replication.') || startsWith(inputs.validation_case, 'heal.')) }}
+        run: |
+          set -euo pipefail
+          python3 -m venv "${RUNNER_TEMP}/rustfs-validation-python"
+          "${RUNNER_TEMP}/rustfs-validation-python/bin/python" -m pip install \
+            -r auto-testing/scripts/validation_ilm/requirements.txt
+          printf '%s\n' "${RUNNER_TEMP}/rustfs-validation-python/bin" >> "${GITHUB_PATH}"
+
+      - name: Validate Heal tool build identity
+        if: ${{ !inputs.validation_tools_only && startsWith(inputs.validation_case, 'heal.') }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+          TOOL_RUN_ID: ${{ inputs.validation_tools_run_id }}
+          TOOL_RUN_ATTEMPT: ${{ inputs.validation_tools_run_attempt }}
+        run: |
+          set -euo pipefail
+          [[ "${TOOL_RUN_ID}" =~ ^[1-9][0-9]*$ ]]
+          [[ "${TOOL_RUN_ATTEMPT}" =~ ^[1-9][0-9]*$ ]]
+          gh api "repos/${GITHUB_REPOSITORY}/actions/runs/${TOOL_RUN_ID}/attempts/${TOOL_RUN_ATTEMPT}" \
+            > "${VALIDATION_ROOT}/tool-run.json"
+          python3 - <<'PY'
+          import json
+          import os
+          from pathlib import Path
+          value = json.loads((Path(os.environ["VALIDATION_ROOT"]) / "tool-run.json").read_text())
+          if (value.get("conclusion") != "success" or value.get("status") != "completed"
+                  or value.get("run_attempt") != int(os.environ["TOOL_RUN_ATTEMPT"])
+                  or value.get("path") not in {".github/workflows/rustfs-functional-chain.yml", ".github/workflows/rustfs-validation-tools.yml"}):
+              raise ValueError("Heal tool run is not an exact successful validation build attempt")
+          PY
+
+      - name: Download pinned Heal metadata inspector
+        if: ${{ !inputs.validation_tools_only && startsWith(inputs.validation_case, 'heal.') }}
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          github-token: ${{ github.token }}
+          run-id: ${{ inputs.validation_tools_run_id }}
+          name: rustfs-validation-tools-${{ inputs.validation_tools_run_id }}-${{ inputs.validation_tools_run_attempt }}
+          path: ${{ runner.temp }}/rustfs-validation-tools-${{ github.run_id }}-${{ github.run_attempt }}
+
+      - name: Verify Heal metadata inspector
+        if: ${{ !inputs.validation_tools_only && startsWith(inputs.validation_case, 'heal.') }}
+        run: |
+          set -euo pipefail
+          TOOL_DIRECTORY="${RUNNER_TEMP}/rustfs-validation-tools-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          python3 -B auto-testing/scripts/validation_heal/inspector.py \
+            --directory "${TOOL_DIRECTORY}" --candidate "${VALIDATION_ROOT}/candidate.json" \
+            > "${VALIDATION_ROOT}/tool-manifest.json"
+          printf 'VALIDATION_HEAL_TOOL_DIRECTORY=%s\n' "${TOOL_DIRECTORY}" >> "${GITHUB_ENV}"
+
+      - name: Select exact-source race native evidence
+        id: race_native
+        if: ${{ inputs.validation_case == 'heal.race-unversioned-overwrite' || inputs.validation_case == 'heal.race-versioned-put' || inputs.validation_case == 'heal.race-version-delete' || inputs.validation_case == 'heal.race-markers-and-batch-delete' }}
+        env:
+          CANDIDATE_SHA: ${{ steps.candidate.outputs.source_sha }}
+          VALIDATION_CASE_ID: ${{ inputs.validation_case }}
+        run: |
+          set -euo pipefail
+          required=false
+          if [ -f auto-testing/scripts/validation_heal/race_native.py ]; then
+            status=0
+            python3 -B auto-testing/scripts/validation_heal/race_native.py supports \
+              --commit "${CANDIDATE_SHA}" --case-id "${VALIDATION_CASE_ID}" || status=$?
+            if [ "${status}" -eq 0 ]; then
+              required=true
+            elif [ "${status}" -ne 2 ]; then
+              exit "${status}"
+            fi
+          fi
+          reviewed=false
+          case "${CANDIDATE_SHA}:${VALIDATION_CASE_ID}" in
+            6afdec9fe1b0b88007f2e5b445c19bf73d51d3ca:heal.race-unversioned-overwrite | \
+            bd0671ba781d8ebf509f4f03533228dfb44496f1:heal.race-unversioned-overwrite | \
+            bd0671ba781d8ebf509f4f03533228dfb44496f1:heal.race-versioned-put | \
+            bd0671ba781d8ebf509f4f03533228dfb44496f1:heal.race-version-delete | \
+            8380466f3a27c3c3ef4115084178a0ab99a78f32:heal.race-unversioned-overwrite | \
+            8380466f3a27c3c3ef4115084178a0ab99a78f32:heal.race-versioned-put | \
+            8380466f3a27c3c3ef4115084178a0ab99a78f32:heal.race-version-delete | \
+            8380466f3a27c3c3ef4115084178a0ab99a78f32:heal.race-markers-and-batch-delete) reviewed=true ;;
+          esac
+          if [ "${reviewed}" = true ] && [ "${required}" != true ]; then
+            printf 'Race candidate requires its reviewed native collector before fleet execution\n' >&2
+            exit 1
+          fi
+          printf 'required=%s\n' "${required}" >> "${GITHUB_OUTPUT}"
+
+      - name: Download pinned native storage evidence
+        if: ${{ inputs.validation_case == 'heal.conflicting-subquorum-authority' || inputs.validation_case == 'heal.bucket-incarnation-recreation' || steps.race_native.outputs.required == 'true' }}
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          github-token: ${{ github.token }}
+          run-id: ${{ inputs.validation_tools_run_id }}
+          name: rustfs-validation-native-${{ inputs.validation_tools_run_id }}-${{ inputs.validation_tools_run_attempt }}
+          path: ${{ runner.temp }}/rustfs-validation-native-${{ github.run_id }}-${{ github.run_attempt }}
+
+      - name: Verify C07 native source and exact test evidence
+        if: ${{ inputs.validation_case == 'heal.conflicting-subquorum-authority' }}
+        run: |
+          set -euo pipefail
+          NATIVE_DIRECTORY="${RUNNER_TEMP}/rustfs-validation-native-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          cp "${VALIDATION_ROOT}/tool-run.json" "${NATIVE_DIRECTORY}/tool-run.json"
+          python3 -B auto-testing/scripts/validation_heal/authority.py \
+            --directory "${NATIVE_DIRECTORY}" --candidate "${VALIDATION_ROOT}/candidate.json" \
+            > "${VALIDATION_ROOT}/native-authority-manifest.json"
+          printf 'VALIDATION_HEAL_NATIVE_DIRECTORY=%s\n' "${NATIVE_DIRECTORY}" >> "${GITHUB_ENV}"
+
+      - name: Verify C11 physical storage and exact final-rename barrier
+        if: ${{ inputs.validation_case == 'heal.bucket-incarnation-recreation' }}
+        run: |
+          set -euo pipefail
+          NATIVE_DIRECTORY="${RUNNER_TEMP}/rustfs-validation-native-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          cp "${VALIDATION_ROOT}/tool-run.json" "${NATIVE_DIRECTORY}/tool-run.json"
+          python3 -B auto-testing/scripts/validation_heal/incarnation_native.py \
+            --directory "${NATIVE_DIRECTORY}" --candidate "${VALIDATION_ROOT}/candidate.json" \
+            --testing-commit "${{ inputs.auto_testing_sha }}" \
+            > "${VALIDATION_ROOT}/native-incarnation-manifest.json"
+          printf 'VALIDATION_HEAL_NATIVE_DIRECTORY=%s\n' "${NATIVE_DIRECTORY}" >> "${GITHUB_ENV}"
+
+      - name: Verify exact-source race native and runtime evidence
+        if: ${{ steps.race_native.outputs.required == 'true' }}
+        env:
+          AUTO_TESTING_SHA: ${{ inputs.auto_testing_sha }}
+          VALIDATION_CASE_ID: ${{ inputs.validation_case }}
+        run: |
+          set -euo pipefail
+          NATIVE_DIRECTORY="${RUNNER_TEMP}/rustfs-validation-native-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          cp "${VALIDATION_ROOT}/tool-run.json" "${NATIVE_DIRECTORY}/tool-run.json"
+          python3 -B auto-testing/scripts/validation_heal/race_native_evidence.py \
+            --directory "${NATIVE_DIRECTORY}" --candidate "${VALIDATION_ROOT}/candidate.json" \
+            --testing-commit "${AUTO_TESTING_SHA}" --case-id "${VALIDATION_CASE_ID}" \
+            > "${VALIDATION_ROOT}/native-race-manifest.json"
+          VALIDATION_HEAL_NATIVE_DIRECTORY="${NATIVE_DIRECTORY}" \
+            python3 -B auto-testing/scripts/validation_heal/race.py preflight \
+              --candidate "${VALIDATION_ROOT}/candidate.json" --testing-commit "${AUTO_TESTING_SHA}" \
+              --case-id "${VALIDATION_CASE_ID}" \
+              > "${VALIDATION_ROOT}/native-race-runtime-preflight.json"
+          printf 'VALIDATION_HEAL_NATIVE_DIRECTORY=%s\n' "${NATIVE_DIRECTORY}" >> "${GITHUB_ENV}"
+
+      - name: Download pinned manager persistence and incarnation evidence
+        if: ${{ inputs.validation_case == 'heal.checkpoint-and-mrf-corruption' || inputs.validation_case == 'heal.bucket-incarnation-recreation' || inputs.validation_case == 'heal.outcome-counters-and-error-truth' }}
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          github-token: ${{ github.token }}
+          run-id: ${{ inputs.validation_tools_run_id }}
+          name: rustfs-validation-manager-native-${{ inputs.validation_tools_run_id }}-${{ inputs.validation_tools_run_attempt }}
+          path: ${{ runner.temp }}/rustfs-validation-manager-native-${{ github.run_id }}-${{ github.run_attempt }}
+
+      - name: Verify exact manager native prerequisites before fleet mutation
+        if: ${{ inputs.validation_case == 'heal.checkpoint-and-mrf-corruption' || inputs.validation_case == 'heal.bucket-incarnation-recreation' || inputs.validation_case == 'heal.outcome-counters-and-error-truth' }}
+        env:
+          VALIDATION_CASE: ${{ inputs.validation_case }}
+        run: |
+          set -euo pipefail
+          MANAGER_DIRECTORY="${RUNNER_TEMP}/rustfs-validation-manager-native-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          cp "${VALIDATION_ROOT}/tool-run.json" "${MANAGER_DIRECTORY}/tool-run.json"
+          python3 -B auto-testing/scripts/validation_heal/manager_fixture.py \
+            --directory "${MANAGER_DIRECTORY}" --candidate "${VALIDATION_ROOT}/candidate.json" \
+            --case-id "${VALIDATION_CASE}" > "${VALIDATION_ROOT}/manager-prerequisite-manifest.json"
+          printf 'VALIDATION_HEAL_MANAGER_DIRECTORY=%s\n' "${MANAGER_DIRECTORY}" >> "${GITHUB_ENV}"
+
+      - name: Download pinned C10 shared-reference encoder
+        if: ${{ inputs.validation_case == 'heal.dangling-and-orphan-safety' }}
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          github-token: ${{ github.token }}
+          run-id: ${{ inputs.validation_tools_run_id }}
+          name: rustfs-validation-shared-${{ inputs.validation_tools_run_id }}-${{ inputs.validation_tools_run_attempt }}
+          path: ${{ runner.temp }}/rustfs-validation-shared-${{ github.run_id }}-${{ github.run_attempt }}
+
+      - name: Verify C10 exact-source codec and original tests
+        if: ${{ inputs.validation_case == 'heal.dangling-and-orphan-safety' }}
+        run: |
+          set -euo pipefail
+          SHARED_DIRECTORY="${RUNNER_TEMP}/rustfs-validation-shared-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          cp "${VALIDATION_ROOT}/tool-run.json" "${SHARED_DIRECTORY}/tool-run.json"
+          python3 -B auto-testing/scripts/validation_heal/shared_fixture.py \
+            --directory "${SHARED_DIRECTORY}" --candidate "${VALIDATION_ROOT}/candidate.json" \
+            > "${VALIDATION_ROOT}/shared-fixture-manifest.json"
+          printf 'VALIDATION_HEAL_SHARED_DIRECTORY=%s\n' "${SHARED_DIRECTORY}" >> "${GITHUB_ENV}"
+
+      - name: Run selected canonical validation case
+        if: ${{ !inputs.validation_tools_only && inputs.validation_cleanup_run_id == '' && inputs.validation_case != 'environment.inspect' }}
+        env:
+          VALIDATION_CASE: ${{ inputs.validation_case }}
+          AUTO_TESTING_SHA: ${{ inputs.auto_testing_sha }}
+        run: |
+          set -euo pipefail
+          test "$(git -C auto-testing rev-parse HEAD)" = "${AUTO_TESTING_SHA}"
+          ./auto-testing/scripts/run_validation_case.sh \
+            "${VALIDATION_CASE}" "${VALIDATION_ROOT}/candidate.json" \
+            "${AUTO_TESTING_SHA}" "${VALIDATION_ROOT}/run"
+
+      - name: Inspect current Heal fleet resources without mutation
+        if: ${{ !inputs.validation_tools_only && inputs.validation_case == 'environment.inspect' }}
+        env:
+          AUTO_TESTING_SHA: ${{ inputs.auto_testing_sha }}
+        run: |
+          set -euo pipefail
+          test "$(git -C auto-testing rev-parse HEAD)" = "${AUTO_TESTING_SHA}"
+          python3 -B auto-testing/scripts/validation_heal/environment.py \
+            --candidate "${VALIDATION_ROOT}/candidate.json" \
+            --testing-commit "${AUTO_TESTING_SHA}" --evidence "${VALIDATION_ROOT}/environment"
+
+      - name: Audit and finalize retained validation environment
+        if: ${{ inputs.validation_cleanup_run_id != '' }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+          FAILED_RUN_ID: ${{ inputs.validation_cleanup_run_id }}
+          AUTO_TESTING_SHA: ${{ inputs.auto_testing_sha }}
+        run: |
+          set -euo pipefail
+          test "$(git -C auto-testing rev-parse HEAD)" = "${AUTO_TESTING_SHA}"
+          gh run view "${FAILED_RUN_ID}" --repo "${GITHUB_REPOSITORY}" \
+            --json status,conclusion,headBranch,workflowName > "${VALIDATION_ROOT}/failed-run.json"
+          python3 - <<'PY'
+          import json
+          import os
+          from pathlib import Path
+          run = json.loads((Path(os.environ["VALIDATION_ROOT"]) / "failed-run.json").read_text())
+          if (run["status"] != "completed" or run["conclusion"] not in {"failure", "cancelled"}
+              or run["workflowName"] != "RustFS Functional Chain" or run["headBranch"] != os.environ["GITHUB_REF_NAME"]):
+              raise ValueError("cleanup source must be a completed failed or cancelled Functional Chain run")
+          PY
+          gh run download "${FAILED_RUN_ID}" --repo "${GITHUB_REPOSITORY}" \
+            --pattern "rustfs-validation-${FAILED_RUN_ID}-*" --dir "${VALIDATION_ROOT}/failed-artifact"
+          python3 -B auto-testing/scripts/validation_heal/recover_environment.py \
+            --failed-run-id "${FAILED_RUN_ID}" --artifact "${VALIDATION_ROOT}/failed-artifact" \
+            --candidate "${VALIDATION_ROOT}/candidate.json" --evidence "${VALIDATION_ROOT}/recovery"
+
+      - name: Show validation report
+        if: ${{ always() }}
+        run: |
+          if [ -f "${VALIDATION_ROOT}/run/report.md" ]; then
+            cat "${VALIDATION_ROOT}/run/report.md" >> "${GITHUB_STEP_SUMMARY}"
+          fi
+
+      - name: Upload validation evidence
+        if: ${{ always() }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: rustfs-validation-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ runner.temp }}/rustfs-validation-${{ github.run_id }}-${{ github.run_attempt }}
+          if-no-files-found: error
+
+  validation-tools:
+    needs: [validation]
+    if: ${{ github.event_name == 'workflow_dispatch' && inputs.validation_package_sha == '' && inputs.validation_tools_only }}
+    uses: ./.github/workflows/rustfs-validation-tools.yml
+    with:
+      candidate_sha: ${{ needs.validation.outputs.source_sha }}
+      auto_testing_sha: ${{ inputs.auto_testing_sha }}
+      build_native_heal: ${{ inputs.validation_native_tools }}
+      build_shared_heal: ${{ inputs.validation_shared_tools }}
+      build_manager_native: ${{ inputs.validation_manager_tools }}
+    secrets: inherit
+
   upgrade:
     needs: [prepare]
     if: ${{ always() && needs.prepare.result == 'success' }}
@@ -188,7 +619,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

.github/workflows/rustfs-performance-test.yml

@@ -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

.github/workflows/rustfs-pool-expand-test.yml

@@ -279,9 +279,7 @@ jobs:
           if [ "${{ inputs.pools || '3' }}" = "3" ]; then
             STEPS="$STEPS,7,8"
             if [ "${{ inputs.run_decommission != 'false' }}" = "true" ]; then
-              # Step 10 asserts the surviving pools after the removal
-              # (rustfs#8726), so it only runs together with step 9.
-              STEPS="$STEPS,9,10"
+              STEPS="$STEPS,9"
             fi
           fi
           ARGS=(--steps "$STEPS" --with-warp -y \
@@ -295,10 +293,6 @@ jobs:
           if [ -n "${RUSTFS_POOL_PROXY_ENDPOINT}" ]; then
             ARGS+=(--proxy-endpoint "${RUSTFS_POOL_PROXY_ENDPOINT}")
           fi
-          # Finalize the removal so step 10 can exercise the surviving
-          # pools; passing it without step 9 selected would run step 10
-          # against a topology where nothing was removed.
-          case ",${STEPS}," in *,9,*) ARGS+=(--finalize-decommission) ;; esac
           if [ -n "${{ inputs.package_url }}" ]; then
             ARGS+=(--package-url "${{ inputs.package_url }}")
           elif [ -n "${{ inputs.rustfs_version }}" ]; then

.github/workflows/rustfs-validation-package.yml

@@ -0,0 +1,244 @@
+# 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.
+
+name: RustFS Validation Package
+
+on:
+  workflow_call:
+    inputs:
+      source_sha:
+        description: Exact RustFS commit SHA to build
+        required: true
+        type: string
+    secrets:
+      R2_ACCESS_KEY_ID:
+        required: true
+      R2_SECRET_ACCESS_KEY:
+        required: true
+      R2_ENDPOINT:
+        required: true
+      R2_BUCKET:
+        required: true
+  workflow_dispatch:
+    inputs:
+      source_sha:
+        description: Exact RustFS commit SHA to build
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+concurrency:
+  group: rustfs-validation-package-${{ inputs.source_sha }}
+  cancel-in-progress: false
+
+jobs:
+  resolve-source:
+    if: github.repository == 'rustfs/rustfs'
+    name: Resolve exact validation source
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    outputs:
+      source_sha: ${{ steps.source.outputs.sha }}
+      source_ref: ${{ steps.source.outputs.ref }}
+    steps:
+      - name: Validate requested source
+        id: source
+        env:
+          REQUESTED_SHA: ${{ inputs.source_sha }}
+        run: |
+          set -euo pipefail
+          [[ "${REQUESTED_SHA}" =~ ^[0-9a-f]{40}$ ]]
+          source_directory="$(mktemp -d "${RUNNER_TEMP}/validation-source.XXXXXX")"
+          trap 'rm -rf "${source_directory}"' EXIT
+          git init -q "${source_directory}"
+          git -C "${source_directory}" fetch --no-tags --depth=1 https://github.com/rustfs/rustfs.git "${REQUESTED_SHA}"
+          test "$(git -C "${source_directory}" rev-parse FETCH_HEAD)" = "${REQUESTED_SHA}"
+          echo "sha=${REQUESTED_SHA}" >> "${GITHUB_OUTPUT}"
+          echo "ref=${REQUESTED_SHA}" >> "${GITHUB_OUTPUT}"
+
+  build:
+    needs: resolve-source
+    name: Build immutable validation DEB
+    runs-on: ubuntu-latest
+    timeout-minutes: 150
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
+      VALIDATION_SOURCE_SHA: ${{ needs.resolve-source.outputs.source_sha }}
+    steps:
+      - name: Checkout exact source
+        uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
+        with:
+          persist-credentials: false
+          ref: ${{ needs.resolve-source.outputs.source_sha }}
+
+      - name: Confirm checked out source
+        env:
+          EXPECTED_SHA: ${{ needs.resolve-source.outputs.source_sha }}
+        run: test "$(git rev-parse HEAD)" = "${EXPECTED_SHA}"
+
+      - name: Setup Rust environment
+        uses: ./.github/actions/setup
+        with:
+          cache-shared-key: validation-package-hosted-x86_64-unknown-linux-gnu
+          cache-save-if: "false"
+          install-build-packaging-tools: "false"
+          install-test-tools: "false"
+
+      - name: Build RustFS
+        run: cargo build --release --locked --target x86_64-unknown-linux-gnu -p rustfs --bins
+
+      - name: Build validation DEB
+        shell: bash
+        run: |
+          set -euo pipefail
+          command -v fakeroot >/dev/null 2>&1 || sudo apt-get install -y -qq fakeroot
+          package_dir="rustfs-validation-${VALIDATION_SOURCE_SHA}"
+          package_file="${RUNNER_TEMP}/validation-package/rustfs.deb"
+          mkdir -p "${RUNNER_TEMP}/validation-package"
+          binary="target/x86_64-unknown-linux-gnu/release/rustfs"
+          test -x "${binary}"
+          mkdir -p "${package_dir}/DEBIAN" "${package_dir}/usr/bin" "${package_dir}/etc/default" \
+            "${package_dir}/lib/systemd/system" "${package_dir}/usr/share/doc/rustfs"
+          cp "${binary}" "${package_dir}/usr/bin/rustfs"
+          chmod 755 "${package_dir}/usr/bin/rustfs"
+          cp deploy/build/rustfs.service "${package_dir}/lib/systemd/system/"
+          cat > "${package_dir}/etc/default/rustfs" <<'ENVEOF'
+          # RustFS Environment Configuration
+          # RUSTFS_ACCESS_KEY=<changeme>
+          # RUSTFS_SECRET_KEY=<changeme>
+          # RUSTFS_VOLUMES=""
+          # RUSTFS_ADDRESS=":9000"
+          ENVEOF
+          cat > "${package_dir}/DEBIAN/control" <<'CONTROLEOF'
+          Package: rustfs
+          Version: 0.0.0~validation
+          Section: utils
+          Priority: optional
+          Architecture: amd64
+          Depends: libc6 (>= 2.31)
+          Maintainer: RustFS Team <support@rustfs.com>
+          Description: RustFS immutable validation package
+           Candidate package for RustFS validation only.
+          CONTROLEOF
+          printf '%s\n' /etc/default/rustfs > "${package_dir}/DEBIAN/conffiles"
+          ./scripts/release/package_service_scripts.sh after-install > "${package_dir}/DEBIAN/postinst"
+          ./scripts/release/package_service_scripts.sh before-remove > "${package_dir}/DEBIAN/prerm"
+          ./scripts/release/package_service_scripts.sh after-remove > "${package_dir}/DEBIAN/postrm"
+          chmod 755 "${package_dir}/DEBIAN/postinst" "${package_dir}/DEBIAN/prerm" "${package_dir}/DEBIAN/postrm"
+          cp LICENSE README.md "${package_dir}/usr/share/doc/rustfs/"
+          fakeroot dpkg-deb --build "${package_dir}" "${package_file}"
+          test -s "${package_file}"
+
+      - name: Upload opaque validation package
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: validation-package-bytes-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ runner.temp }}/validation-package/rustfs.deb
+          if-no-files-found: error
+
+  publish:
+    needs: [resolve-source, build]
+    name: Publish immutable validation DEB
+    # Candidate-controlled build scripts never run on this fresh hosted runner.
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    env:
+      VALIDATION_SOURCE_SHA: ${{ needs.resolve-source.outputs.source_sha }}
+      VALIDATION_SOURCE_REF: ${{ needs.resolve-source.outputs.source_ref }}
+    steps:
+      - name: Download opaque validation package
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: validation-package-bytes-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ runner.temp }}/validation-package-input
+
+      - name: Validate and stage opaque package bytes
+        shell: bash
+        run: |
+          set -euo pipefail
+          python3 -I - <<'PYTHON'
+          import os
+          from pathlib import Path
+          import shutil
+          import stat
+
+          root = Path(os.environ["RUNNER_TEMP"])
+          incoming = root / "validation-package-input"
+          if incoming.is_symlink() or not incoming.is_dir() or sorted(p.name for p in incoming.iterdir()) != ["rustfs.deb"]:
+              raise SystemExit("Validation artifact must contain exactly one rustfs.deb file")
+          fd = os.open(incoming / "rustfs.deb", os.O_RDONLY | os.O_NOFOLLOW | os.O_NONBLOCK)
+          with os.fdopen(fd, "rb") as source:
+              info = os.fstat(source.fileno())
+              if not stat.S_ISREG(info.st_mode) or info.st_size == 0:
+                  raise SystemExit("Validation package must be a nonempty regular file")
+              staged = root / "validation-publication"
+              staged.mkdir(mode=0o700)
+              with (staged / "rustfs.deb").open("xb") as target:
+                  shutil.copyfileobj(source, target)
+          PYTHON
+
+      - name: Prepare trusted publication tools
+        id: tools
+        env:
+          AWS_EC2_METADATA_DISABLED: true
+        shell: bash
+        run: |
+          set -euo pipefail
+          AWS_CLI=aws
+          if ! "${AWS_CLI}" s3api put-object --generate-cli-skeleton input | jq -e 'has("IfNoneMatch")' >/dev/null; then
+            sudo apt-get update
+            sudo apt-get install -y -qq python3-venv
+            AWS_CLI_DIR="$(mktemp -d "${RUNNER_TEMP}/validation-awscli.XXXXXX")"
+            python3 -m venv "${AWS_CLI_DIR}"
+            "${AWS_CLI_DIR}/bin/python" -m pip install --disable-pip-version-check 'awscli==1.44.79'
+            AWS_CLI="${AWS_CLI_DIR}/bin/aws"
+          fi
+          "${AWS_CLI}" s3api put-object --generate-cli-skeleton input | jq -e 'has("IfNoneMatch")' >/dev/null
+          echo "aws_cli=${AWS_CLI}" >> "${GITHUB_OUTPUT}"
+
+      - name: Upload validation package to immutable R2 path
+        id: publish
+        env:
+          PACKAGE_FILE: ${{ runner.temp }}/validation-publication/rustfs.deb
+          AWS_CLI: ${{ steps.tools.outputs.aws_cli }}
+          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
+          R2_BUCKET: ${{ secrets.R2_BUCKET }}
+          AWS_EC2_METADATA_DISABLED: true
+        shell: bash
+        run: |
+          set -euo pipefail
+          if [[ -z "${R2_ACCESS_KEY_ID}" || -z "${R2_SECRET_ACCESS_KEY}" || -z "${R2_ENDPOINT}" || -z "${R2_BUCKET}" ]]; then
+            echo "Validation package publication requires complete R2 configuration" >&2
+            exit 1
+          fi
+          [[ "${VALIDATION_SOURCE_SHA}" =~ ^[0-9a-f]{40}$ ]]
+          test "${VALIDATION_SOURCE_REF}" = "${VALIDATION_SOURCE_SHA}"
+          test -s "${PACKAGE_FILE}" && test ! -L "${PACKAGE_FILE}"
+          export AWS_ACCESS_KEY_ID="${R2_ACCESS_KEY_ID}" AWS_SECRET_ACCESS_KEY="${R2_SECRET_ACCESS_KEY}" AWS_DEFAULT_REGION=auto
+          package_sha256="$(sha256sum "${PACKAGE_FILE}" | cut -d ' ' -f 1)"
+          key="artifacts/rustfs/packages/validation/runs/${GITHUB_RUN_ID}/${GITHUB_RUN_ATTEMPT}/${package_sha256}/rustfs.deb"
+          url="https://dl.rustfs.com/${key}"
+          "${AWS_CLI}" s3api put-object --bucket "${R2_BUCKET}" --key "${key}" --body "${PACKAGE_FILE}" \
+            --if-none-match '*' --endpoint-url "${R2_ENDPOINT}"
+          downloaded_sha256="$(curl -fsSL --retry 3 --connect-timeout 15 --max-time 300 "${url}" | sha256sum | cut -d ' ' -f 1)"
+          test "${downloaded_sha256}" = "${package_sha256}"
+          manifest="${RUNNER_TEMP}/validation-candidate-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}.json"
+          jq -n --arg workflow_sha "${GITHUB_SHA}" --arg source_ref "${VALIDATION_SOURCE_REF}" \
+            --arg source_sha "${VALIDATION_SOURCE_SHA}" --arg channel validation \
+            --argjson build_run_id "${GITHUB_RUN_ID}" --argjson build_run_attempt "${GITHUB_RUN_ATTEMPT}" \
+            --arg package_url "${url}" --arg package_sha256 "${package_sha256}" \
+            '{schema: 3, workflow_sha: $workflow_sha, source_ref: $source_ref, source_sha: $source_sha, channel: $channel, build_run_id: $build_run_id, build_run_attempt: $build_run_attempt, package_url: $package_url, package_sha256: $package_sha256}' > "${manifest}"
+          echo "candidate_file=${manifest}" >> "${GITHUB_OUTPUT}"
+
+      - name: Upload validation candidate manifest
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: validation-candidate-${{ github.run_id }}-${{ github.run_attempt }}
+          path: ${{ steps.publish.outputs.candidate_file }}
+          if-no-files-found: error

.github/workflows/rustfs-validation-tools.yml

@@ -0,0 +1,343 @@
+# Build source-bound helpers separately so live validation needs only artifacts.
+name: RustFS Validation Tools
+
+on:
+  workflow_call:
+    inputs:
+      candidate_sha:
+        type: string
+        required: true
+      auto_testing_sha:
+        type: string
+        required: true
+      build_native_heal:
+        type: boolean
+        required: false
+        default: false
+      build_shared_heal:
+        type: boolean
+        required: false
+        default: false
+      build_manager_native:
+        type: boolean
+        required: false
+        default: false
+    secrets:
+      PF_TESTING_GH_TOKEN:
+        required: true
+  workflow_dispatch:
+    inputs:
+      candidate_sha:
+        description: Exact RustFS source SHA from the validation candidate manifest
+        type: string
+        required: true
+      auto_testing_sha:
+        description: Exact auto-testing SHA containing the Heal metadata inspector
+        type: string
+        required: true
+      build_native_heal:
+        description: Also compile and run separate exact-source native Heal regressions
+        type: boolean
+        required: false
+        default: false
+      build_shared_heal:
+        description: Build the controlled C10 shared-reference fixture encoder
+        type: boolean
+        required: false
+        default: false
+      build_manager_native:
+        description: Build and run exact candidate checkpoint/MRF/incarnation regressions
+        type: boolean
+        required: false
+        default: false
+
+permissions:
+  contents: read
+
+jobs:
+  manager-native-regressions:
+    if: ${{ inputs.build_manager_native }}
+    runs-on: ubuntu-22.04
+    timeout-minutes: 180
+    env:
+      CANDIDATE_SHA: ${{ inputs.candidate_sha }}
+      AUTO_TESTING_SHA: ${{ inputs.auto_testing_sha }}
+    steps:
+      - name: Validate immutable manager native inputs
+        run: |
+          set -euo pipefail
+          [[ "${CANDIDATE_SHA}" =~ ^[0-9a-f]{40}$ ]]
+          [[ "${AUTO_TESTING_SHA}" =~ ^[0-9a-f]{40}$ ]]
+
+      - name: Checkout exact manager candidate source
+        uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
+        with:
+          ref: ${{ inputs.candidate_sha }}
+          path: candidate
+          persist-credentials: false
+
+      - name: Checkout exact manager collector source
+        uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
+        with:
+          repository: rustfs/auto-testing
+          ref: ${{ inputs.auto_testing_sha }}
+          token: ${{ secrets.PF_TESTING_GH_TOKEN }}
+          path: auto-testing
+          persist-credentials: false
+
+      - name: Install manager native build dependencies
+        run: |
+          set -euo pipefail
+          sudo apt-get update
+          sudo apt-get install -y clang lld cmake pkg-config libssl-dev protobuf-compiler
+          df -h .
+
+      - name: Build exact unmodified candidate manager test executable
+        run: |
+          set -euo pipefail
+          test "$(git -C auto-testing rev-parse HEAD)" = "${AUTO_TESTING_SHA}"
+          python3 -B auto-testing/scripts/validation_heal/manager_native.py build \
+            --source candidate --commit "${CANDIDATE_SHA}" --out manager-tools
+
+      - name: Run exact manager regressions independently
+        run: |
+          set -euo pipefail
+          python3 -B auto-testing/scripts/validation_heal/manager_native.py run \
+            --directory manager-tools --out manager-evidence
+
+      - name: Upload manager executable identities and original diagnostics
+        if: ${{ always() }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: rustfs-validation-manager-native-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            manager-tools/heal-manager-native-tests
+            manager-tools/*.json
+            manager-tools/*.jsonl
+            manager-tools/*.stderr
+            manager-tools/*.log
+            manager-evidence/
+          if-no-files-found: warn
+
+  native-heal-regressions:
+    if: ${{ inputs.build_native_heal }}
+    runs-on: ubuntu-22.04
+    timeout-minutes: 180
+    env:
+      CANDIDATE_SHA: ${{ inputs.candidate_sha }}
+      AUTO_TESTING_SHA: ${{ inputs.auto_testing_sha }}
+    steps:
+      - name: Validate immutable native source inputs
+        run: |
+          set -euo pipefail
+          [[ "${CANDIDATE_SHA}" =~ ^[0-9a-f]{40}$ ]]
+          [[ "${AUTO_TESTING_SHA}" =~ ^[0-9a-f]{40}$ ]]
+
+      - name: Checkout exact native candidate source
+        uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
+        with:
+          ref: ${{ inputs.candidate_sha }}
+          path: candidate
+          persist-credentials: false
+
+      - name: Checkout exact native collector source
+        uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
+        with:
+          repository: rustfs/auto-testing
+          ref: ${{ inputs.auto_testing_sha }}
+          token: ${{ secrets.PF_TESTING_GH_TOKEN }}
+          path: auto-testing
+          persist-credentials: false
+
+      - name: Install native build dependencies
+        run: |
+          set -euo pipefail
+          sudo apt-get update
+          sudo apt-get install -y clang lld cmake pkg-config libssl-dev protobuf-compiler
+          df -h .
+
+      - name: Build and enumerate the unmodified candidate test executable
+        run: |
+          set -euo pipefail
+          test "$(git -C auto-testing rev-parse HEAD)" = "${AUTO_TESTING_SHA}"
+          use_race_native=false
+          if [[ -f auto-testing/scripts/validation_heal/race_native.py ]]; then
+            support_rc=0
+            python3 -B auto-testing/scripts/validation_heal/race_native.py supports \
+              --commit "${CANDIDATE_SHA}" || support_rc=$?
+            case "${support_rc}" in
+              0) use_race_native=true ;;
+              2) ;; # The original exact-source collector handles legacy candidates.
+              *) exit "${support_rc}" ;;
+            esac
+          fi
+          if [[ "${use_race_native}" == true ]]; then
+            python3 -B auto-testing/scripts/validation_heal/race_native.py build \
+              --source candidate --commit "${CANDIDATE_SHA}" --testing-commit "${AUTO_TESTING_SHA}" --out native-tools
+          else
+            python3 -B auto-testing/scripts/validation_heal/native_regressions.py build \
+              --source candidate --commit "${CANDIDATE_SHA}" --out native-tools
+          fi
+
+      - name: Run exact native regressions separately from fleet validation
+        run: |
+          set -euo pipefail
+          if [[ -f native-tools/race-native.json ]]; then
+            test ! -e native-tools/native-regressions.json
+            python3 -B auto-testing/scripts/validation_heal/race_native.py run \
+              --directory native-tools --out native-evidence
+          else
+            python3 -B auto-testing/scripts/validation_heal/native_regressions.py run \
+              --directory native-tools --out native-evidence
+          fi
+
+      - name: Run existing F07 directory fsync failure regressions
+        if: ${{ inputs.candidate_sha == '1aa9be87d18cf941e5020f19e8622c26ba4b10ac' }}
+        run: |
+          set -euo pipefail
+          # Older immutable harness pins retain their original native suite;
+          # absence of this additive collector must never fabricate its proof.
+          if [[ ! -f auto-testing/scripts/validation_heal/persistence_native.py ]]; then
+            mkdir native-persistence-evidence
+            echo '{"complete":false,"reason":"pinned harness predates F07 directory-fsync collector","requiredNativeCoverageComplete":false,"canonicalCasePassClaimed":false}' \
+              > native-persistence-evidence/not-available.json
+            exit 0
+          fi
+          python3 -B auto-testing/scripts/validation_heal/persistence_native.py run \
+            --directory native-tools --native-evidence native-evidence --out native-persistence-evidence \
+            --testing-commit "${AUTO_TESTING_SHA}"
+          python3 -B auto-testing/scripts/validation_heal/persistence_native.py verify \
+            --directory native-tools --native-evidence native-evidence --out native-persistence-evidence \
+            --testing-commit "${AUTO_TESTING_SHA}"
+
+      - name: Upload native executable identities and original diagnostics
+        if: ${{ always() }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: rustfs-validation-native-${{ github.run_id }}-${{ github.run_attempt }}
+          path: |
+            native-tools/ecstore-native-tests
+            native-tools/ecstore-race-native-tests
+            native-tools/*.json
+            native-tools/*.jsonl
+            native-tools/*.stderr
+            native-tools/*.log
+            native-evidence/
+            native-persistence-evidence/
+          if-no-files-found: warn
+
+  heal-metadata-inspector:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 30
+    env:
+      CANDIDATE_SHA: ${{ inputs.candidate_sha }}
+      AUTO_TESTING_SHA: ${{ inputs.auto_testing_sha }}
+    steps:
+      - name: Validate immutable source inputs
+        run: |
+          set -euo pipefail
+          [[ "${CANDIDATE_SHA}" =~ ^[0-9a-f]{40}$ ]]
+          [[ "${AUTO_TESTING_SHA}" =~ ^[0-9a-f]{40}$ ]]
+
+      - name: Checkout exact candidate source
+        uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
+        with:
+          ref: ${{ inputs.candidate_sha }}
+          path: candidate
+          persist-credentials: false
+
+      - name: Checkout exact inspector source
+        uses: actions/checkout@f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a # v7
+        with:
+          repository: rustfs/auto-testing
+          ref: ${{ inputs.auto_testing_sha }}
+          token: ${{ secrets.PF_TESTING_GH_TOKEN }}
+          path: auto-testing
+          persist-credentials: false
+
+      - name: Build the read-only candidate metadata decoder
+        run: |
+          set -euo pipefail
+          test "$(git -C candidate rev-parse HEAD)" = "${CANDIDATE_SHA}"
+          test "$(git -C auto-testing rev-parse HEAD)" = "${AUTO_TESTING_SHA}"
+          df -h .
+          python3 auto-testing/scripts/validation_heal/prepare_heal_meta_inspector.py \
+            --source candidate --commit "${CANDIDATE_SHA}" --out inspector-build
+          # Seed the helper's separate graph from the candidate's frozen graph.
+          # Cargo adds the helper package; both lock identities are retained.
+          cp candidate/Cargo.lock inspector-build/Cargo.lock
+          cargo build --release --manifest-path inspector-build/Cargo.toml
+          python3 auto-testing/scripts/validation_heal/check_bitrot_tool.py \
+            --binary inspector-build/target/release/heal-meta-inspect --source candidate
+          mkdir validation-tools
+          cp inspector-build/target/release/heal-meta-inspect validation-tools/
+          cp inspector-build/Cargo.lock validation-tools/inspector-Cargo.lock
+          python3 - <<'PY'
+          import hashlib
+          import json
+          import os
+          from pathlib import Path
+          import subprocess
+
+          source = json.loads(Path("inspector-build/source.json").read_text())
+          binary = Path("validation-tools/heal-meta-inspect")
+          source.update(built=True, testingCommit=os.environ["AUTO_TESTING_SHA"],
+                        binarySha256=hashlib.sha256(binary.read_bytes()).hexdigest(),
+                        inspectorLockSha256=hashlib.sha256(Path("validation-tools/inspector-Cargo.lock").read_bytes()).hexdigest(),
+                        toolchain=subprocess.check_output(["rustc", "-vV"], text=True),
+                        target="x86_64-unknown-linux-gnu", runId=os.environ["GITHUB_RUN_ID"],
+                        runAttempt=os.environ["GITHUB_RUN_ATTEMPT"])
+          Path("validation-tools/heal-meta-inspect.json").write_text(json.dumps(source, indent=2) + "\n")
+          PY
+          git -C candidate diff --exit-code
+
+      - name: Build and test the controlled C10 metadata encoder
+        if: ${{ inputs.build_shared_heal }}
+        run: |
+          set -euo pipefail
+          python3 -B auto-testing/scripts/validation_heal/prepare_heal_shared_fixture.py \
+            --source candidate --commit "${CANDIDATE_SHA}" --out shared-build
+          cp candidate/Cargo.lock shared-build/Cargo.lock
+          export CARGO_TARGET_DIR="${GITHUB_WORKSPACE}/inspector-build/target"
+          cargo build --release --manifest-path shared-build/Cargo.toml
+          mkdir shared-tools
+          if ! cargo test --release --manifest-path shared-build/Cargo.toml -- --test-threads=1 \
+            > shared-tools/shared-fixture-tests.log 2>&1; then
+            cat shared-tools/shared-fixture-tests.log
+            exit 1
+          fi
+          cp "${CARGO_TARGET_DIR}/release/heal-shared-fixture" shared-tools/
+          cp shared-build/Cargo.lock shared-tools/shared-Cargo.lock
+          python3 - <<'PY'
+          import hashlib
+          import json
+          import os
+          from pathlib import Path
+          import subprocess
+
+          source = json.loads(Path("shared-build/source.json").read_text())
+          source.update(schemaVersion=1, built=True, sourceUnmodified=True,
+              candidateSourceTree=subprocess.check_output(["git", "-C", "candidate", "rev-parse", "HEAD^{tree}"], text=True).strip(),
+              testingCommit=os.environ["AUTO_TESTING_SHA"],
+              binarySha256=hashlib.sha256(Path("shared-tools/heal-shared-fixture").read_bytes()).hexdigest(),
+              sharedLockSha256=hashlib.sha256(Path("shared-tools/shared-Cargo.lock").read_bytes()).hexdigest(),
+              toolchain=subprocess.check_output(["rustc", "-vV"], text=True), target="x86_64-unknown-linux-gnu",
+              runId=os.environ["GITHUB_RUN_ID"], runAttempt=os.environ["GITHUB_RUN_ATTEMPT"])
+          Path("shared-tools/heal-shared-fixture.json").write_text(json.dumps(source, indent=2) + "\n")
+          PY
+          git -C candidate diff --exit-code
+
+      - name: Upload controlled C10 fixture encoder evidence
+        if: ${{ always() && inputs.build_shared_heal }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: rustfs-validation-shared-${{ github.run_id }}-${{ github.run_attempt }}
+          path: shared-tools/
+          if-no-files-found: warn
+
+      - name: Upload immutable validation tools
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: rustfs-validation-tools-${{ github.run_id }}-${{ github.run_attempt }}
+          path: validation-tools/
+          if-no-files-found: error

.github/workflows/schedule-failure-alert-drill.yml

@@ -16,8 +16,8 @@
 #
 # Forces a job failure and then runs .github/actions/schedule-failure-issue
 # through the exact `needs` + `always() && contains(needs.*.result,
-# 'failure')` wiring used by the real consumers (e2e-s3tests, mint, fuzz).
-# Dispatch it twice to verify both the issue-creation and
+# 'failure')` wiring used by the real consumers (e2e-s3tests, mint, fuzz,
+# performance-ab). Dispatch it twice to verify both the issue-creation and
 # the dedupe-comment paths, then close the resulting
 # "[scheduled-failure] Schedule Failure Alert Drill" issue in rustfs/backlog
 # (the default target repository). Requires the BACKLOG_ISSUE_TOKEN secret

.github/workflows/scheduled-validation-watchdog.yml

@@ -28,6 +28,7 @@ on:
       - "mint"
       - "minio-interop"
       - "Nightly GNU Build"
+      - "Performance A/B"
       - "Runner Hygiene"
     types: [completed]
 

.github/workflows/windows-filesystem.yml

@@ -103,10 +103,6 @@ jobs:
         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"

AGENTS.md

@@ -158,7 +158,9 @@ requested adversarial/design reviews, and agent-instruction changes that alter
 execution. Ordinary questions, diagnoses, status reports, non-adversarial code
 reviews, and low-risk planning do not trigger it.
 
-For applicable work and substantial PR reviews, follow the [risk tiers and review shape](.agents/references/adversarial-validation.md) and check changed trust boundaries and relevant correctness, security, concurrency, durability, compatibility, performance, and negative regression coverage.
+For applicable work and substantial PR reviews, read the [risk tiers and review shape](.agents/references/adversarial-validation.md).
+Load only the matching domain probes; ordinary reviews do not become adversarial
+merely because this reference exists.
 
 A review has no finding quota; `No findings` is a complete outcome. A request to
 find problems is not evidence that a defect exists. Before reporting a candidate,

CHANGELOG.md

@@ -19,15 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Single-part source checksums are forwarded as `x-amz-checksum-*` headers instead of user metadata, so the replica preserves checksum responses ([#7313](https://github.com/rustfs/rustfs/pull/7313)). This changes the default outbound headers for checksummed objects.
 - Site-replication outage recovery now uses a bounded 30-second retry drain plus the 600-second full reconciliation pass, persists destructive liabilities before local deletion, and fences replay settlement and peer edits ([#7148](https://github.com/rustfs/rustfs/pull/7148)). Persisted additions are optional and ignored by older readers.
 - IAM snapshot/deletion replay, target-assigned delete-marker purges, timestamp ordering, and best-effort peer broadcast now close the control-plane gaps found by the R6 review ([#7195](https://github.com/rustfs/rustfs/pull/7195)).
-- A `set-remote-target?update=true&creds=true` request on a site-replication peer's bucket target is now rejected with `400 InvalidRequest`, naming the target and why it counts as peer-owned. It used to return success while keeping the stored endpoint, credentials, and TLS settings, so an endpoint edit from the Console's bucket replication form appeared to apply but did not. Change a peer's address with a site-replication edit instead; see "Changing a site's address" in `docs/operations/site-replication-operations.md`. The `sync`, `bandwidth`, `proxy`, and `path` update groups are unchanged.
-- Site-replication edits that omit the site name, such as `mc admin replicate update --deployment-id <ID> --endpoint <URL>`, now keep the stored name on the editing site and on every receiver instead of renaming the site after the new endpoint host. No persisted format changes.
 - Upgrade and rollback: upgrade every node in one site consecutively and verify reconciliation before moving to the next site; do not intentionally run a site mixed-version. Target-version ledger keys are harmless on rollback, although old code cannot use their routing. Before rolling back past [#7307](https://github.com/rustfs/rustfs/pull/7307), drain or repair every pending version purge: older code can free a retained version's data directory before its remote purge is acknowledged. See `docs/operations/site-replication-operations.md`.
 
 ### Security
 - **Presigned URLs honour only signed headers** (GHSA-g8w9-qw9q-fghr): a SigV4 presigned request that carries an `x-amz-*` request header not listed in `X-Amz-SignedHeaders` is now rejected with `403 AccessDenied` ("There were headers present in the request which were not signed"), matching AWS S3. Previously the holder of a presigned `PutObject` URL could add unsigned `x-amz-tagging`, `x-amz-storage-class`, `x-amz-website-redirect-location`, ACL, metadata, Object Lock or SSE headers and have them applied. Presigners that intend a property must set it before signing so the SDK lists the header in `SignedHeaders`; `x-amz-cf-id` (CloudFront) remains tolerated unsigned. Header-signed SigV4 and SigV2 requests are unchanged.
 
 ### Fixed
-- **`mc admin info` and `mc admin replicate resync` work again**: since the cluster snapshot view (#3803), `GET /v3/info` and `GET /v3/storageinfo` returned the madmin `InfoMessage` / `StorageInfo` nested under an `info` key next to `admin_discovery` (and, for `/info`, `bitrotSelftest`). madmin decodes those bodies directly, so `mc admin info` printed empty values and `mc admin replicate resync start/status` rejected every alias with "alias provided is not part of cluster replication" because the local `deploymentID` read as empty. Requests on the MinIO-compatible `/minio/admin/v3` prefix now receive the bare madmin body again; `/rustfs/admin/v3`, which rc and the console use, keeps the envelope unchanged.
 - **Replication status writebacks no longer invalidate scanner cycles**: every replication status writeback (`persist_replication_state_if_current` in `Update` mode, including the heals the scanner queues during its own walk) marked the bucket dirty on the namespace path, advanced the dirty-usage generation and woke the scanner, so a site-replication resync or any steadily replicated bucket ended every cycle `superseded`, the authoritative usage baseline was never certified, and the console reported usage freshness as stale for as long as replication ran (#8375). Those writebacks are now status class: they do not touch the dirty-usage generation, the activity snapshot, the dirty-usage wake or the durable dirty journal, and only the process-local producer coverage is recorded. They need no rescan queue, because a deployment with an active replication rule already walks every bucket on every cycle and that walk refreshes `replication_stats`. Tier-expiration cleanup, which removes data, stays on the namespace path. No persisted format, protocol, admin API or configuration changes. Design: `docs/architecture/scanner-per-bucket-convergence.md`.
 - **A bucket written during a scanner walk no longer supersedes the whole cycle**: the post-walk cluster activity proof required the entire activity snapshot and the dirty-usage generation to be unchanged, so a single-node deployment with one bucket written every few seconds never reached a `Complete` cycle, `usage_snapshot_converged` never became true and the authoritative usage baseline was never certified (#8494). Dirty usage is now certified per bucket: a structurally complete walk that the guardrail did not veto is `Complete`, buckets whose dirty generation still matches the start snapshot are cleared, and buckets written during the walk stay dirty and are published as the pending set, so `usage_snapshot_converged` means "no bucket pending" and the next cycle is scoped to the pending buckets. Such a cycle writes the authoritative usage object; the observed object is now selected by an explicit observational mark that vetoed cycles carry. The guardrail itself vetoes only on the fields that change which namespace the walk described (peer set, process instance, protocol version, topology, maintenance generation, data movement, movement generation, publication blocked) and reports the field and host in the scanner log and in the new `usage_freshness` fields `guardrail_veto_total`, `last_guardrail_veto_unix_secs` and `last_guardrail_veto_reason`. In a distributed deployment a remote peer whose dirty usage moved during the walk still supersedes the cycle until scoped acknowledgements can name its buckets. `.usage.v2.json` gains the additive, default-when-absent fields `usage_snapshot_pending_buckets`, `usage_snapshot_pending_bucket_count` and `usage_snapshot_observational`; older readers ignore them and treat the snapshot as an authoritative but unconverged publication. Quota is unchanged: an uncertified bucket keeps its last usage value as the floor and live writes do not advance it. No protocol or configuration changes. Design: `docs/architecture/scanner-per-bucket-convergence.md`.
 - **SSE-C TLS requirement now covers copy-source keys**: with `RUSTFS_SSE_C_REQUIRE_TLS=true`, a `CopyObject` or `UploadPartCopy` that carried only the `x-amz-copy-source-server-side-encryption-customer-*` headers (an SSE-C source copied to a destination that is not SSE-C) was accepted on a plaintext transport and was not counted in `rustfs_ssec_plaintext_requests_total`, although those headers carry the source object's customer key. They now count as SSE-C headers: such requests are counted, and refused with `400 InvalidRequest` when the switch is on. Requests over TLS are unaffected.

Cargo.toml

@@ -66,7 +66,6 @@ members = [
     "crates/io-metrics", # I/O metrics collection for performance analysis
     "crates/io-core", # Buffered Bytes, mmap-then-copy, and aligned pread I/O helpers
     "crates/zip", # ZIP file handling and compression
-    "crates/zstd-compat", # Fixed codec for dependencies requiring zstd 0.13
 ]
 resolver = "3"
 
@@ -147,7 +146,7 @@ rustfs-zip = { path = "./crates/zip", version = "1.0.2" }
 async-channel = "2.5.0"
 async_zip = { default-features = false, version = "0.0.19" }
 mysql_async = { default-features = false, version = "0.37.1" }
-async-compression = { version = "0.4.51" }
+async-compression = { version = "0.4.50" }
 async-trait = "0.1.92"
 async-nats = { version = "0.50.0", default-features = false }
 axum = "0.8.9"
@@ -157,7 +156,7 @@ futures-lite = "2.6.1"
 futures-util = "0.3.34"
 pollster = "1.0.1"
 pulsar = { default-features = false, version = "=6.9.0" }
-lapin = { default-features = false, version = "4.12.3" }
+lapin = { default-features = false, version = "4.12.2" }
 hyper = { version = "1.12.0" }
 h2 = { version = "0.4.20" }
 hyper-rustls = { default-features = false, version = "0.27.10" }
@@ -170,7 +169,7 @@ minlz = "1.2.3"
 reqwest = "0.13.5"
 rustfs-kafka-async = { version = "1.4.0" }
 socket2 = { version = "0.6.5" }
-tokio = { version = "1.54.1" }
+tokio = { version = "1.53.3" }
 tokio-rustls = { default-features = false, version = "0.26.6" }
 tokio-stream = { version = "0.1.19" }
 tokio-test = "0.4.6"
@@ -244,24 +243,24 @@ tokio-postgres-rustls = "0.14.0"
 
 # Utilities and Tools
 anyhow = "1.0.104"
-arc-swap = "1.9.3"
+arc-swap = "1.9.2"
 rustfs-tokio-tar = { version = "0.7.1" }
 # Candidate Snowball parser versions exercised by rustfs-zip compatibility fixtures.
 tar-codec = "0.0.15"
 tar-framing = "0.0.15"
-atoi = "3.1.1"
+atoi = "3.1.0"
 atomic_enum = "0.3.0"
-aws-config = { version = "1.13.0" }
-aws-credential-types = { version = "1.3.1" }
-aws-sdk-kms = { default-features = false, version = "1.126.0" }
-aws-sdk-s3 = { default-features = false, version = "1.155.0" }
-aws-sdk-sts = { default-features = false, version = "1.122.0" }
-aws-smithy-async = { version = "1.3.1" }
-aws-smithy-http-client = { default-features = false, version = "1.5.1" }
-aws-smithy-runtime-api = { version = "1.19.1" }
-aws-smithy-types = { version = "1.9.0" }
+aws-config = { version = "1.12.0" }
+aws-credential-types = { version = "1.3.0" }
+aws-sdk-kms = { default-features = false, version = "1.123.0" }
+aws-sdk-s3 = { default-features = false, version = "1.152.0" }
+aws-sdk-sts = { default-features = false, version = "1.119.0" }
+aws-smithy-async = { version = "1.3.0" }
+aws-smithy-http-client = { default-features = false, version = "1.5.0" }
+aws-smithy-runtime-api = { version = "1.19.0" }
+aws-smithy-types = { version = "1.8.1" }
 base64-simd = "0.8.0"
-brotli = "9.1.0"
+brotli = "9.0.0"
 clap = { version = "4.6.7" }
 const-str = { version = "1.1.0" }
 convert_case = "0.12.0"
@@ -273,12 +272,12 @@ crossbeam-utils = "0.8.23"
 datafusion = { default-features = false, version = "55.2.0" }
 derive_builder = "0.20.2"
 ed25519-dalek = "3.0.0"
-enumset = "1.1.15"
+enumset = "1.1.14"
 faster-hex = "1.0.0"
 flate2 = "1.1.10"
 glob = "0.3.4"
-google-cloud-storage = "1.21.0"
-google-cloud-auth = "1.18.0"
+google-cloud-storage = "1.20.0"
+google-cloud-auth = "1.17.0"
 hashbrown = { version = "0.17.1" }
 # Base32 for RFC 6238 TOTP shared secrets (RFC 4648 unpadded, the alphabet
 # every authenticator app expects). Already in the graph transitively.
@@ -288,11 +287,11 @@ highway = { version = "1.3.0" }
 hostname = "0.4.2"
 ipnetwork = { version = "0.21.1" }
 lazy_static = "1.5.1"
-libc = "0.2.191"
+libc = "0.2.190"
 libsystemd = "0.7.2"
 local-ip-address = "0.6.13"
 log = "0.4"
-memmap2 = "0.9.12"
+memmap2 = "0.9.11"
 lz4 = "1.28.1"
 matchit = "0.9.2"
 md-5 = "0.11.0"
@@ -302,8 +301,7 @@ netif = "0.1.6"
 num_cpus = { version = "1.17.0" }
 nvml-wrapper = "0.13.0"
 object = { version = "=0.40.0", default-features = false }
-parking_lot = "0.13.0"
-same-file = "1.0.6"
+parking_lot = "0.12.5"
 path-absolutize = "4.0.1"
 percent-encoding = "2.3.2"
 # Server-side QR rendering for TOTP enrollment, so neither the console nor the
@@ -319,7 +317,7 @@ rustfs-erasure-codec = { version = "9.0.0" }
 reed-solomon-simd = "3.1.0"
 regex = { version = "1.13.1" }
 rumqttc = { package = "rumqttc-next", version = "0.34.0" }
-redis = { version = "1.8.0" }
+redis = { version = "1.7.1" }
 rustify = { version = "0.7", default-features = false }
 rustix = { version = "1.1.5" }
 rust-embed = { version = "8.13.0" }
@@ -329,7 +327,7 @@ s3s-sigv4 = { git = "https://github.com/s3s-project/s3s", rev = "5761ddfe4c509fc
 serial_test = "4.0.1"
 shadow-rs = { default-features = false, version = "2.0.0" }
 siphasher = "1.0.4"
-smallvec = { version = "1.16.4" }
+smallvec = { version = "1.16.3" }
 compact_str = "0.10.0"
 snap = "1.1.2"
 starshard = { version = "2.4.0" }
@@ -348,7 +346,7 @@ tracing-subscriber = { version = "0.3.23" }
 transform-stream = "0.3.1"
 url = "2.5.8"
 urlencoding = "2.1.3"
-uuid = { version = "1.29.0" }
+uuid = { version = "1.28.0" }
 vaultrs = { version = "0.8.0" }
 tar = "0.4.46"
 walkdir = "2.5.0"
@@ -356,13 +354,13 @@ winapi-util = "0.1.11"
 windows = { version = "0.62.2" }
 windows-sys = "0.61.2"
 xxhash-rust = { version = "0.8.19" }
-zip = "9.1.2"
-zstd = "0.14.3"
+zip = "9.0.3"
+zstd = "0.14.2"
 
 # Observability and Metrics
 metrics = "0.24.6"
 metrics-util = "0.20"
-dial9 = { version = "0.5.5", default-features = false }
+dial9 = { version = "0.5.4", default-features = false }
 opentelemetry = { version = "0.33.1" }
 opentelemetry-appender-tracing = { version = "0.33.1" }
 opentelemetry-otlp = { version = "0.33.1" }
@@ -370,23 +368,23 @@ opentelemetry-proto = { version = "0.33.1", default-features = false, features =
 opentelemetry_sdk = { version = "0.33.1" }
 opentelemetry-semantic-conventions = { version = "0.33.1" }
 opentelemetry-stdout = { version = "0.33.1" }
-pyroscope = { version = "2.1.5" }
+pyroscope = { version = "2.1.2" }
 
 # FTP and SFTP
 libunftp = { version = "0.23.1" }
 unftp-core = "0.1.0"
 suppaftp = { version = "12.2.1" }
 rcgen = { version = "0.14.10", default-features = false, features = ["aws_lc_rs", "crypto", "pem"] }
-russh = { version = "0.65.0" }
+russh = { version = "0.64.1" }
 russh-sftp = "3.0.1"
 
 # WebDAV
 dav-server = "0.11.0"
 
 # Performance Analysis and Memory Profiling
-rustfs-mimalloc = { version = "0.7.2" }
+rustfs-mimalloc = { version = "0.5.6" }
 # Preserve Unicode focus filters until rustfs/backlog#2302 is resolved.
-hotpath = { version = "0.29.2", default-features = false }
+hotpath = { version = "0.28.6", default-features = false }
 # Snapshot testing for output format regression detection
 insta = { version = "1.49" }
 
@@ -423,20 +421,3 @@ inherits = "release"
 inherits = "release"
 debug = true
 strip = "none"
-
-# Pin upstream fixes until compatible crates.io releases are available.
-[patch.crates-io]
-zstd = { path = "crates/zstd-compat" }
-# Preserve RustFS OIDC flows while migrating the old elliptic-curve dependency chain.
-# Upstream: openidconnect-rs#244 and oauth2-rs#352.
-openidconnect = { git = "https://github.com/ramosbugs/openidconnect-rs", rev = "2f77ee73bc4554e1cb6279adb386005429fb4e41" }
-oauth2 = { git = "https://github.com/ramosbugs/oauth2-rs", rev = "89585f4a280afd7b285eaf1c9be0068874e03d22" }
-aws-sigv4 = { git = "https://github.com/smithy-lang/smithy-rs", rev = "5c1c4bca2ea7af97496e077c9f1a718eaac64bf8" }
-
-# Keep the signer's path dependencies on the SDK's existing registry types.
-[patch."https://github.com/smithy-lang/smithy-rs"]
-aws-credential-types = { version = "=1.3.1" }
-aws-smithy-eventstream = { version = "=0.61.6" }
-aws-smithy-http = { version = "=0.64.2" }
-aws-smithy-runtime-api = { version = "=1.19.1" }
-aws-smithy-types = { version = "=1.9.0" }

README.md

@@ -141,7 +141,7 @@ chown -R 10001:10001 data logs
 docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:latest
 
 # Using specific version
-docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:1.0.4
+docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:1.0.3
 ```
 
 If you use [podman](https://github.com/containers/podman) instead of docker, you can install the RustFS with the below command
@@ -220,7 +220,7 @@ For developers who want to build RustFS Docker images from source with multi-arc
 ./docker-buildx.sh --push
 
 # Build specific version
-./docker-buildx.sh --release 1.0.4 --push
+./docker-buildx.sh --release 1.0.3 --push
 
 # Build for custom registry
 ./docker-buildx.sh --registry your-registry.com --namespace yourname --push
@@ -238,7 +238,7 @@ You can also use Make targets for convenience:
 ```bash
 make docker-buildx                    # Build locally
 make docker-buildx-push               # Build and push
-make docker-buildx-version VERSION=1.0.4  # Build specific version
+make docker-buildx-version VERSION=1.0.3  # Build specific version
 make help-docker                      # Show all Docker-related commands
 ```
 

README_ZH.md

@@ -138,7 +138,7 @@ chown -R 10001:10001 data logs
 docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:latest
 
 # 使用指定版本运行
-docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:1.0.4
+docker run -d -p 9000:9000 -p 9001:9001 -v $(pwd)/data:/data -v $(pwd)/logs:/logs rustfs/rustfs:1.0.3
 ```
 
 如果您通过绑定挂载启用 TLS 证书目录，也请用同样方式准备该目录：
@@ -176,7 +176,7 @@ docker compose -f docker-compose-simple.yml up -d
 ./docker-buildx.sh --push
 
 # 构建指定版本
-./docker-buildx.sh --release 1.0.4 --push
+./docker-buildx.sh --release 1.0.3 --push
 
 # 构建并推送到自定义仓库
 ./docker-buildx.sh --registry your-registry.com --namespace yourname --push
@@ -193,7 +193,7 @@ docker compose -f docker-compose-simple.yml up -d
 ```bash
 make docker-buildx                    # 本地构建
 make docker-buildx-push               # 构建并推送
-make docker-buildx-version VERSION=1.0.4  # 构建指定版本
+make docker-buildx-version VERSION=1.0.3  # 构建指定版本
 make help-docker                      # 显示所有 Docker 相关命令
 ```
 

crates/common/Cargo.toml

@@ -29,7 +29,6 @@ workspace = true
 
 [features]
 default = []
-test-util = []
 hotpath = ["hotpath/hotpath", "hotpath/tokio"]
 hotpath-alloc = ["hotpath", "hotpath/hotpath-alloc"]
 hotpath-cpu = ["hotpath", "hotpath/hotpath-cpu"]

crates/common/src/globals.rs

@@ -97,45 +97,6 @@ pub fn try_get_global_local_node_name() -> Option<String> {
         .filter(|name| !name.is_empty())
 }
 
-/// Run a synchronous test callback while publishing a name under its writer lock.
-/// Call from a blocking worker; returning or unwinding releases the writer.
-#[cfg(any(test, feature = "test-util"))]
-#[doc(hidden)]
-pub fn with_local_node_name_write_lock_for_test<T>(name: &str, work: impl FnOnce() -> T) -> T {
-    let mut writer = GLOBAL_LOCAL_NODE_NAME.blocking_write();
-    *writer = name.to_string();
-    let result = work();
-    drop(writer);
-    result
-}
-
-#[cfg(test)]
-mod node_identity_tests {
-    use super::*;
-
-    #[tokio::test]
-    async fn local_node_name_nonblocking_read_recovers_after_writer_release() {
-        let previous = get_global_local_node_name().await;
-        let (unavailable, published, panicked) = tokio::task::spawn_blocking(|| {
-            let unavailable = with_local_node_name_write_lock_for_test("published-node", try_get_global_local_node_name);
-            let published = try_get_global_local_node_name();
-            let panicked = std::panic::catch_unwind(|| {
-                with_local_node_name_write_lock_for_test("unwound-node", || panic!("identity callback failed"));
-            });
-            (unavailable, published, panicked)
-        })
-        .await
-        .expect("identity writer worker must complete");
-        let after_unwind = try_get_global_local_node_name();
-        set_global_local_node_name(&previous).await;
-
-        assert!(unavailable.is_none(), "a held writer must make the nonblocking getter unavailable");
-        assert_eq!(published.as_deref(), Some("published-node"));
-        assert!(panicked.is_err(), "the callback panic must propagate after releasing the lock");
-        assert_eq!(after_unwind.as_deref(), Some("unwound-node"));
-    }
-}
-
 /// Set the global RustFS address used for gRPC connections.
 ///
 /// # Arguments

crates/common/src/mrf_channel.rs

@@ -172,41 +172,11 @@ pub struct MrfUnverifiedLegacyEvent {
     pub anchor: MrfDurableRepairAnchor,
 }
 
-#[derive(Clone, Copy)]
-struct ResolvedMrfRepairIdentity {
-    version_id: Option<[u8; 16]>,
-    scope: Option<MrfScope>,
-    delete_marker_purge: Option<MrfDeleteMarkerPurgeIdentity>,
-    lease: MrfIngressLease,
-    bucket_incarnation_id: Uuid,
-}
-
 impl MrfDurableRepairAnchor {
     /// Build a dischargeable anchor only when the caller supplies the storage
     /// incarnation and the original ingress lease. Legacy replay records lack
     /// both pieces and therefore remain fail-closed.
     pub fn from_intent(intent: &MrfIntent, bucket_incarnation_id: Uuid) -> Option<Self> {
-        let identity = Self::resolve_identity(intent, bucket_incarnation_id)?;
-        Some(Self {
-            kind: intent.kind,
-            bucket: intent.bucket.clone(),
-            object: intent.object.clone(),
-            version_id: identity.version_id,
-            scope: identity.scope,
-            delete_marker_purge: identity.delete_marker_purge,
-            lease: identity.lease,
-            bucket_incarnation_id: identity.bucket_incarnation_id,
-        })
-    }
-
-    /// Check whether the intent can form an anchor for this exact source,
-    /// without retaining its bucket/object handles. This checks identity shape,
-    /// not storage verification or retirement authority.
-    pub fn is_eligible_for_source(intent: &MrfIntent, source: Uuid) -> bool {
-        Self::resolve_identity(intent, source).is_some_and(|identity| identity.bucket_incarnation_id == source)
-    }
-
-    fn resolve_identity(intent: &MrfIntent, bucket_incarnation_id: Uuid) -> Option<ResolvedMrfRepairIdentity> {
         let lease = intent.lease?;
         let (version_id, scope) = canonical_identity(intent.kind, intent.version_id, intent.scope);
         let delete_marker_purge = canonical_delete_marker_purge_identity(intent)?;
@@ -216,7 +186,10 @@ impl MrfDurableRepairAnchor {
         if bucket_incarnation_id.is_nil() {
             return None;
         }
-        Some(ResolvedMrfRepairIdentity {
+        Some(Self {
+            kind: intent.kind,
+            bucket: intent.bucket.clone(),
+            object: intent.object.clone(),
             version_id,
             scope,
             delete_marker_purge,
@@ -260,32 +233,24 @@ pub fn consume_recorded_verified_mrf_repair_events_for(bucket: &str, anchors: &m
     let Ok(mut events) = registry.lock() else {
         return 0;
     };
-    consume_verified_mrf_repair_events_from_queue(bucket, anchors, &mut events)
-}
-
-fn consume_verified_mrf_repair_events_from_queue(
-    bucket: &str,
-    anchors: &mut Vec<MrfDurableRepairAnchor>,
-    events: &mut std::collections::VecDeque<MrfVerifiedRepairEvent>,
-) -> usize {
     let before = anchors.len();
-    let previous_event_count = events.len();
-    events.retain(|event| {
+    let mut retained = std::collections::VecDeque::with_capacity(events.len());
+    while let Some(event) = events.pop_front() {
         if event.bucket.as_ref() != bucket {
-            return true;
+            retained.push_back(event);
+            continue;
         }
         let mut matched = false;
         anchors.retain(|anchor| {
-            let proven = anchor.is_proven_by(event);
+            let proven = anchor.is_proven_by(&event);
             matched |= proven;
             !proven
         });
-        !matched
-    });
-    // The old queue rebuild reserved the pre-consumption event count. Reuse
-    // that buffer when possible without extending its capacity lifetime:
-    // an emptied queue releases its backing storage on the next consumption.
-    events.shrink_to(previous_event_count);
+        if !matched {
+            retained.push_back(event);
+        }
+    }
+    *events = retained;
     before.saturating_sub(anchors.len())
 }
 
@@ -856,21 +821,6 @@ static MRF_VERIFIED_REPAIR_EVENTS: OnceLock<std::sync::Mutex<std::collections::V
 static MRF_UNVERIFIED_LEGACY_EVENTS: OnceLock<std::sync::Mutex<std::collections::VecDeque<MrfUnverifiedLegacyEvent>>> =
     OnceLock::new();
 
-/// Whether durable repair events may need consumption. This is only a work
-/// hint: either queue can receive an event after its empty observation, and a
-/// bounded queue can evict that event before the next consumer invocation.
-/// An unavailable lock is unknown, so callers must keep their normal path.
-/// An allocated empty verified queue also needs the normal consumer pass to
-/// release its buffer; this hint must not extend that buffer's lifetime.
-pub fn mrf_durable_repair_events_may_be_pending() -> bool {
-    MRF_VERIFIED_REPAIR_EVENTS
-        .get()
-        .is_some_and(|registry| registry.try_lock().map_or(true, |events| events.capacity() != 0))
-        || MRF_UNVERIFIED_LEGACY_EVENTS
-            .get()
-            .is_some_and(|registry| registry.try_lock().map_or(true, |events| !events.is_empty()))
-}
-
 /// Record a legacy notification for compatibility. This is not an
 /// acknowledgement of storage verification or durable repair completion.
 pub fn note_mrf_repaired(bucket: &str, object: &str, version_id: Option<[u8; 16]>) {
@@ -985,15 +935,6 @@ pub fn take_mrf_unverified_legacy_events_for(bucket: &str) -> Vec<MrfUnverifiedL
     taken
 }
 
-#[cfg(test)]
-mod event_presence_tests;
-
-#[cfg(test)]
-mod proof_queue_tests;
-
-#[cfg(test)]
-mod repair_identity_tests;
-
 #[cfg(test)]
 mod tests {
     use super::*;

crates/common/src/mrf_channel/event_presence_tests.rs

@@ -1,140 +0,0 @@
-// 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 isolated(name: &str) -> bool {
-    const CHILD: &str = "RUSTFS_MRF_EVENT_PRESENCE_TEST";
-    let test = format!("mrf_channel::event_presence_tests::{name}");
-    if let Ok(current) = std::env::var(CHILD) {
-        assert_eq!(current, test, "only the selected registry test may run in the child");
-        return false;
-    }
-    let output = std::process::Command::new(std::env::current_exe().expect("test executable"))
-        .args([&test, "--exact", "--test-threads=1"])
-        .env(CHILD, &test)
-        .output()
-        .expect("run isolated global registry test");
-    let stdout = String::from_utf8_lossy(&output.stdout);
-    assert!(
-        output.status.success() && stdout.contains("1 passed; 0 failed"),
-        "registry child must execute exactly once: {stdout}{}",
-        String::from_utf8_lossy(&output.stderr)
-    );
-    true
-}
-
-#[test]
-fn event_presence_covers_both_queues_and_contention_without_consuming() {
-    if isolated("event_presence_covers_both_queues_and_contention_without_consuming") {
-        return;
-    }
-    assert!(!mrf_durable_repair_events_may_be_pending());
-    let anchor = MrfDurableRepairAnchor {
-        kind: MrfKind::PartialWrite,
-        bucket: Arc::from("presence-test"),
-        object: Arc::from("object"),
-        version_id: Some([7; 16]),
-        scope: Some(MrfScope {
-            pool_index: 0,
-            set_index: 0,
-        }),
-        delete_marker_purge: None,
-        lease: MrfIngressLease::new(21),
-        bucket_incarnation_id: Uuid::new_v4(),
-    };
-    let event = MrfVerifiedRepairEvent {
-        kind: anchor.kind,
-        bucket: anchor.bucket.clone(),
-        object: anchor.object.clone(),
-        version_id: anchor.version_id,
-        scope: anchor.scope,
-        delete_marker_purge: None,
-        lease: Some(anchor.lease),
-        bucket_incarnation_id: anchor.bucket_incarnation_id,
-        disposition: MrfVerifiedRepairDisposition::VerifiedHealthy,
-    };
-    note_mrf_verified_repair(event.clone());
-    assert!(mrf_durable_repair_events_may_be_pending());
-    assert!(mrf_durable_repair_events_may_be_pending(), "the hint must not consume a proof");
-    assert_eq!(take_mrf_verified_repair_events_for(&anchor.bucket), vec![event]);
-    assert!(
-        mrf_durable_repair_events_may_be_pending(),
-        "the empty allocated verified buffer still needs its original maintenance pass"
-    );
-    let mut retained = vec![anchor.clone()];
-    assert_eq!(consume_recorded_verified_mrf_repair_events_for(&anchor.bucket, &mut retained), 0);
-    assert_eq!(retained, vec![anchor.clone()], "buffer maintenance cannot discharge an anchor");
-    assert_eq!(
-        MRF_VERIFIED_REPAIR_EVENTS
-            .get()
-            .expect("verified registry")
-            .lock()
-            .expect("verified storage")
-            .capacity(),
-        0,
-        "the actual consumer releases empty proof storage before subsequent idle passes can skip it"
-    );
-    assert!(!mrf_durable_repair_events_may_be_pending());
-    let legacy = MrfUnverifiedLegacyEvent { anchor };
-    note_mrf_unverified_legacy(legacy.clone());
-    assert!(mrf_durable_repair_events_may_be_pending(), "legacy-only work must not be skipped");
-    assert_eq!(take_mrf_unverified_legacy_events_for(&legacy.anchor.bucket), vec![legacy]);
-    assert!(!mrf_durable_repair_events_may_be_pending());
-    let verified = MRF_VERIFIED_REPAIR_EVENTS.get().expect("verified registry initialized");
-    let guard = verified.lock().expect("hold verified registry");
-    assert!(mrf_durable_repair_events_may_be_pending(), "contended verified is unknown");
-    drop(guard);
-    let legacy = MRF_UNVERIFIED_LEGACY_EVENTS.get().expect("legacy registry initialized");
-    let guard = legacy.lock().expect("hold legacy registry");
-    assert!(mrf_durable_repair_events_may_be_pending(), "contended legacy is unknown");
-    drop(guard);
-    assert!(!mrf_durable_repair_events_may_be_pending());
-}
-
-#[test]
-fn event_presence_keeps_poisoned_verified_unknown() {
-    if isolated("event_presence_keeps_poisoned_verified_unknown") {
-        return;
-    }
-    assert!(!mrf_durable_repair_events_may_be_pending());
-    let registry = MRF_VERIFIED_REPAIR_EVENTS.get_or_init(|| Mutex::new(Default::default()));
-    assert!(
-        std::panic::catch_unwind(|| {
-            let _guard = registry.lock().expect("unpoisoned registry");
-            panic!("poison the isolated verified registry");
-        })
-        .is_err()
-    );
-    assert!(mrf_durable_repair_events_may_be_pending());
-    assert!(registry.is_poisoned(), "the hint must not clear or recover poisoned state");
-}
-
-#[test]
-fn event_presence_keeps_poisoned_legacy_unknown() {
-    if isolated("event_presence_keeps_poisoned_legacy_unknown") {
-        return;
-    }
-    assert!(!mrf_durable_repair_events_may_be_pending());
-    let registry = MRF_UNVERIFIED_LEGACY_EVENTS.get_or_init(|| Mutex::new(Default::default()));
-    assert!(
-        std::panic::catch_unwind(|| {
-            let _guard = registry.lock().expect("unpoisoned registry");
-            panic!("poison the isolated legacy registry");
-        })
-        .is_err()
-    );
-    assert!(mrf_durable_repair_events_may_be_pending());
-    assert!(registry.is_poisoned(), "the hint must not clear or recover poisoned state");
-}

crates/common/src/mrf_channel/proof_queue_tests.rs

@@ -1,304 +0,0 @@
-// 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::*;
-use std::collections::VecDeque;
-
-fn proof_fixture() -> (MrfDurableRepairAnchor, MrfVerifiedRepairEvent) {
-    let anchor = MrfDurableRepairAnchor {
-        kind: MrfKind::PartialWrite,
-        bucket: Arc::from("proof-queue"),
-        object: Arc::from("matched"),
-        version_id: Some([7; 16]),
-        scope: Some(MrfScope {
-            pool_index: 1,
-            set_index: 2,
-        }),
-        delete_marker_purge: None,
-        lease: MrfIngressLease::new(21),
-        bucket_incarnation_id: Uuid::new_v4(),
-    };
-    let event = MrfVerifiedRepairEvent {
-        kind: anchor.kind,
-        bucket: anchor.bucket.clone(),
-        object: anchor.object.clone(),
-        version_id: anchor.version_id,
-        scope: anchor.scope,
-        delete_marker_purge: anchor.delete_marker_purge,
-        lease: Some(anchor.lease),
-        bucket_incarnation_id: anchor.bucket_incarnation_id,
-        disposition: MrfVerifiedRepairDisposition::Repaired,
-    };
-    (anchor, event)
-}
-
-#[test]
-fn proof_queue_reuses_unmatched_storage_in_contiguous_and_wrapped_layouts() {
-    for wrapped in [false, true] {
-        for foreign in [false, true] {
-            let (anchor, mut event) = proof_fixture();
-            if foreign {
-                event.bucket = Arc::from("another-bucket");
-            } else {
-                event.lease = None;
-            }
-            let mut events = VecDeque::with_capacity(8);
-            events.extend(std::iter::repeat_n(event, events.capacity()));
-            if wrapped {
-                let first = events.pop_front().expect("full local proof queue");
-                events.push_back(first);
-                assert!(!events.as_slices().1.is_empty(), "exercise a wrapped producer queue");
-            }
-            let capacity = events.capacity();
-            let storage = events
-                .iter()
-                .map(std::ptr::from_ref)
-                .min()
-                .expect("nonempty local proof storage");
-            let expected = events.clone();
-            let mut anchors = vec![anchor.clone()];
-            for _ in 0..4 {
-                assert_eq!(
-                    consume_verified_mrf_repair_events_from_queue(&anchor.bucket, &mut anchors, &mut events),
-                    0
-                );
-                assert_eq!(events, expected);
-                assert_eq!(anchors, vec![anchor.clone()]);
-                assert_eq!(events.capacity(), capacity);
-                assert_eq!(
-                    events.iter().map(std::ptr::from_ref).min(),
-                    Some(storage),
-                    "a full unmatched queue must reuse its buffer instead of rebuilding it for every bucket"
-                );
-            }
-        }
-    }
-}
-
-#[test]
-fn proof_queue_consumes_all_exact_anchor_copies_and_preserves_duplicate_proof_order() {
-    let (anchor, event) = proof_fixture();
-    let waiting = MrfDurableRepairAnchor {
-        object: Arc::from("waiting"),
-        ..anchor.clone()
-    };
-    let foreign = MrfVerifiedRepairEvent {
-        bucket: Arc::from("foreign"),
-        ..event.clone()
-    };
-    let unleased = MrfVerifiedRepairEvent {
-        lease: None,
-        ..event.clone()
-    };
-    let future = MrfVerifiedRepairEvent {
-        object: Arc::from("future"),
-        ..event.clone()
-    };
-    let mut events = VecDeque::from(vec![
-        foreign.clone(),
-        event.clone(),
-        unleased.clone(),
-        event.clone(),
-        future.clone(),
-    ]);
-    let first = events.pop_front().expect("foreign proof starts the queue");
-    events.push_back(first);
-    assert!(!events.as_slices().1.is_empty(), "match and retain proofs across the wrap boundary");
-    let mut anchors = vec![anchor.clone(), waiting.clone(), anchor.clone()];
-    assert_eq!(
-        consume_verified_mrf_repair_events_from_queue(&anchor.bucket, &mut anchors, &mut events),
-        2
-    );
-    assert_eq!(anchors, vec![waiting]);
-    assert_eq!(
-        events,
-        VecDeque::from(vec![unleased, event, future, foreign]),
-        "the later duplicate proof remains available after the first proof consumes every exact anchor"
-    );
-    let retained = events.clone();
-    assert_eq!(
-        consume_verified_mrf_repair_events_from_queue(&anchor.bucket, &mut anchors, &mut events),
-        0
-    );
-    assert_eq!(events, retained, "a later consumer must still be able to match the retained proofs");
-}
-
-#[test]
-fn proof_queue_keeps_every_incomplete_or_mismatched_identity() {
-    let (anchor, event) = proof_fixture();
-    let different_purge = MrfDeleteMarkerPurgeIdentity {
-        bucket_incarnation_id: anchor.bucket_incarnation_id,
-        marker_incarnation_id: anchor.bucket_incarnation_id,
-        marker_identity: [3; 32],
-    };
-    for rejected in [
-        MrfVerifiedRepairEvent {
-            kind: MrfKind::DecodeFailure,
-            ..event.clone()
-        },
-        MrfVerifiedRepairEvent {
-            bucket: Arc::from("foreign"),
-            ..event.clone()
-        },
-        MrfVerifiedRepairEvent {
-            object: Arc::from("other"),
-            ..event.clone()
-        },
-        MrfVerifiedRepairEvent {
-            version_id: None,
-            ..event.clone()
-        },
-        MrfVerifiedRepairEvent {
-            version_id: Some([8; 16]),
-            ..event.clone()
-        },
-        MrfVerifiedRepairEvent {
-            scope: None,
-            ..event.clone()
-        },
-        MrfVerifiedRepairEvent {
-            scope: Some(MrfScope {
-                pool_index: 2,
-                set_index: 2,
-            }),
-            ..event.clone()
-        },
-        MrfVerifiedRepairEvent {
-            scope: Some(MrfScope {
-                pool_index: 1,
-                set_index: 3,
-            }),
-            ..event.clone()
-        },
-        MrfVerifiedRepairEvent {
-            lease: None,
-            ..event.clone()
-        },
-        MrfVerifiedRepairEvent {
-            lease: Some(MrfIngressLease::new(22)),
-            ..event.clone()
-        },
-        MrfVerifiedRepairEvent {
-            bucket_incarnation_id: Uuid::new_v4(),
-            ..event.clone()
-        },
-        MrfVerifiedRepairEvent {
-            delete_marker_purge: Some(different_purge),
-            ..event
-        },
-    ] {
-        let mut anchors = vec![anchor.clone()];
-        let mut events = VecDeque::from([rejected.clone()]);
-        assert_eq!(
-            consume_verified_mrf_repair_events_from_queue(&anchor.bucket, &mut anchors, &mut events),
-            0
-        );
-        assert_eq!(anchors, vec![anchor.clone()]);
-        assert_eq!(events, VecDeque::from([rejected]));
-    }
-}
-
-#[test]
-fn proof_queue_requires_the_complete_delete_marker_purge_identity() {
-    let (mut anchor, mut event) = proof_fixture();
-    let purge = MrfDeleteMarkerPurgeIdentity {
-        bucket_incarnation_id: anchor.bucket_incarnation_id,
-        marker_incarnation_id: anchor.bucket_incarnation_id,
-        marker_identity: [3; 32],
-    };
-    anchor.kind = MrfKind::DeleteMarkerPurge;
-    anchor.delete_marker_purge = Some(purge);
-    event.kind = anchor.kind;
-    event.delete_marker_purge = anchor.delete_marker_purge;
-    for rejected in [
-        None,
-        Some(MrfDeleteMarkerPurgeIdentity {
-            bucket_incarnation_id: Uuid::new_v4(),
-            ..purge
-        }),
-        Some(MrfDeleteMarkerPurgeIdentity {
-            marker_incarnation_id: Uuid::new_v4(),
-            ..purge
-        }),
-        Some(MrfDeleteMarkerPurgeIdentity {
-            marker_identity: [4; 32],
-            ..purge
-        }),
-    ] {
-        let rejected = MrfVerifiedRepairEvent {
-            delete_marker_purge: rejected,
-            ..event.clone()
-        };
-        let mut anchors = vec![anchor.clone()];
-        let mut events = VecDeque::from([rejected.clone(), event.clone()]);
-        assert_eq!(
-            consume_verified_mrf_repair_events_from_queue(&anchor.bucket, &mut anchors, &mut events),
-            1
-        );
-        assert!(anchors.is_empty());
-        assert_eq!(events, VecDeque::from([rejected]));
-    }
-}
-
-#[test]
-fn proof_queue_capacity_follows_the_preconsumption_length_and_releases_on_the_next_empty_call() {
-    let (anchor, event) = proof_fixture();
-    let future_events = (0..3)
-        .map(|index| MrfVerifiedRepairEvent {
-            object: Arc::from(format!("future-{index}")),
-            ..event.clone()
-        })
-        .collect::<Vec<_>>();
-    let mut events = VecDeque::with_capacity(64);
-    events.push_back(event);
-    events.extend(future_events.iter().cloned());
-    let previous_event_count = events.len();
-    let mut anchors = vec![anchor.clone()];
-    assert_eq!(
-        consume_verified_mrf_repair_events_from_queue(&anchor.bucket, &mut anchors, &mut events),
-        1
-    );
-    assert_eq!(events.iter().cloned().collect::<Vec<_>>(), future_events);
-    assert_eq!(
-        events.capacity(),
-        VecDeque::<MrfVerifiedRepairEvent>::with_capacity(previous_event_count).capacity(),
-        "preserve the former queue rebuild's capacity lifetime instead of retaining the producer high water"
-    );
-    let previous_event_count = events.len();
-    let mut anchors = future_events
-        .iter()
-        .map(|event| MrfDurableRepairAnchor {
-            object: event.object.clone(),
-            ..anchor.clone()
-        })
-        .collect();
-    assert_eq!(
-        consume_verified_mrf_repair_events_from_queue(&anchor.bucket, &mut anchors, &mut events),
-        3
-    );
-    assert!(events.is_empty());
-    assert_eq!(
-        events.capacity(),
-        VecDeque::<MrfVerifiedRepairEvent>::with_capacity(previous_event_count).capacity()
-    );
-    assert_eq!(
-        consume_verified_mrf_repair_events_from_queue(&anchor.bucket, &mut anchors, &mut events),
-        0
-    );
-    assert_eq!(
-        events.capacity(),
-        0,
-        "the next empty consumption releases backing storage just as a rebuild did"
-    );
-}

crates/common/src/mrf_channel/repair_identity_tests.rs

@@ -1,256 +0,0 @@
-// 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::*;
-
-// Compatibility reference from a47649fb60c0492cc0fb02bff28439c5e357f8e4.
-// Keep this independent of the shared resolver and its canonical helpers.
-fn original_anchor(intent: &MrfIntent, bucket_incarnation_id: Uuid) -> Option<MrfDurableRepairAnchor> {
-    let lease = intent.lease?;
-    let version_id = intent.version_id.filter(|bytes| *bytes != [0; 16]);
-    let (version_id, scope) = match intent.kind {
-        MrfKind::MetadataCorruption => (None, None),
-        MrfKind::DecodeFailure | MrfKind::PartialWrite | MrfKind::DeleteMarkerPurge => (version_id, intent.scope),
-    };
-    let delete_marker_purge = match intent.kind {
-        MrfKind::DeleteMarkerPurge => intent
-            .delete_marker_purge
-            .as_ref()
-            .filter(|payload| {
-                !payload.bucket_incarnation_id.is_nil()
-                    && payload.marker_incarnation_id == payload.bucket_incarnation_id
-                    && !payload.marker.is_empty()
-                    && payload.marker.len() <= MRF_MAX_DELETE_MARKER_BYTES
-            })
-            .map(|payload| {
-                Some(MrfDeleteMarkerPurgeIdentity {
-                    bucket_incarnation_id: payload.bucket_incarnation_id,
-                    marker_incarnation_id: payload.marker_incarnation_id,
-                    marker_identity: payload.marker_identity,
-                })
-            })?,
-        _ if intent.delete_marker_purge.is_none() => None,
-        _ => return None,
-    };
-    let bucket_incarnation_id = delete_marker_purge
-        .map(|identity| identity.bucket_incarnation_id)
-        .unwrap_or(bucket_incarnation_id);
-    if bucket_incarnation_id.is_nil() {
-        return None;
-    }
-    Some(MrfDurableRepairAnchor {
-        kind: intent.kind,
-        bucket: intent.bucket.clone(),
-        object: intent.object.clone(),
-        version_id,
-        scope,
-        delete_marker_purge,
-        lease,
-        bucket_incarnation_id,
-    })
-}
-
-#[test]
-fn shared_repair_identity_matches_the_original_constructor_and_source_filter() {
-    let source = Uuid::from_u128(1);
-    let foreign = Uuid::from_u128(2);
-    let purge = MrfDeleteMarkerPurge {
-        bucket_incarnation_id: source,
-        marker_incarnation_id: source,
-        marker_identity: [9; 32],
-        marker: Arc::from([7_u8]),
-    };
-    let payloads = [
-        None,
-        Some(purge.clone()),
-        Some(MrfDeleteMarkerPurge {
-            bucket_incarnation_id: foreign,
-            marker_incarnation_id: foreign,
-            ..purge.clone()
-        }),
-        Some(MrfDeleteMarkerPurge {
-            marker: Arc::from([]),
-            ..purge.clone()
-        }),
-        Some(MrfDeleteMarkerPurge {
-            marker: Arc::from(vec![7; MRF_MAX_DELETE_MARKER_BYTES]),
-            ..purge.clone()
-        }),
-        Some(MrfDeleteMarkerPurge {
-            marker: Arc::from(vec![7; MRF_MAX_DELETE_MARKER_BYTES + 1]),
-            ..purge.clone()
-        }),
-        Some(MrfDeleteMarkerPurge {
-            marker_incarnation_id: foreign,
-            ..purge.clone()
-        }),
-        Some(MrfDeleteMarkerPurge {
-            bucket_incarnation_id: Uuid::nil(),
-            marker_incarnation_id: Uuid::nil(),
-            ..purge
-        }),
-    ];
-    let mut cases = 0;
-    for kind in [
-        MrfKind::DecodeFailure,
-        MrfKind::MetadataCorruption,
-        MrfKind::PartialWrite,
-        MrfKind::DeleteMarkerPurge,
-    ] {
-        for lease in [None, Some(MrfIngressLease::new(0)), Some(MrfIngressLease::new(7))] {
-            for version_id in [None, Some([0; 16]), Some([7; 16])] {
-                for scope in [
-                    None,
-                    Some(MrfScope {
-                        pool_index: u32::MAX,
-                        set_index: 3,
-                    }),
-                ] {
-                    for input_source in [Uuid::nil(), source, foreign] {
-                        for (payload_index, payload) in payloads.iter().enumerate() {
-                            let intent = MrfIntent {
-                                bucket: Arc::from("source-shape"),
-                                object: Arc::from("object"),
-                                version_id,
-                                kind,
-                                delete_marker_purge: payload.clone(),
-                                scope,
-                                lease,
-                                enqueued_at_ms: 0,
-                                attempts: 0,
-                            };
-                            let expected = original_anchor(&intent, input_source);
-                            assert_eq!(
-                                MrfDurableRepairAnchor::from_intent(&intent, input_source),
-                                expected,
-                                "kind={kind:?}, lease={lease:?}, version={version_id:?}, scope={scope:?}, source={input_source}, payload={payload_index}"
-                            );
-                            assert_eq!(
-                                MrfDurableRepairAnchor::is_eligible_for_source(&intent, input_source),
-                                expected
-                                    .as_ref()
-                                    .is_some_and(|anchor| anchor.bucket_incarnation_id == input_source),
-                                "source eligibility must preserve the exact source: kind={kind:?}, lease={lease:?}, version={version_id:?}, scope={scope:?}, source={input_source}, payload={payload_index}"
-                            );
-                            cases += 1;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    assert_eq!(cases, 1728, "exercise the complete explicit identity-shape matrix");
-}
-
-#[test]
-fn repair_identity_preserves_literal_purge_source_lease_and_metadata_boundaries() {
-    let source = Uuid::from_u128(1);
-    let purge_source = Uuid::from_u128(2);
-    let mut intent = MrfIntent {
-        bucket: Arc::from("literal-bucket"),
-        object: Arc::from("marker"),
-        version_id: None,
-        kind: MrfKind::DeleteMarkerPurge,
-        delete_marker_purge: Some(MrfDeleteMarkerPurge {
-            bucket_incarnation_id: purge_source,
-            marker_incarnation_id: purge_source,
-            marker_identity: [9; 32],
-            marker: Arc::from([7_u8]),
-        }),
-        scope: None,
-        lease: Some(MrfIngressLease::new(17)),
-        enqueued_at_ms: 0,
-        attempts: 0,
-    };
-    assert!(
-        !valid_intent_payload(&intent),
-        "constructor compatibility is broader than durable admission"
-    );
-    assert_eq!(
-        MrfDurableRepairAnchor::from_intent(&intent, Uuid::nil()),
-        Some(MrfDurableRepairAnchor {
-            kind: MrfKind::DeleteMarkerPurge,
-            bucket: Arc::from("literal-bucket"),
-            object: Arc::from("marker"),
-            version_id: None,
-            scope: None,
-            delete_marker_purge: Some(MrfDeleteMarkerPurgeIdentity {
-                bucket_incarnation_id: purge_source,
-                marker_incarnation_id: purge_source,
-                marker_identity: [9; 32],
-            }),
-            lease: MrfIngressLease::new(17),
-            bucket_incarnation_id: purge_source,
-        })
-    );
-    assert!(
-        !MrfDurableRepairAnchor::is_eligible_for_source(&intent, source),
-        "a purge cannot borrow a conflicting entry source"
-    );
-    assert!(!MrfDurableRepairAnchor::is_eligible_for_source(&intent, Uuid::nil()));
-    assert!(MrfDurableRepairAnchor::is_eligible_for_source(&intent, purge_source));
-    intent.lease = None;
-    assert!(MrfDurableRepairAnchor::from_intent(&intent, purge_source).is_none());
-    assert!(!MrfDurableRepairAnchor::is_eligible_for_source(&intent, purge_source));
-    intent.lease = Some(MrfIngressLease::new(17));
-    intent
-        .delete_marker_purge
-        .as_mut()
-        .expect("purge fixture")
-        .marker_incarnation_id = Uuid::nil();
-    assert!(MrfDurableRepairAnchor::from_intent(&intent, purge_source).is_none());
-    intent
-        .delete_marker_purge
-        .as_mut()
-        .expect("purge fixture")
-        .bucket_incarnation_id = Uuid::nil();
-    assert!(
-        !MrfDurableRepairAnchor::is_eligible_for_source(&intent, source),
-        "nil marker identity cannot borrow a non-nil source"
-    );
-    intent.kind = MrfKind::PartialWrite;
-    assert!(
-        MrfDurableRepairAnchor::from_intent(&intent, source).is_none(),
-        "ordinary intents cannot carry a purge payload"
-    );
-    intent.delete_marker_purge = None;
-    intent.kind = MrfKind::MetadataCorruption;
-    intent.version_id = Some([7; 16]);
-    intent.scope = Some(MrfScope {
-        pool_index: 8,
-        set_index: 9,
-    });
-    assert_eq!(
-        MrfDurableRepairAnchor::from_intent(&intent, source),
-        Some(MrfDurableRepairAnchor {
-            kind: MrfKind::MetadataCorruption,
-            bucket: Arc::from("literal-bucket"),
-            object: Arc::from("marker"),
-            version_id: None,
-            scope: None,
-            delete_marker_purge: None,
-            lease: MrfIngressLease::new(17),
-            bucket_incarnation_id: source,
-        })
-    );
-    assert!(MrfDurableRepairAnchor::is_eligible_for_source(&intent, source));
-    assert!(MrfDurableRepairAnchor::from_intent(&intent, Uuid::nil()).is_none());
-    intent.lease = Some(MrfIngressLease::new(0));
-    assert_eq!(
-        MrfDurableRepairAnchor::from_intent(&intent, source)
-            .expect("preserve the existing opaque lease shape")
-            .lease,
-        MrfIngressLease::new(0)
-    );
-}

crates/concurrency/Cargo.toml

@@ -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 }

crates/concurrency/src/adaptive.rs

@@ -1,957 +0,0 @@
-// Copyright 2026 RustFS Team
-// Licensed under the Apache License, Version 2.0.
-
-//! Mutable admission capacity without replacing or revoking held permits.
-
-use std::num::NonZeroU16;
-use std::sync::Arc;
-use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
-use std::time::Duration;
-use tokio::sync::{Notify, Semaphore};
-use tokio::time::Instant;
-
-/// A resource owner publishes a capacity; running units retain their permits
-/// after a reduction. Lease slots are reserved once, with no per-unit Arc
-/// allocation. Tokio wait queues may lazily initialize platform mutex storage
-/// on first contention. It does not discover devices, start
-/// workers, or decide resource policy. Cancellation drops the acquire future.
-///
-/// Uncontended admission is atomic. Parked work takes a FIFO admission turn,
-/// so repeated fast acquisitions cannot starve an older waiter. Source/age
-/// priority still belongs to the caller's scheduler, before joining this queue.
-pub struct AdaptiveAdmission {
-    // One CAS observes both capacity and active count, so a concurrent shrink
-    // cannot admit a new unit using an already superseded capacity.
-    state: AtomicU64,
-    origin: Instant,
-    valid_until_millis: AtomicU64,
-    // Only the FIFO turn holder subscribes. A stored notification is harmless:
-    // capacity and freshness are always checked again after waking.
-    changed: Notify,
-    queued: AtomicUsize,
-    // FIFO admission turn, not a mutable-state lock. No storage lock or
-    // admitted permit may be held while joining. This private semaphore is
-    // never closed; release and resize do not acquire it.
-    turn: Semaphore,
-    maximum: u32,
-    slots: Box<[PermitSlots]>,
-    next_chunk: AtomicUsize,
-}
-
-struct PermitSlots {
-    free: AtomicU64,
-    references: [AtomicUsize; 64],
-}
-
-struct QueuedAdmission<'a>(&'a AdaptiveAdmission);
-
-impl Drop for QueuedAdmission<'_> {
-    fn drop(&mut self) {
-        self.0.queued.fetch_sub(1, Ordering::AcqRel);
-    }
-}
-
-/// One active unit. Clones share that unit without allocating; the final drop
-/// returns it to the same owner, including after resize or waiter cancellation.
-#[must_use = "hold the permit for the admitted unit's complete lifetime"]
-pub struct AdaptivePermit {
-    owner: Arc<AdaptiveAdmission>,
-    slot: usize,
-}
-
-impl Clone for AdaptivePermit {
-    fn clone(&self) -> Self {
-        // Every slot reference owns a strong owner reference. Clone the Arc
-        // first, so its overflow protection also bounds the slot refcount.
-        let owner = Arc::clone(&self.owner);
-        owner.slots[self.slot / 64].references[self.slot % 64].fetch_add(1, Ordering::Relaxed);
-        Self { owner, slot: self.slot }
-    }
-}
-
-impl std::fmt::Debug for AdaptivePermit {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("AdaptivePermit")
-            .field("slot", &self.slot)
-            .field("owner", &self.owner.snapshot())
-            .finish()
-    }
-}
-
-/// One coherent view of configured capacity and actual active units.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct AdaptiveAdmissionSnapshot {
-    /// Current cap on new admissions. Zero pauses all new units.
-    pub limit: u32,
-    /// Existing units, which may temporarily exceed a reduced limit.
-    pub active: u32,
-}
-
-/// Node scheduling capacity, separate from physical I/O and buffer ownership.
-/// Its non-cloneable units end with the async operation; a native tail must
-/// retain its own physical-resource unit, never this scheduling unit.
-pub struct NodeAdmission {
-    capacity: Arc<AdaptiveAdmission>,
-    completed: AtomicU64,
-}
-
-/// One async operation's scheduling unit. Dropping a cancelled or failed
-/// operation releases capacity without claiming completed work.
-#[must_use = "retain the unit until the async operation ends"]
-pub struct NodePermit {
-    _capacity: AdaptivePermit,
-    owner: Arc<NodeAdmission>,
-}
-
-impl NodeAdmission {
-    /// Construct one node owner with no capacity until a resource sample arrives.
-    pub fn new(maximum: NonZeroU16) -> Arc<Self> {
-        Arc::new(Self {
-            capacity: AdaptiveAdmission::new(maximum, 0),
-            completed: AtomicU64::new(0),
-        })
-    }
-
-    /// Publish feedback with this owner's actual completed-work counter.
-    pub fn update(&self, controller: &mut FeedbackController, observation: Option<FeedbackObservation>) -> FeedbackDecision {
-        let observation = observation.map(|mut observation| {
-            observation.completed_units = self.completed();
-            observation
-        });
-        controller.update(&self.capacity, observation)
-    }
-
-    /// Current leased scheduling cap and held async units.
-    pub fn snapshot(&self) -> AdaptiveAdmissionSnapshot {
-        self.capacity.snapshot()
-    }
-
-    /// Completed operations, or unknown after the counter exhausts its range.
-    pub fn completed(&self) -> Option<u64> {
-        let value = self.completed.load(Ordering::Acquire);
-        (value != u64::MAX).then_some(value)
-    }
-
-    /// Try without waiting, including when the caller already owns a lock.
-    pub fn try_acquire(self: &Arc<Self>) -> Option<NodePermit> {
-        self.capacity.try_acquire().map(|capacity| NodePermit {
-            _capacity: capacity,
-            owner: self.clone(),
-        })
-    }
-
-    /// Wait in FIFO order. Callers must provide a deadline/cancellation and
-    /// acquire before storage locks, not while retaining another node unit.
-    pub async fn acquire(self: &Arc<Self>) -> NodePermit {
-        NodePermit {
-            _capacity: self.capacity.acquire().await,
-            owner: self.clone(),
-        }
-    }
-}
-
-impl NodePermit {
-    /// Count a completed operation exactly once, then release its node unit.
-    /// This counter is scheduling progress, not an authoritative heal receipt.
-    pub fn complete(self) {
-        let _ = self
-            .owner
-            .completed
-            .try_update(Ordering::AcqRel, Ordering::Acquire, |value| value.checked_add(1));
-    }
-}
-
-/// Confidence-qualified pressure for one complete sampling window.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ResourcePressure {
-    /// Missing, stale, reset, or insufficient observations; never evidence of idle.
-    Unknown,
-    /// A resource or foreground-protection threshold was reached.
-    Busy,
-    /// All required observations were fresh and below their low watermarks.
-    Stable,
-}
-
-/// Resource-owner input to the controller, after applying operator and kernel
-/// caps. This describes one owner; callers must not duplicate a device's budget
-/// for aliases, pools, or remote requesters.
-#[derive(Debug, Clone, Copy)]
-pub struct FeedbackObservation {
-    /// Identity of the resource/telemetry generation. Replacement resets probes.
-    pub generation: u64,
-    /// Upper bound imposed by resources and explicit configuration; zero blocks.
-    pub max_concurrency: u32,
-    /// Complete-window pressure, including the confidence of its sources.
-    pub pressure: ResourcePressure,
-    /// Cumulative completed work in this generation, not just scheduled work.
-    pub completed_units: Option<u64>,
-}
-
-/// Why the latest concurrency limit was selected.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum FeedbackReason {
-    /// The resource cap is unavailable; no new unit can be bounded safely.
-    Unavailable,
-    /// A changed owner or reset work counter requires a new baseline.
-    NewBaseline,
-    /// The resource or operator cap reduced the permitted concurrency.
-    CapReduced,
-    /// Pressure caused an immediate multiplicative reduction.
-    Pressure,
-    /// Incomplete telemetry retains at most one maintenance unit.
-    LowConfidence,
-    /// Waiting for consecutive stable windows, work progress and cooldown.
-    Recovering,
-    /// One additional unit is being probed after a stable recovery period.
-    Probe,
-}
-
-/// One controller decision, suitable for metrics without dynamic labels.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct FeedbackDecision {
-    /// New admissions use this cap; existing permits remain valid.
-    pub limit: u32,
-    /// Decision cause, distinct from a proof of work completion or storage health.
-    pub reason: FeedbackReason,
-}
-
-/// Single-owner additive probe/multiplicative decrease controller. It adjusts
-/// only concurrency. Every source must be fresh before declaring `Stable`.
-///
-/// The sampler runs every second. A gap over two seconds resets recovery; eight
-/// consecutive stable seconds and observed completed work allow one extra unit.
-/// Pressure or lower caps apply immediately. This policy is not a performance
-/// claim; its parameters require the same workload/foreground-SLO acceptance.
-pub struct FeedbackController {
-    previous: Option<(Instant, FeedbackObservation)>,
-    stable_since: Option<Instant>,
-    last_change: Instant,
-    limit: u32,
-}
-
-impl Default for FeedbackController {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl FeedbackController {
-    /// Start without a resource observation or an admission grant.
-    pub fn new() -> Self {
-        Self {
-            previous: None,
-            stable_since: None,
-            last_change: Instant::now(),
-            limit: 0,
-        }
-    }
-
-    /// Consume one sample and publish a three-second lease to the same gate.
-    /// If this function stops being called, admission expires independently.
-    pub fn update(&mut self, gate: &AdaptiveAdmission, observation: Option<FeedbackObservation>) -> FeedbackDecision {
-        let observation = observation.map(|mut observation| {
-            observation.max_concurrency = observation.max_concurrency.min(gate.maximum);
-            observation
-        });
-        let decision = self.decide(Instant::now(), observation);
-        gate.set_sampled_limit(decision.limit, Duration::from_secs(3));
-        decision
-    }
-
-    fn decide(&mut self, now: Instant, observation: Option<FeedbackObservation>) -> FeedbackDecision {
-        let Some(observation) = observation else {
-            self.previous = None;
-            self.stable_since = None;
-            self.last_change = now;
-            self.limit = 0;
-            return FeedbackDecision {
-                limit: 0,
-                reason: FeedbackReason::Unavailable,
-            };
-        };
-        let previous = self.previous.replace((now, observation));
-        let contiguous = previous.is_some_and(|(at, old)| {
-            now.saturating_duration_since(at) <= Duration::from_secs(2)
-                && old.generation == observation.generation
-                && matches!((old.completed_units, observation.completed_units), (Some(a), Some(b)) if b >= a)
-        });
-        let advanced = previous
-            .is_some_and(|(_, old)| matches!((old.completed_units, observation.completed_units), (Some(a), Some(b)) if b > a));
-        let old_limit = self.limit;
-        let reason = if observation.max_concurrency == 0 {
-            self.limit = 0;
-            self.stable_since = None;
-            FeedbackReason::CapReduced
-        } else if observation.pressure == ResourcePressure::Busy {
-            self.limit = (self.limit / 2).max(1).min(observation.max_concurrency);
-            self.stable_since = None;
-            // Repeated busy windows restart cooldown, even at the minimum cap.
-            self.last_change = now;
-            FeedbackReason::Pressure
-        } else if observation.max_concurrency < self.limit {
-            self.limit = observation.max_concurrency;
-            self.stable_since = None;
-            FeedbackReason::CapReduced
-        } else if observation.pressure == ResourcePressure::Unknown || observation.completed_units.is_none() {
-            self.limit = 1.min(observation.max_concurrency);
-            self.stable_since = None;
-            FeedbackReason::LowConfidence
-        } else if !contiguous || self.limit == 0 {
-            self.limit = 1.min(observation.max_concurrency);
-            self.stable_since = None;
-            self.last_change = now;
-            FeedbackReason::NewBaseline
-        } else {
-            let since = *self.stable_since.get_or_insert(now);
-            if advanced
-                && now.saturating_duration_since(since) >= Duration::from_secs(8)
-                && now.saturating_duration_since(self.last_change) >= Duration::from_secs(8)
-                && self.limit < observation.max_concurrency
-            {
-                self.limit += 1;
-                FeedbackReason::Probe
-            } else {
-                FeedbackReason::Recovering
-            }
-        };
-        if old_limit != self.limit {
-            self.last_change = now;
-        }
-        FeedbackDecision {
-            limit: self.limit,
-            reason,
-        }
-    }
-}
-
-impl AdaptiveAdmission {
-    /// Construct a bounded owner, with zero initial capacity allowed for unknown
-    /// input. The immutable maximum reserves at most 65,535 lease slots once;
-    /// acquiring or cloning a permit does not allocate a per-unit Arc.
-    pub fn new(maximum: NonZeroU16, limit: u32) -> Arc<Self> {
-        let maximum_u32 = u32::from(maximum.get());
-        let maximum = usize::from(maximum.get());
-        let slots = (0..maximum.div_ceil(64))
-            .map(|chunk| {
-                let count = (maximum - chunk * 64).min(64);
-                PermitSlots {
-                    free: AtomicU64::new(if count == 64 { u64::MAX } else { (1_u64 << count) - 1 }),
-                    references: std::array::from_fn(|_| AtomicUsize::new(0)),
-                }
-            })
-            .collect::<Vec<_>>()
-            .into_boxed_slice();
-        Arc::new(Self {
-            state: AtomicU64::new(u64::from(limit.min(maximum_u32)) << 32),
-            origin: Instant::now(),
-            valid_until_millis: AtomicU64::new(u64::MAX),
-            changed: Notify::new(),
-            queued: AtomicUsize::new(0),
-            turn: Semaphore::new(1),
-            maximum: maximum_u32,
-            slots,
-            next_chunk: AtomicUsize::new(0),
-        })
-    }
-
-    /// Publish a cap bounded by the immutable maximum, without losing held work
-    /// or changing owner identity.
-    pub fn set_limit(&self, limit: u32) {
-        let limit = limit.min(self.maximum);
-        let _ = self.state.try_update(Ordering::AcqRel, Ordering::Acquire, |state| {
-            Some((u64::from(limit) << 32) | (state & u64::from(u32::MAX)))
-        });
-        self.changed.notify_one();
-    }
-
-    /// Publish a cap with a finite observation lifetime. Expired observations
-    /// block new admissions even if the sampling worker has stopped. Existing
-    /// permits are retained. A single resource owner must serialize publishers.
-    ///
-    /// Capacity is published before freshness, so a concurrent reader can
-    /// temporarily reject a fresh update but cannot use an increased lifetime
-    /// with the previous, potentially larger capacity.
-    pub fn set_sampled_limit(&self, limit: u32, valid_for: Duration) {
-        self.set_limit(limit);
-        let deadline = self
-            .elapsed_millis()
-            .saturating_add(u64::try_from(valid_for.as_millis()).unwrap_or(u64::MAX));
-        self.valid_until_millis.store(deadline, Ordering::Release);
-        self.changed.notify_one();
-    }
-
-    fn elapsed_millis(&self) -> u64 {
-        u64::try_from(self.origin.elapsed().as_millis()).unwrap_or(u64::MAX)
-    }
-
-    fn fresh(&self) -> bool {
-        self.elapsed_millis() < self.valid_until_millis.load(Ordering::Acquire)
-    }
-
-    /// Read the cap and active count from the same atomic observation.
-    pub fn snapshot(&self) -> AdaptiveAdmissionSnapshot {
-        // Acquire freshness first: a newly published lease must not be paired
-        // with capacity loaded before its preceding reduction.
-        let fresh = self.fresh();
-        let state = self.state.load(Ordering::Acquire);
-        AdaptiveAdmissionSnapshot {
-            limit: if fresh {
-                u32::try_from(state >> 32).unwrap_or(u32::MAX)
-            } else {
-                0
-            },
-            active: u32::try_from(state & u64::from(u32::MAX)).unwrap_or(u32::MAX),
-        }
-    }
-
-    /// Admit immediately if capacity remains, without a per-unit allocation.
-    /// The uncontended path uses atomics; refunding a racing acquisition may
-    /// wake the FIFO head through Tokio's notification queue.
-    pub fn try_acquire(self: &Arc<Self>) -> Option<AdaptivePermit> {
-        if self.queued.load(Ordering::Acquire) != 0 {
-            return None;
-        }
-        let permit = self.acquire_capacity()?;
-        // A waiter can register between the first queue check and the capacity
-        // CAS. Refund before exposing the permit rather than stealing its turn.
-        (self.queued.load(Ordering::Acquire) == 0).then_some(permit)
-    }
-
-    fn acquire_capacity(self: &Arc<Self>) -> Option<AdaptivePermit> {
-        if !self.fresh() {
-            return None;
-        }
-        let state = self.state.load(Ordering::Acquire);
-        if state & u64::from(u32::MAX) >= state >> 32 {
-            return None;
-        }
-        let slot = self.reserve_slot()?;
-        if self
-            .state
-            .try_update(Ordering::AcqRel, Ordering::Acquire, |state| {
-                let active = state & u64::from(u32::MAX);
-                (active < state >> 32).then(|| state + 1)
-            })
-            .is_err()
-        {
-            self.release_slot(slot);
-            self.changed.notify_one();
-            return None;
-        }
-        self.slots[slot / 64].references[slot % 64].store(1, Ordering::Release);
-        let permit = AdaptivePermit {
-            owner: self.clone(),
-            slot,
-        };
-        // The capacity CAS can retry across an observation expiry. Recheck
-        // before giving ownership to the caller; dropping refunds this unit.
-        self.fresh().then_some(permit)
-    }
-
-    fn reserve_slot(&self) -> Option<usize> {
-        let first = self.next_chunk.fetch_add(1, Ordering::Relaxed) % self.slots.len();
-        for offset in 0..self.slots.len() {
-            let chunk_index = (first + offset) % self.slots.len();
-            let free = &self.slots[chunk_index].free;
-            if let Ok(bits) = free.try_update(Ordering::AcqRel, Ordering::Acquire, |bits| (bits != 0).then(|| bits & (bits - 1)))
-            {
-                // trailing_zeros is in 0..64 because the zero word is rejected.
-                return Some(chunk_index * 64 + bits.trailing_zeros() as usize);
-            }
-        }
-        None
-    }
-
-    fn release_slot(&self, slot: usize) {
-        self.slots[slot / 64].free.fetch_or(1_u64 << (slot % 64), Ordering::Release);
-    }
-
-    /// Wait for capacity. The future owns no permit until it returns; dropping
-    /// a pending future leaves capacity untouched. Wrap in the caller's existing
-    /// cancellation/deadline select before acquiring any storage commit locks.
-    pub async fn acquire(self: &Arc<Self>) -> AdaptivePermit {
-        if let Some(permit) = self.try_acquire() {
-            return permit;
-        }
-        self.queued.fetch_add(1, Ordering::AcqRel);
-        let _queued = QueuedAdmission(self);
-        // Retain the successful permit inside its Result. No code can close
-        // this private semaphore, so acquisition cannot return an error.
-        let _turn = self.turn.acquire().await;
-        loop {
-            let notified = self.changed.notified();
-            tokio::pin!(notified);
-            // Register before checking capacity to avoid a lost release/resize.
-            notified.as_mut().enable();
-            if let Some(permit) = self.acquire_capacity() {
-                return permit;
-            }
-            notified.await;
-        }
-    }
-}
-
-impl Drop for AdaptivePermit {
-    fn drop(&mut self) {
-        if self.owner.slots[self.slot / 64].references[self.slot % 64].fetch_sub(1, Ordering::AcqRel) != 1 {
-            return;
-        }
-        // Publish the free slot before exposing another admission capacity.
-        self.owner.release_slot(self.slot);
-        self.owner.state.fetch_sub(1, Ordering::AcqRel);
-        self.owner.changed.notify_one();
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[tokio::test]
-    async fn node_progress_requires_explicit_completion_and_never_wraps() {
-        let node = NodeAdmission::new(NonZeroU16::new(2).expect("two slots"));
-        node.capacity.set_limit(2);
-        drop(node.acquire().await);
-        assert_eq!(node.completed(), Some(0), "cancellation is not progress");
-        node.acquire().await.complete();
-        assert_eq!(node.completed(), Some(1));
-        node.completed.store(u64::MAX - 1, Ordering::Release);
-        node.acquire().await.complete();
-        node.acquire().await.complete();
-        assert_eq!(node.completed(), None, "exhausted progress stays unknown");
-        assert_eq!(node.snapshot().active, 0);
-    }
-
-    #[tokio::test]
-    async fn cancelled_node_work_does_not_reserve_capacity_for_unrelated_native_tail() {
-        let node = NodeAdmission::new(NonZeroU16::new(1).expect("one slot"));
-        node.capacity.set_limit(1);
-        let physical = AdaptiveAdmission::new(NonZeroU16::new(1).expect("one disk unit"), 1);
-        let scheduling = node.acquire().await;
-        let native_tail = physical.acquire().await;
-        drop(scheduling);
-        assert_eq!(node.completed(), Some(0));
-        assert!(node.try_acquire().is_some(), "healthy resources can still be scheduled");
-        assert!(physical.try_acquire().is_none(), "the stalled disk remains charged");
-        drop(native_tail);
-        assert!(physical.try_acquire().is_some());
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn node_feedback_expires_without_revoking_held_work_or_fabricating_progress() {
-        let node = NodeAdmission::new(NonZeroU16::new(2).expect("two slots"));
-        let mut controller = FeedbackController::new();
-        let input = FeedbackObservation {
-            generation: 1,
-            max_concurrency: 2,
-            pressure: ResourcePressure::Stable,
-            completed_units: Some(99),
-        };
-        node.update(&mut controller, Some(input));
-        let held = node.acquire().await;
-        assert_eq!(node.completed(), Some(0));
-        tokio::time::advance(Duration::from_secs(4)).await;
-        assert_eq!(node.snapshot(), AdaptiveAdmissionSnapshot { limit: 0, active: 1 });
-        assert!(node.try_acquire().is_none());
-        held.complete();
-        assert_eq!(node.completed(), Some(1));
-        assert_eq!(node.snapshot().active, 0);
-    }
-
-    #[tokio::test]
-    async fn shared_unit_stays_admitted_until_native_worker_releases_its_last_clone() {
-        let gate = AdaptiveAdmission::new(NonZeroU16::new(1).expect("one unit"), 1);
-        let outer = gate.acquire().await;
-        let native = outer.clone();
-        let (started_tx, started_rx) = tokio::sync::oneshot::channel();
-        let (release_tx, release_rx) = tokio::sync::oneshot::channel();
-        let worker = tokio::task::spawn_blocking(move || {
-            started_tx.send(()).expect("worker started");
-            release_rx.blocking_recv().expect("release native worker");
-            drop(native);
-        });
-        started_rx.await.expect("native worker is live");
-        drop(outer);
-        assert_eq!(gate.snapshot().active, 1);
-        assert!(gate.try_acquire().is_none());
-        gate.set_limit(0);
-        assert_eq!(gate.snapshot().active, 1);
-        release_tx.send(()).expect("release tail");
-        worker.await.expect("native tail completed");
-        assert_eq!(gate.snapshot().active, 0);
-        gate.set_limit(1);
-        assert!(gate.try_acquire().is_some());
-    }
-
-    #[tokio::test]
-    async fn bounded_slots_cross_word_boundaries_and_recycle_only_after_final_drop() {
-        let maximum = NonZeroU16::new(65).expect("partial second chunk");
-        let gate = AdaptiveAdmission::new(maximum, u32::MAX);
-        assert_eq!(gate.snapshot().limit, 65);
-        for _ in 0..4 {
-            let units: Vec<_> = (0..65).map(|_| gate.try_acquire().expect("free slot")).collect();
-            let tails = units.clone();
-            assert_eq!(gate.snapshot().active, 65);
-            assert!(gate.try_acquire().is_none());
-            drop(units);
-            assert_eq!(gate.snapshot().active, 65);
-            gate.set_limit(0);
-            for (remaining, tail) in (0..65).rev().zip(tails) {
-                drop(tail);
-                assert_eq!(gate.snapshot().active, remaining);
-            }
-            gate.set_limit(u32::MAX);
-            assert_eq!(gate.snapshot().limit, 65);
-        }
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-    async fn shared_units_survive_concurrent_clone_drop_reuse_and_resize() {
-        let gate = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded owner"), 8);
-        let mut workers = Vec::new();
-        for _ in 0..16 {
-            let gate = gate.clone();
-            workers.push(tokio::spawn(async move {
-                for _ in 0..64 {
-                    let root = gate.acquire().await;
-                    let one = root.clone();
-                    let two = one.clone();
-                    drop(root);
-                    tokio::task::yield_now().await;
-                    drop(two);
-                    tokio::task::yield_now().await;
-                    drop(one);
-                }
-            }));
-        }
-        for limit in [0, 1, 8, 2, 0, 8] {
-            gate.set_limit(limit);
-            tokio::task::yield_now().await;
-        }
-        tokio::time::timeout(Duration::from_secs(5), async {
-            for worker in workers {
-                worker.await.expect("lease worker");
-            }
-        })
-        .await
-        .expect("all lease workers complete");
-        assert_eq!(gate.snapshot(), AdaptiveAdmissionSnapshot { limit: 8, active: 0 });
-        let full: Vec<_> = (0..8).map(|_| gate.try_acquire().expect("all slots returned")).collect();
-        assert!(gate.try_acquire().is_none());
-        drop(full);
-    }
-
-    #[tokio::test]
-    async fn queued_work_cannot_be_starved_by_new_fast_acquisitions() {
-        use std::task::{Context, Poll, Waker};
-        let gate = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded test owner"), 1);
-        let held = gate.acquire().await;
-        let mut first = Box::pin(gate.acquire());
-        let mut second = Box::pin(gate.acquire());
-        let mut context = Context::from_waker(Waker::noop());
-        assert!(first.as_mut().poll(&mut context).is_pending());
-        assert!(second.as_mut().poll(&mut context).is_pending());
-        drop(held);
-        assert!(gate.try_acquire().is_none(), "new work must not steal a parked worker's turn");
-        assert!(second.as_mut().poll(&mut context).is_pending(), "later work cannot pass the queue head");
-        let Poll::Ready(first_permit) = first.as_mut().poll(&mut context) else {
-            panic!("queue head must run")
-        };
-        drop(first_permit);
-        let Poll::Ready(second_permit) = second.as_mut().poll(&mut context) else {
-            panic!("second waiter must run")
-        };
-        drop(second_permit);
-        assert!(gate.try_acquire().is_some(), "drained queue restores the atomic fast path");
-    }
-
-    #[tokio::test]
-    async fn cancelling_queued_work_preserves_fifo_capacity_and_fast_path() {
-        use std::task::{Context, Poll, Waker};
-        let gate = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded test owner"), 0);
-        let mut head = Box::pin(gate.acquire());
-        let mut middle = Box::pin(gate.acquire());
-        let mut tail = Box::pin(gate.acquire());
-        let mut context = Context::from_waker(Waker::noop());
-        assert!(head.as_mut().poll(&mut context).is_pending());
-        assert!(middle.as_mut().poll(&mut context).is_pending());
-        assert!(tail.as_mut().poll(&mut context).is_pending());
-        drop(middle);
-        drop(head);
-        gate.set_limit(1);
-        assert!(
-            gate.try_acquire().is_none(),
-            "cancelled head must not expose the surviving waiter's capacity"
-        );
-        let Poll::Ready(permit) = tail.as_mut().poll(&mut context) else {
-            panic!("surviving waiter must run")
-        };
-        drop(permit);
-        assert!(gate.try_acquire().is_some());
-
-        gate.set_limit(0);
-        let mut cancelled = Box::pin(gate.acquire());
-        assert!(cancelled.as_mut().poll(&mut context).is_pending());
-        drop(cancelled);
-        gate.set_limit(1);
-        assert!(
-            gate.try_acquire().is_some(),
-            "cancelling the final waiter must not strand an admission turn"
-        );
-    }
-
-    #[tokio::test]
-    async fn cancelling_a_notified_head_hands_capacity_to_the_next_waiter() {
-        use std::task::{Context, Poll, Waker};
-        let gate = AdaptiveAdmission::new(NonZeroU16::new(2).expect("two units"), 0);
-        let mut head = Box::pin(gate.acquire());
-        let mut next = Box::pin(gate.acquire());
-        let mut context = Context::from_waker(Waker::noop());
-        assert!(head.as_mut().poll(&mut context).is_pending());
-        assert!(next.as_mut().poll(&mut context).is_pending());
-        gate.set_limit(1);
-        // Cancel after notification, before the head consumes its capacity.
-        drop(head);
-        let Poll::Ready(permit) = next.as_mut().poll(&mut context) else {
-            panic!("successor must observe capacity without another notification")
-        };
-        assert_eq!(gate.snapshot(), AdaptiveAdmissionSnapshot { limit: 1, active: 1 });
-        drop(permit);
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn one_resize_serves_multiple_fifo_turns_but_stored_wakes_cannot_bypass_expiry() {
-        use std::task::{Context, Poll, Waker};
-        let gate = AdaptiveAdmission::new(NonZeroU16::new(2).expect("two units"), 0);
-        let mut first = Box::pin(gate.acquire());
-        let mut second = Box::pin(gate.acquire());
-        let mut context = Context::from_waker(Waker::noop());
-        assert!(first.as_mut().poll(&mut context).is_pending());
-        assert!(second.as_mut().poll(&mut context).is_pending());
-        gate.set_sampled_limit(2, Duration::from_secs(1));
-        let Poll::Ready(one) = first.as_mut().poll(&mut context) else {
-            panic!("first turn must observe resize")
-        };
-        let Poll::Ready(two) = second.as_mut().poll(&mut context) else {
-            panic!("second turn must observe resize without releasing the first unit")
-        };
-        tokio::time::advance(Duration::from_secs(1)).await;
-        drop(one);
-        drop(two);
-        let mut expired = Box::pin(gate.acquire());
-        assert!(expired.as_mut().poll(&mut context).is_pending(), "stored wake is not a fresh lease");
-        gate.set_sampled_limit(1, Duration::from_secs(1));
-        let Poll::Ready(renewed) = expired.as_mut().poll(&mut context) else {
-            panic!("fresh observation must wake expired admission")
-        };
-        drop(renewed);
-        assert_eq!(gate.snapshot().active, 0);
-    }
-    use std::future::Future;
-    use std::task::Poll;
-
-    #[tokio::test]
-    async fn shrink_preserves_all_held_units_and_blocks_until_below_new_limit() {
-        let owner = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded test owner"), 3);
-        let first = owner.acquire().await;
-        let second = owner.acquire().await;
-        let third = owner.acquire().await;
-        owner.set_limit(1);
-        assert_eq!(owner.snapshot(), AdaptiveAdmissionSnapshot { limit: 1, active: 3 });
-        drop(first);
-        assert!(owner.try_acquire().is_none());
-        drop(second);
-        assert!(owner.try_acquire().is_none());
-        drop(third);
-        let fourth = owner.try_acquire().expect("last old permit returned to original owner");
-        assert_eq!(owner.snapshot(), AdaptiveAdmissionSnapshot { limit: 1, active: 1 });
-        drop(fourth);
-        assert_eq!(owner.snapshot().active, 0);
-    }
-
-    #[tokio::test]
-    async fn zero_capacity_and_cancelled_waiter_do_not_leak_or_bypass() {
-        let owner = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded test owner"), 0);
-        let mut waiting = Box::pin(owner.acquire());
-        std::future::poll_fn(|cx| {
-            assert!(waiting.as_mut().poll(cx).is_pending());
-            Poll::Ready(())
-        })
-        .await;
-        drop(waiting);
-        assert_eq!(owner.snapshot(), AdaptiveAdmissionSnapshot { limit: 0, active: 0 });
-        assert!(owner.try_acquire().is_none());
-        owner.set_limit(1);
-        let permit = owner.acquire().await;
-        assert!(owner.try_acquire().is_none());
-        drop(permit);
-        assert_eq!(owner.snapshot().active, 0);
-    }
-
-    #[tokio::test]
-    async fn resize_wakes_a_registered_waiter_without_an_unrelated_release() {
-        let owner = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded test owner"), 0);
-        let mut waiting = Box::pin(owner.acquire());
-        std::future::poll_fn(|cx| {
-            assert!(waiting.as_mut().poll(cx).is_pending());
-            Poll::Ready(())
-        })
-        .await;
-        owner.set_limit(1);
-        let permit = tokio::time::timeout(std::time::Duration::from_secs(1), waiting)
-            .await
-            .expect("resize notification");
-        assert_eq!(owner.snapshot().active, 1);
-        drop(permit);
-    }
-
-    #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-    async fn concurrent_resize_release_and_acquire_keep_the_owner_count_exact() {
-        let owner = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded test owner"), 8);
-        let mut tasks = Vec::new();
-        for _ in 0..16 {
-            let owner = owner.clone();
-            tasks.push(tokio::spawn(async move {
-                for _ in 0..100 {
-                    let permit = owner.acquire().await;
-                    tokio::task::yield_now().await;
-                    drop(permit);
-                }
-            }));
-        }
-        for limit in [1, 0, 4, 2, 8, 0, u32::MAX, 1] {
-            owner.set_limit(limit);
-            tokio::task::yield_now().await;
-        }
-        owner.set_limit(8);
-        tokio::time::timeout(std::time::Duration::from_secs(5), async {
-            for task in tasks {
-                task.await.expect("admission task");
-            }
-        })
-        .await
-        .expect("all waiters make progress");
-        assert_eq!(owner.snapshot(), AdaptiveAdmissionSnapshot { limit: 8, active: 0 });
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn expired_observation_blocks_new_work_without_revoking_held_permits() {
-        let owner = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded test owner"), 0);
-        owner.set_sampled_limit(2, Duration::from_secs(2));
-        let held = owner.acquire().await;
-        tokio::time::advance(Duration::from_secs(2)).await;
-        assert!(owner.try_acquire().is_none());
-        assert_eq!(owner.snapshot(), AdaptiveAdmissionSnapshot { limit: 0, active: 1 });
-        drop(held);
-        assert_eq!(owner.snapshot().active, 0);
-        owner.set_sampled_limit(1, Duration::from_secs(2));
-        let fresh = owner.try_acquire().expect("fresh observation reopens same owner");
-        owner.set_sampled_limit(8, Duration::ZERO);
-        assert!(owner.try_acquire().is_none());
-        drop(fresh);
-        assert_eq!(owner.snapshot().active, 0);
-    }
-
-    fn healthy(completed: u64) -> FeedbackObservation {
-        FeedbackObservation {
-            generation: 1,
-            max_concurrency: 8,
-            pressure: ResourcePressure::Stable,
-            completed_units: Some(completed),
-        }
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn controller_grows_one_unit_per_cooldown_and_cuts_pressure_immediately() {
-        let gate = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded test owner"), 0);
-        let mut controller = FeedbackController::new();
-        assert_eq!(controller.update(&gate, Some(healthy(0))).limit, 1);
-        for completed in 1..=25 {
-            tokio::time::advance(Duration::from_secs(1)).await;
-            let limit = controller.update(&gate, Some(healthy(completed))).limit;
-            assert_eq!(
-                limit,
-                if completed < 9 {
-                    1
-                } else if completed < 17 {
-                    2
-                } else if completed < 25 {
-                    3
-                } else {
-                    4
-                }
-            );
-        }
-        let held = gate.try_acquire().expect("existing work");
-        let mut pressure = healthy(26);
-        pressure.pressure = ResourcePressure::Busy;
-        assert_eq!(
-            controller.update(&gate, Some(pressure)),
-            FeedbackDecision {
-                limit: 2,
-                reason: FeedbackReason::Pressure
-            }
-        );
-        pressure.max_concurrency = 0;
-        assert_eq!(controller.update(&gate, Some(pressure)).limit, 0);
-        assert_eq!(gate.snapshot().active, 1);
-        assert!(gate.try_acquire().is_none());
-        drop(held);
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn controller_missing_low_sample_stalled_or_changed_sources_never_expand() {
-        for kind in 0..5 {
-            let gate = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded test owner"), 0);
-            let mut controller = FeedbackController::new();
-            for tick in 0..32 {
-                let mut observation = healthy(tick);
-                match kind {
-                    0 => observation.pressure = ResourcePressure::Unknown,
-                    1 => observation.completed_units = None,
-                    2 => observation.completed_units = Some(0),
-                    3 => observation.generation = tick,
-                    _ => {}
-                }
-                tokio::time::advance(Duration::from_secs(if kind == 4 { 3 } else { 1 })).await;
-                assert!(controller.update(&gate, Some(observation)).limit <= 1, "kind {kind}");
-            }
-            assert_eq!(
-                controller.update(&gate, None),
-                FeedbackDecision {
-                    limit: 0,
-                    reason: FeedbackReason::Unavailable
-                }
-            );
-            assert!(gate.try_acquire().is_none());
-        }
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn controller_resumes_after_zero_cap_without_requiring_impossible_progress() {
-        let gate = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded test owner"), 0);
-        let mut controller = FeedbackController::new();
-        let mut sample = healthy(0);
-        sample.max_concurrency = 0;
-        assert_eq!(controller.update(&gate, Some(sample)).limit, 0);
-        tokio::time::advance(Duration::from_secs(1)).await;
-        sample.max_concurrency = 8;
-        assert_eq!(controller.update(&gate, Some(sample)).limit, 1);
-        assert!(gate.try_acquire().is_some(), "minimum progress restarts inside the restored cap");
-    }
-
-    #[tokio::test(start_paused = true)]
-    async fn controller_applies_pressure_reduction_and_lower_cap_in_the_same_window() {
-        let gate = AdaptiveAdmission::new(NonZeroU16::new(8).expect("bounded test owner"), 0);
-        let mut controller = FeedbackController::new();
-        for completed in 0..=25 {
-            controller.update(&gate, Some(healthy(completed)));
-            tokio::time::advance(Duration::from_secs(1)).await;
-        }
-        assert_eq!(gate.snapshot().limit, 4);
-        let mut sample = healthy(26);
-        sample.max_concurrency = 3;
-        sample.pressure = ResourcePressure::Busy;
-        assert_eq!(controller.update(&gate, Some(sample)).limit, 2);
-    }
-}

crates/concurrency/src/foreground.rs

@@ -1,568 +0,0 @@
-// Copyright 2026 RustFS Team
-// Licensed under the Apache License, Version 2.0.
-
-//! Bounded foreground completion windows for background resource feedback.
-//! Recording uses fixed atomic storage, without an allocation, mutex or task
-//! per request. A single reader rotates banks and waits for the retired bank's
-//! writers before reading it. Delayed writers delay publication, not the
-//! recorded window boundary. Percentiles are intervals, never exact values.
-
-use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering};
-use std::time::{Duration, Instant};
-
-const SUB_BUCKETS: usize = 64;
-const FINITE_BUCKETS: usize = 27 * SUB_BUCKETS;
-const BUCKETS: usize = FINITE_BUCKETS + 1;
-const MAX_MICROS: u64 = u32::MAX as u64;
-
-/// Bounded foreground categories; no bucket, object or request identifiers.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum ForegroundClass {
-    /// Object body reads.
-    Read,
-    /// Object writes, including multipart and copy operations.
-    Write,
-    /// Metadata and listing operations.
-    Metadata,
-    /// Other operations, including rejection before typed dispatch.
-    Other,
-}
-
-impl ForegroundClass {
-    /// Stable order shared by window summaries.
-    pub const ALL: [Self; 4] = [Self::Read, Self::Write, Self::Metadata, Self::Other];
-
-    /// Fixed metric label.
-    pub const fn as_str(self) -> &'static str {
-        match self {
-            Self::Read => "read",
-            Self::Write => "write",
-            Self::Metadata => "metadata",
-            Self::Other => "other",
-        }
-    }
-
-    const fn index(self) -> usize {
-        match self {
-            Self::Read => 0,
-            Self::Write => 1,
-            Self::Metadata => 2,
-            Self::Other => 3,
-        }
-    }
-}
-
-/// Outcome at the observed response-body boundary, not a client ACK.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum CompletionOutcome {
-    /// Successful response body completed.
-    Success,
-    /// Error response, service error, or body-stream failure.
-    Failed,
-    /// The request/body was dropped before completion.
-    Cancelled,
-}
-
-/// Inclusive bounds containing the observed percentile.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct LatencyBounds {
-    /// Inclusive lower bound in nanoseconds.
-    pub lower_nanos: u64,
-    /// Inclusive upper bound; absent for the overflow bucket.
-    pub upper_nanos: Option<u64>,
-}
-
-/// One class in a complete observation window.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub struct ClassCompletions {
-    /// All finishes, including errors and cancellation.
-    pub finished: u64,
-    /// Error responses, service errors and body-stream failures.
-    pub failed: u64,
-    /// Censored observations; these must not be treated as successful latency.
-    pub cancelled: u64,
-    /// P99 of non-cancelled finishes, when at least 100 samples exist.
-    /// This count permits computing the rank; it is not statistical confidence.
-    pub p99: Option<LatencyBounds>,
-}
-
-/// Clock readings bracketing an atomic event-window cut. A scheduler pause
-/// between these readings is visible, rather than disguised as precise timing.
-#[derive(Clone, Copy, Debug)]
-pub struct WindowBoundary {
-    /// Read immediately before the event cut.
-    pub earliest: Instant,
-    /// Read immediately after the event cut.
-    pub latest: Instant,
-}
-
-/// Complete windows retain their actual cut brackets, even if publication waits.
-#[derive(Clone, Copy, Debug)]
-pub struct ForegroundWindow {
-    /// Start of this event window.
-    pub start: WindowBoundary,
-    /// Cut of the retired bank, possibly older than publication time.
-    pub end: WindowBoundary,
-    /// Request starts in this window, including pre-dispatch rejection.
-    pub started: Option<u64>,
-    /// Requests still alive at the cut; absent after accounting overflow.
-    pub in_flight: Option<u64>,
-    /// Per-class completions in ForegroundClass::ALL order.
-    pub classes: [Option<ClassCompletions>; 4],
-    /// False after a counter overflow or an inconsistent event count.
-    pub valid: bool,
-}
-
-struct ClassBank {
-    latencies: [AtomicU64; BUCKETS],
-    failed: AtomicU64,
-    cancelled: AtomicU64,
-}
-
-impl ClassBank {
-    fn new() -> Self {
-        Self {
-            latencies: std::array::from_fn(|_| AtomicU64::new(0)),
-            failed: AtomicU64::new(0),
-            cancelled: AtomicU64::new(0),
-        }
-    }
-}
-
-struct Bank {
-    writers: AtomicUsize,
-    started: AtomicU64,
-    overflowed: AtomicBool,
-    classes: [ClassBank; 4],
-}
-
-impl Bank {
-    fn new() -> Self {
-        Self {
-            writers: AtomicUsize::new(0),
-            started: AtomicU64::new(0),
-            overflowed: AtomicBool::new(false),
-            classes: std::array::from_fn(|_| ClassBank::new()),
-        }
-    }
-
-    fn increment(&self, counter: &AtomicU64) {
-        if counter.fetch_add(1, Ordering::Relaxed) == u64::MAX {
-            self.overflowed.store(true, Ordering::Relaxed);
-        }
-    }
-}
-
-struct Writer<'a>(&'a Bank);
-
-impl Drop for Writer<'_> {
-    fn drop(&mut self) {
-        self.0.writers.fetch_sub(1, Ordering::SeqCst);
-    }
-}
-
-/// One process-wide recorder. Its fixed storage is allocated with the owner.
-/// A request holds only a reference, timestamps and bounded enum state.
-pub struct ForegroundRecorder {
-    created_at: Instant,
-    epoch: AtomicU64,
-    reader_taken: AtomicBool,
-    banks: [Bank; 2],
-}
-
-impl Default for ForegroundRecorder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ForegroundRecorder {
-    /// Construct empty accounting for one lifetime of the owning process.
-    pub fn new() -> Self {
-        Self {
-            created_at: Instant::now(),
-            epoch: AtomicU64::new(0),
-            reader_taken: AtomicBool::new(false),
-            banks: std::array::from_fn(|_| Bank::new()),
-        }
-    }
-
-    fn writer(&self) -> Writer<'_> {
-        loop {
-            let epoch = self.epoch.load(Ordering::SeqCst);
-            let bank = &self.banks[usize::from(epoch & 1 != 0)];
-            bank.writers.fetch_add(1, Ordering::SeqCst);
-            let writer = Writer(bank);
-            // Sequential ordering joins registration, the reader's cut, and
-            // its zero-writer check. A late old-epoch registrant cannot write
-            // into a bank that the reader has begun draining or reusing.
-            if self.epoch.load(Ordering::SeqCst) == epoch {
-                return writer;
-            }
-        }
-    }
-
-    /// Begin at the external service-call boundary. Drop records cancellation
-    /// unless finish has already recorded a response-body outcome.
-    pub fn start(&self) -> ForegroundObservation<'_> {
-        let started_at = Instant::now();
-        let writer = self.writer();
-        writer.0.increment(&writer.0.started);
-        ForegroundObservation {
-            recorder: self,
-            started_at: Some(started_at),
-            class: ForegroundClass::Other,
-        }
-    }
-
-    fn finish(&self, class: ForegroundClass, elapsed: Duration, outcome: CompletionOutcome) {
-        let writer = self.writer();
-        let bank = writer.0;
-        let class = &bank.classes[class.index()];
-        if outcome == CompletionOutcome::Cancelled {
-            bank.increment(&class.cancelled);
-            return;
-        }
-        let bucket = latency_bucket(elapsed);
-        bank.increment(&class.latencies[bucket]);
-        if outcome == CompletionOutcome::Failed {
-            bank.increment(&class.failed);
-        }
-    }
-
-    /// Claim the sole reader. It cannot be replaced after being dropped:
-    /// resetting its carried in-flight count would falsify later windows.
-    pub fn take_reader(&self) -> Option<ForegroundReader<'_>> {
-        self.reader_taken
-            .compare_exchange(false, true, Ordering::AcqRel, Ordering::Acquire)
-            .ok()?;
-        Some(ForegroundReader {
-            recorder: self,
-            start: WindowBoundary {
-                earliest: self.created_at,
-                latest: self.created_at,
-            },
-            retired: None,
-            in_flight: Some(0),
-        })
-    }
-}
-
-/// Non-cloneable request ownership, moved from the service future to its body.
-pub struct ForegroundObservation<'a> {
-    recorder: &'a ForegroundRecorder,
-    started_at: Option<Instant>,
-    class: ForegroundClass,
-}
-
-impl ForegroundObservation<'_> {
-    /// Set the first dispatched operation's bounded category.
-    pub fn set_class(&mut self, class: ForegroundClass) {
-        self.class = class;
-    }
-
-    /// Finish once. Later calls or Drop do not produce another observation.
-    pub fn finish(&mut self, outcome: CompletionOutcome) {
-        if let Some(started_at) = self.started_at.take() {
-            self.recorder.finish(self.class, started_at.elapsed(), outcome);
-        }
-    }
-}
-
-impl Drop for ForegroundObservation<'_> {
-    fn drop(&mut self) {
-        self.finish(CompletionOutcome::Cancelled);
-    }
-}
-
-/// Single-reader state; never acquired by a request path.
-pub struct ForegroundReader<'a> {
-    recorder: &'a ForegroundRecorder,
-    start: WindowBoundary,
-    retired: Option<(usize, WindowBoundary)>,
-    in_flight: Option<u64>,
-}
-
-impl ForegroundReader<'_> {
-    /// Cut a new window, or finish publishing an earlier cut. A live retired
-    /// writer returns None without blocking, discarding data or moving its cut.
-    pub fn sample(&mut self) -> Option<ForegroundWindow> {
-        if self.retired.is_none() {
-            let epoch = self.recorder.epoch.load(Ordering::SeqCst);
-            let next = epoch.checked_add(1)?;
-            let earliest = Instant::now();
-            self.recorder.epoch.store(next, Ordering::SeqCst);
-            let cut = WindowBoundary {
-                earliest,
-                latest: Instant::now(),
-            };
-            self.retired = Some((usize::from(epoch & 1 != 0), cut));
-        }
-        let (index, end) = self.retired?;
-        let bank = &self.recorder.banks[index];
-        if bank.writers.load(Ordering::SeqCst) != 0 {
-            return None;
-        }
-
-        let started = bank.started.swap(0, Ordering::Relaxed);
-        let overflowed = bank.overflowed.swap(false, Ordering::Relaxed);
-        let classes = std::array::from_fn(|index| {
-            let class = &bank.classes[index];
-            let failed = class.failed.swap(0, Ordering::Relaxed);
-            let cancelled = class.cancelled.swap(0, Ordering::Relaxed);
-            let buckets = std::array::from_fn::<_, BUCKETS, _>(|i| class.latencies[i].swap(0, Ordering::Relaxed));
-            let non_cancelled = buckets.iter().try_fold(0_u64, |sum, count| sum.checked_add(*count));
-            let finished = non_cancelled.and_then(|total| total.checked_add(cancelled));
-            let finished = finished.filter(|_| !overflowed && non_cancelled.is_some_and(|total| failed <= total))?;
-            Some(ClassCompletions {
-                finished,
-                failed,
-                cancelled,
-                p99: non_cancelled
-                    .filter(|total| *total >= 100)
-                    .and_then(|total| percentile_99(&buckets, total)),
-            })
-        });
-        let started = (!overflowed).then_some(started);
-        let finished = classes
-            .iter()
-            .try_fold(0_u64, |sum, class| sum.checked_add(class.as_ref()?.finished));
-        self.in_flight = self
-            .in_flight
-            .zip(finished)
-            .and_then(|(active, finished)| active.checked_add(started?)?.checked_sub(finished));
-        let window = ForegroundWindow {
-            start: self.start,
-            end,
-            started,
-            in_flight: self.in_flight,
-            classes,
-            valid: self.in_flight.is_some(),
-        };
-        self.start = end;
-        self.retired = None;
-        Some(window)
-    }
-}
-
-fn latency_bucket(elapsed: Duration) -> usize {
-    let micros = elapsed.as_nanos().div_ceil(1_000);
-    let Ok(micros) = u64::try_from(micros) else {
-        return FINITE_BUCKETS;
-    };
-    if micros > MAX_MICROS {
-        return FINITE_BUCKETS;
-    }
-    if micros < SUB_BUCKETS as u64 {
-        return usize::try_from(micros).unwrap_or(FINITE_BUCKETS);
-    }
-    let shift = 63 - micros.leading_zeros() - 6;
-    usize::try_from((u64::from(shift) + 1) * SUB_BUCKETS as u64 + (micros >> shift) - SUB_BUCKETS as u64)
-        .unwrap_or(FINITE_BUCKETS)
-}
-
-fn bucket_bounds(index: usize) -> LatencyBounds {
-    if index == FINITE_BUCKETS {
-        return LatencyBounds {
-            lower_nanos: MAX_MICROS * 1_000 + 1,
-            upper_nanos: None,
-        };
-    }
-    let (lower, upper) = if index < SUB_BUCKETS {
-        (index as u64, index as u64)
-    } else {
-        let shift = index / SUB_BUCKETS - 1;
-        let lower = (SUB_BUCKETS + index % SUB_BUCKETS) as u64 * (1_u64 << shift);
-        (lower, lower + (1_u64 << shift) - 1)
-    };
-    LatencyBounds {
-        lower_nanos: lower.saturating_sub(1) * 1_000 + u64::from(lower != 0),
-        upper_nanos: Some(upper * 1_000),
-    }
-}
-
-fn percentile_99(buckets: &[u64; BUCKETS], total: u64) -> Option<LatencyBounds> {
-    let rank = (u128::from(total) * 99).div_ceil(100);
-    let mut cumulative = 0_u128;
-    for (index, count) in buckets.iter().enumerate() {
-        cumulative += u128::from(*count);
-        if cumulative >= rank {
-            return Some(bucket_bounds(index));
-        }
-    }
-    None
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::sync::Arc;
-
-    #[test]
-    fn percentile_intervals_contain_each_bucket_edge_and_neighbour() {
-        for index in 0..BUCKETS {
-            let bounds = bucket_bounds(index);
-            assert_eq!(latency_bucket(Duration::from_nanos(bounds.lower_nanos)), index);
-            if let Some(upper) = bounds.upper_nanos {
-                assert!(upper >= bounds.lower_nanos);
-                assert_eq!(latency_bucket(Duration::from_nanos(upper)), index);
-                assert_eq!(latency_bucket(Duration::from_nanos(upper + 1)), index + 1);
-            }
-        }
-        assert_eq!(latency_bucket(Duration::MAX), FINITE_BUCKETS);
-    }
-
-    #[test]
-    fn body_ownership_carries_in_flight_counts_across_windows() {
-        let recorder = ForegroundRecorder::new();
-        let mut reader = recorder.take_reader().expect("first reader");
-        let mut request = recorder.start();
-        request.set_class(ForegroundClass::Read);
-        let first = reader.sample().expect("cut with a live request");
-        assert!(first.valid);
-        assert_eq!(first.started, Some(1));
-        assert_eq!(first.in_flight, Some(1));
-        assert_eq!(first.classes[0].expect("valid read count").finished, 0);
-
-        request.finish(CompletionOutcome::Success);
-        request.finish(CompletionOutcome::Failed);
-        drop(request);
-        let second = reader.sample().expect("body finished");
-        assert!(second.valid);
-        assert_eq!(second.started, Some(0));
-        assert_eq!(second.in_flight, Some(0));
-        let read = second.classes[0].expect("valid read summary");
-        assert_eq!((read.finished, read.failed, read.cancelled, read.p99), (1, 0, 0, None));
-        assert_eq!(first.end.earliest, second.start.earliest);
-        assert_eq!(first.end.latest, second.start.latest);
-    }
-
-    #[test]
-    fn cancellations_are_counted_without_fabricating_success_latencies() {
-        let recorder = ForegroundRecorder::new();
-        let mut reader = recorder.take_reader().expect("first reader");
-        for _ in 0..150 {
-            let mut request = recorder.start();
-            request.set_class(ForegroundClass::Write);
-        }
-        let window = reader.sample().expect("cancelled requests");
-        let write = window.classes[1].expect("known write count");
-        assert!(window.valid);
-        assert_eq!(window.in_flight, Some(0));
-        assert_eq!((write.finished, write.cancelled, write.failed, write.p99), (150, 150, 0, None));
-    }
-
-    #[test]
-    fn delayed_retired_writer_preserves_the_original_cut_and_next_bank() {
-        let recorder = ForegroundRecorder::new();
-        let mut reader = recorder.take_reader().expect("first reader");
-        let writer = recorder.writer();
-        assert!(reader.sample().is_none(), "never read a live writer's bank");
-        let original_cut = reader.retired.expect("pending cut").1;
-        let request = recorder.start(); // a start after the cut belongs to the new bank
-        writer.0.increment(&writer.0.started);
-        drop(writer);
-        let previous = reader.sample().expect("retired writer drained");
-        assert_eq!(previous.end.earliest, original_cut.earliest);
-        assert_eq!(previous.end.latest, original_cut.latest);
-        assert_eq!(previous.started, Some(1));
-        assert_eq!(previous.in_flight, Some(1));
-        drop(request);
-        let current = reader.sample().expect("next bank");
-        assert_eq!(current.started, Some(1));
-        assert_eq!(current.in_flight, Some(1));
-        assert_eq!(current.classes[3].expect("unclassified cancellation").cancelled, 1);
-    }
-
-    #[test]
-    fn completed_percentile_uses_rank_and_never_turns_maximum_into_p99() {
-        let recorder = ForegroundRecorder::new();
-        let mut reader = recorder.take_reader().expect("first reader");
-        for i in 0..100 {
-            let writer = recorder.writer();
-            writer.0.increment(&writer.0.started);
-            drop(writer);
-            recorder.finish(
-                ForegroundClass::Read,
-                if i == 99 {
-                    Duration::from_secs(60)
-                } else {
-                    Duration::from_millis(2)
-                },
-                if i == 99 {
-                    CompletionOutcome::Failed
-                } else {
-                    CompletionOutcome::Success
-                },
-            );
-        }
-        let window = reader.sample().expect("complete window");
-        let read = window.classes[0].expect("read summary");
-        assert_eq!((read.finished, read.failed, read.cancelled), (100, 1, 0));
-        let p99 = read.p99.expect("100 non-cancelled samples");
-        assert!(p99.lower_nanos <= 2_000_000);
-        assert!(p99.upper_nanos.is_some_and(|upper| (2_000_000..3_000_000).contains(&upper)));
-    }
-
-    #[test]
-    fn overflow_stays_unknown_and_reader_cannot_reset_event_accounting() {
-        let recorder = ForegroundRecorder::new();
-        {
-            let mut reader = recorder.take_reader().expect("first reader");
-            recorder.banks[0].started.store(u64::MAX, Ordering::Relaxed);
-            drop(recorder.start());
-            let invalid = reader.sample().expect("overflow window");
-            assert!(!invalid.valid);
-            assert_eq!(invalid.started, None);
-            assert_eq!(invalid.in_flight, None);
-            assert_eq!(invalid.classes, [None; 4]);
-            let later = reader.sample().expect("later empty window");
-            assert!(!later.valid, "a lost carried count cannot recover by inventing zero active work");
-        }
-        assert!(recorder.take_reader().is_none(), "reader replacement would lose live request ownership");
-    }
-
-    #[test]
-    fn concurrent_rotation_preserves_every_start_finish_and_cancellation() {
-        let recorder = Arc::new(ForegroundRecorder::new());
-        let mut reader = recorder.take_reader().expect("first reader");
-        let workers: Vec<_> = (0..4)
-            .map(|_| {
-                let recorder = Arc::clone(&recorder);
-                std::thread::spawn(move || {
-                    for index in 0..10_000 {
-                        let mut request = recorder.start();
-                        request.set_class(ForegroundClass::Read);
-                        if index % 10 != 0 {
-                            request.finish(CompletionOutcome::Success);
-                        }
-                    }
-                })
-            })
-            .collect();
-        let (mut started, mut finished, mut cancelled) = (0, 0, 0);
-        let mut add_window = |window: ForegroundWindow| {
-            assert!(window.valid, "concurrent event cuts must stay balanced");
-            started += window.started.expect("valid start count");
-            let reads = window.classes[0].expect("valid read count");
-            finished += reads.finished;
-            cancelled += reads.cancelled;
-        };
-        while workers.iter().any(|worker| !worker.is_finished()) {
-            if let Some(window) = reader.sample() {
-                add_window(window);
-            }
-            std::thread::yield_now();
-        }
-        for worker in workers {
-            worker.join().expect("writer must finish");
-        }
-        add_window(reader.sample().expect("drain after writers join"));
-        // A previously retired window may have been published by the last
-        // sample; cut once more to include the current, still open bank.
-        let final_window = reader.sample().expect("final open bank");
-        assert_eq!(final_window.in_flight, Some(0));
-        add_window(final_window);
-        assert_eq!((started, finished, cancelled), (40_000, 40_000, 4_000));
-    }
-}

crates/concurrency/src/lib.rs

@@ -36,10 +36,8 @@
 // Re-exported io-core type used by downstream timeout implementations.
 pub use rustfs_io_core::OperationProgress;
 
-pub mod adaptive;
 mod backpressure;
 mod deadlock;
-pub mod foreground;
 mod queue;
 pub mod workers;
 pub mod workload;

crates/concurrency/src/workers.rs

@@ -49,28 +49,12 @@ impl Workers {
 
     /// Acquire a worker slot, waiting until one becomes available.
     pub async fn take(&self) {
-        struct AcquireCancelGuard<'a> {
-            workers: &'a Workers,
-            completed: bool,
-        }
-        impl Drop for AcquireCancelGuard<'_> {
-            fn drop(&mut self) {
-                if !self.completed {
-                    self.workers.in_use.send_modify(|_| {});
-                }
-            }
-        }
-        let mut guard = AcquireCancelGuard {
-            workers: self,
-            completed: false,
-        };
         let permit = match self.semaphore.acquire().await {
             Ok(permit) => permit,
             // The semaphore is owned by `self` and never closed.
             Err(_) => unreachable!("worker semaphore is never closed"),
         };
         permit.forget(); // returned manually via give()
-        guard.completed = true;
         self.in_use.send_modify(|held| *held += 1);
         trace!(
             event = "worker_slot.acquire",
@@ -98,7 +82,6 @@ impl Workers {
         });
         if released {
             self.semaphore.add_permits(1);
-            self.in_use.send_modify(|_| {});
         }
         trace!(
             event = "worker_slot.release",
@@ -116,9 +99,7 @@ impl Workers {
     pub async fn wait(&self) {
         let mut rx = self.in_use.subscribe();
         // The sender is owned by `self`, so it outlives this borrow.
-        let _ = rx
-            .wait_for(|&held| held == 0 && self.semaphore.available_permits() == self.limit)
-            .await;
+        let _ = rx.wait_for(|&held| held == 0).await;
         debug!(
             event = "worker_slot.wait",
             component = "concurrency",
@@ -133,9 +114,7 @@ impl Workers {
 
     /// Return the current number of available worker slots.
     pub async fn available(&self) -> usize {
-        self.limit
-            .saturating_sub(*self.in_use.borrow())
-            .min(self.semaphore.available_permits())
+        self.limit.saturating_sub(*self.in_use.borrow())
     }
 }
 
@@ -238,36 +217,4 @@ mod tests {
         }
         assert_eq!(workers.available().await, 0);
     }
-
-    #[tokio::test]
-    async fn test_wait_does_not_complete_while_permit_is_in_transit_to_queued_taker() {
-        use std::future::Future;
-        use std::pin::pin;
-        use std::task::{Context, Poll, Waker};
-
-        let workers = Workers::new(1).unwrap();
-        workers.take().await;
-
-        let mut taker = pin!(workers.take());
-        let mut cx = Context::from_waker(Waker::noop());
-        assert!(matches!(taker.as_mut().poll(&mut cx), Poll::Pending));
-
-        let mut waiter = pin!(workers.wait());
-        assert!(matches!(waiter.as_mut().poll(&mut cx), Poll::Pending));
-
-        // Hand off the slot to the queued taker before `taker` is polled again.
-        workers.give().await;
-        assert_eq!(workers.available().await, 0);
-        assert!(
-            matches!(waiter.as_mut().poll(&mut cx), Poll::Pending),
-            "wait() must not complete while a permit is in transit to a woken taker"
-        );
-
-        assert!(matches!(taker.as_mut().poll(&mut cx), Poll::Ready(())));
-        assert!(matches!(waiter.as_mut().poll(&mut cx), Poll::Pending));
-
-        workers.give().await;
-        assert!(matches!(waiter.as_mut().poll(&mut cx), Poll::Ready(())));
-        assert_eq!(workers.available().await, 1);
-    }
 }

crates/config/README.md

@@ -116,7 +116,6 @@ when restoring `/rustfs/console` for a custom OEM build.
 - `RUSTFS_DATA_SCANNER_START_DELAY_SECS` (deprecated alias for compatibility)
 - `RUSTFS_SCANNER_IDLE_MODE` (canonical)
 - `RUSTFS_SCANNER_CACHE_SAVE_TIMEOUT_SECS` (canonical)
-- `RUSTFS_SCANNER_RECOVERY_BACKOFF_CAP_SECS` (canonical)
 - `RUSTFS_SCANNER_CYCLE_MAX_DURATION_SECS` (canonical)
 - `RUSTFS_SCANNER_CYCLE_MAX_OBJECTS` (canonical)
 - `RUSTFS_SCANNER_CYCLE_MAX_DIRECTORIES` (canonical)
@@ -128,12 +127,6 @@ Scanner cycle budget controls:
 
 - When `RUSTFS_SCANNER_CYCLE_MAX_DURATION_SECS` is unset, the finite default is 1800 seconds (30 minutes), matching the scanner benchmark guidance.
 - An explicit `0` preserves the compatibility behavior of an unbounded runtime budget. Object and directory budgets likewise remain unbounded when explicitly set to `0`.
-
-Scanner recovery retry controls:
-
-- `RUSTFS_SCANNER_RECOVERY_BACKOFF_CAP_SECS` caps the wait between automatic startup recovery retries. The persistent admin key is `scanner.recovery_backoff_cap`; the environment takes precedence over the persistent value, and the unset default remains 600 seconds (10 minutes). Values must be positive integer seconds within the platform timer range; `0`, malformed values, and overflow are rejected. A valid environment override does not hide an invalid persistent value from `admin config set` validation.
-- The cap bounds the existing exponential retry schedule. Updating the persistent value applies to the next computed retry; it does not reschedule a wait already in progress. Retryable observations continue retrying after the short retry budget. Admin scanner status reports the effective value and source at `runtime_config.recovery_backoff_cap_seconds`.
-
 Scanner walker controls:
 
 - `RUSTFS_SCANNER_WALKERS_PER_DISK` sets how many bucket walkers each local disk of an erasure set runs; the default `1` walks one bucket per disk at a time, which is the right value for rotational media. On flash, `2` to `4` lets one disk walk several buckets concurrently, which matters most for single-disk deployments with many buckets, where the walk is otherwise fully serial. Values outside `1` through `16` are rejected by `admin config set`; an out-of-range or non-numeric environment value is logged as a scanner runtime config error (`state = "startup_apply_failed"`) and the scanner keeps the default. The walkers of one disk share that disk's scanner admission, so peers still see one scan session per physical disk, and `RUSTFS_SCANNER_MAX_CONCURRENT_DISK_SCANS` still caps the total.

crates/config/src/constants/heal.rs

@@ -197,10 +197,6 @@ pub const ENV_HEAL_MRF_REPLAY_BATCH: &str = "RUSTFS_HEAL_MRF_REPLAY_BATCH";
 /// Default behavior keeps the MRF intent pipeline enabled.
 pub const DEFAULT_HEAL_MRF_ENABLE: bool = true;
 
-/// Opt in to lifecycle V2 transitions after qualifying every reader and the rollback binary.
-pub const ENV_MRF_LIFECYCLE_V2_ENABLE: &str = "RUSTFS_MRF_LIFECYCLE_V2_ENABLE";
-pub const DEFAULT_MRF_LIFECYCLE_V2_ENABLE: bool = false;
-
 /// Default MRF queue capacity (matches MinIO's 100k MRF list ceiling).
 pub const DEFAULT_HEAL_MRF_QUEUE_SIZE: usize = 100_000;
 

crates/config/src/constants/internode.rs

@@ -276,9 +276,6 @@ pub const DEFAULT_INTERNODE_BULK_CHANNELS: usize = 2;
 pub const ENV_INTERNODE_HTTP_TUNING_PROFILE: &str = "RUSTFS_INTERNODE_HTTP_TUNING_PROFILE";
 pub const DEFAULT_INTERNODE_HTTP_TUNING_PROFILE: &str = "legacy";
 
-/// Internode HTTP data-plane protocol: `http1` (default) or `auto` (TLS ALPN).
-pub const ENV_INTERNODE_HTTP_PROTOCOL: &str = "RUSTFS_INTERNODE_HTTP_PROTOCOL";
-
 /// Internode HTTP connection pool maximum idle connections per host.
 pub const ENV_INTERNODE_HTTP_POOL_MAX_IDLE_PER_HOST: &str = "RUSTFS_INTERNODE_HTTP_POOL_MAX_IDLE_PER_HOST";
 
@@ -290,9 +287,8 @@ pub const ENV_INTERNODE_HTTP_POOL_IDLE_TIMEOUT_SECS: &str = "RUSTFS_INTERNODE_HT
 /// NOTE (backlog#805-C3): all `RUSTFS_INTERNODE_HTTP2_*` tuning (window sizes,
 /// adaptive window, keepalive timeout) only takes effect when the internode
 /// connection actually negotiates HTTP/2, which happens via TLS-ALPN. Over
-/// plaintext internode transport or with the default `http1` protocol policy,
-/// these settings are inert. Select `RUSTFS_INTERNODE_HTTP_PROTOCOL=auto` and
-/// enable internode TLS to use them.
+/// plaintext internode transport the connection is HTTP/1.1 and these settings
+/// are silently inert — enable internode TLS to use them.
 pub const ENV_INTERNODE_HTTP2_INITIAL_STREAM_WINDOW_SIZE: &str = "RUSTFS_INTERNODE_HTTP2_INITIAL_STREAM_WINDOW_SIZE";
 
 /// Internode HTTP/2 initial connection window size in bytes.

crates/config/src/constants/scanner.rs

@@ -53,9 +53,6 @@ pub const SCANNER_IDLE_MODE: &str = "idle_mode";
 /// Scanner config key controlling scanner cache save timeout in seconds.
 pub const SCANNER_CACHE_SAVE_TIMEOUT: &str = "cache_save_timeout";
 
-/// Scanner config key capping automatic recovery retry waits in seconds.
-pub const SCANNER_RECOVERY_BACKOFF_CAP: &str = "recovery_backoff_cap";
-
 /// Scanner config key capping concurrent scanner set tasks.
 pub const SCANNER_MAX_CONCURRENT_SET_SCANS: &str = "max_concurrent_set_scans";
 
@@ -96,7 +93,6 @@ pub const SCANNER_KEYS: &[&str] = &[
     SCANNER_BITROT_CYCLE,
     SCANNER_IDLE_MODE,
     SCANNER_CACHE_SAVE_TIMEOUT,
-    SCANNER_RECOVERY_BACKOFF_CAP,
     SCANNER_MAX_CONCURRENT_SET_SCANS,
     SCANNER_MAX_CONCURRENT_DISK_SCANS,
     SCANNER_WALKERS_PER_DISK,
@@ -220,14 +216,6 @@ pub const ENV_SCANNER_CACHE_SAVE_TIMEOUT_SECS: &str = "RUSTFS_SCANNER_CACHE_SAVE
 /// Default scanner cache save timeout in seconds.
 pub const DEFAULT_SCANNER_CACHE_SAVE_TIMEOUT_SECS: u64 = 14;
 
-/// Environment variable that caps automatic scanner recovery retry waits.
-/// The value must be a positive integer number of seconds within the timer range.
-/// - Example: `export RUSTFS_SCANNER_RECOVERY_BACKOFF_CAP_SECS=600`
-pub const ENV_SCANNER_RECOVERY_BACKOFF_CAP_SECS: &str = "RUSTFS_SCANNER_RECOVERY_BACKOFF_CAP_SECS";
-
-/// Default maximum wait between automatic scanner recovery retries.
-pub const DEFAULT_SCANNER_RECOVERY_BACKOFF_CAP_SECS: u64 = 10 * 60;
-
 /// Environment variable that caps concurrent scanner set tasks.
 /// A value of `0` keeps the existing topology-based concurrency.
 /// - Example: `export RUSTFS_SCANNER_MAX_CONCURRENT_SET_SCANS=2`

crates/e2e_test/Cargo.toml

@@ -107,7 +107,7 @@ flate2.workspace = true
 http.workspace = true
 http-body-util.workspace = true
 hyper = { workspace = true, features = ["http2", "http1", "server"] }
-hyper-util = { workspace = true, features = ["tokio", "server-auto", "server-graceful", "client-legacy", "tracing"] }
+hyper-util = { workspace = true, features = ["tokio", "server-auto", "server-graceful", "tracing"] }
 reqwest = { workspace = true, features = ["json", "multipart", "stream"] }
 rustfs-signer.workspace = true
 
@@ -146,8 +146,6 @@ zip.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
 
 [dev-dependencies]
-same-file.workspace = true
 aws-smithy-http-client = { workspace = true, default-features = false, features = ["test-util"] }
-rustfs-heal.workspace = true
 tempfile.workspace = true
 tokio = { workspace = true, features = ["test-util"] }

crates/e2e_test/README.md

@@ -200,11 +200,10 @@ python3 scripts/e2e_binary.py run --features e2e-test-hooks -- cargo nextest run
 python3 scripts/e2e_binary.py run --binary "$RUSTFS_E2E_STARTUP_CAS_BINARY" --features e2e-test-hooks -- cargo nextest run --profile e2e-full -p e2e_test
 python3 scripts/e2e_binary.py run --features e2e-test-hooks -- cargo nextest run --profile e2e-nightly -p e2e_test
 
-# Distributed 4-node 4-disk lane uses the fault-test hooks server; the
-# scanner_heal_topology_ fault cases fail closed without it.
+# Distributed 4-node 4-disk lane uses the default server.
 # Upgrade cases require RUSTFS_UPGRADE_SOURCE_BINARY and fail closed without it.
-python3 scripts/e2e_binary.py build --bins --features e2e-test-hooks
-python3 scripts/e2e_binary.py run --features e2e-test-hooks -- cargo nextest run --profile e2e-distributed -p e2e_test
+python3 scripts/e2e_binary.py build
+python3 scripts/e2e_binary.py run -- cargo nextest run --profile e2e-distributed -p e2e_test
 
 # Replication nightly uses the default server; awscurl is required for STS.
 python3 scripts/e2e_binary.py build

crates/e2e_test/src/admin_auth_test.rs

@@ -29,10 +29,6 @@
 //! 3. Starting with the default `rustfsadmin` credentials emits the
 //!    default-credentials startup warning (observable operator signal).
 
-// Keep inventory acceptance in the admin-auth PR smoke selection.
-#[cfg(test)]
-mod target_inventory_test;
-
 #[cfg(test)]
 mod tests {
     use crate::common::{RustFSTestEnvironment, init_logging, rustfs_binary_path};

crates/e2e_test/src/admin_auth_test/target_inventory_test.rs

@@ -1,205 +0,0 @@
-// 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.
-
-//! Exercise the target inventory through HTTP authentication and authorization.
-//! Handler-level tests separately control reconciliation locks and config faults.
-
-use crate::common::{
-    RustFSTestEnvironment, admin_create_user, admin_request, admin_request_with_session_token, build_test_sts_client,
-    init_logging, local_http_client,
-};
-use http::header::{AUTHORIZATION, HOST};
-use reqwest::StatusCode;
-use rustfs_signer::{constants::UNSIGNED_PAYLOAD, sign_v4};
-use s3s::Body;
-use serde_json::Value;
-use std::{error::Error, time::Duration};
-
-type TestResult = Result<(), Box<dyn Error + Send + Sync>>;
-
-const SECRET: &str = "inventory-acceptance-token";
-const LIMITED_KEY: &str = "inventory-limited";
-const LIMITED_SECRET: &str = "inventory-limited-secret";
-const PATHS: [&str; 5] = [
-    "/rustfs/admin/v3/target/list",
-    "/rustfs/admin/v3/audit/target/list",
-    "/rustfs/admin/v4/plugins/instances",
-    "/rustfs/admin/v4/plugins/instances/builtin:webhook:notify:acceptance",
-    "/rustfs/admin/v4/extensions/instances",
-];
-
-async fn duplicate_authorization(
-    env: &RustFSTestEnvironment,
-    path: &str,
-) -> Result<reqwest::Response, Box<dyn Error + Send + Sync>> {
-    let url = format!("{}{path}", env.url);
-    let uri: http::Uri = url.parse()?;
-    let authority = uri.authority().ok_or("inventory URL missing authority")?.to_string();
-    let request = http::Request::builder()
-        .method(http::Method::GET)
-        .uri(uri)
-        .header(HOST, authority)
-        .header("x-amz-content-sha256", UNSIGNED_PAYLOAD)
-        .body(Body::empty())?;
-    let signed = sign_v4(request, 0, &env.access_key, &env.secret_key, "", "us-east-1");
-    let mut headers = signed.headers().clone();
-    let authorization = headers.get(AUTHORIZATION).ok_or("signer omitted authorization")?.clone();
-    headers.append(AUTHORIZATION, authorization);
-    assert_eq!(headers.get_all(AUTHORIZATION).iter().count(), 2);
-    Ok(local_http_client().get(url).headers(headers).send().await?)
-}
-
-fn assert_unloaded_target(entry: &Value, path: &str) {
-    assert_eq!(entry["service"], "webhook", "{path}: unexpected target service");
-    assert!(
-        entry["account_id"]
-            .as_str()
-            .is_some_and(|id| id.eq_ignore_ascii_case("acceptance")),
-        "{path}: fixture target is missing"
-    );
-    assert_eq!(entry["status"], "offline", "{path}: unloaded targets must remain visible as offline");
-    if !path.contains("/extensions/") {
-        assert_eq!(entry["health_reason"], "not_loaded_in_runtime", "{path}: unexpected health reason");
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn target_inventory_preserves_unloaded_targets_and_http_auth_boundaries() -> TestResult {
-    init_logging();
-    let mut env = RustFSTestEnvironment::new().await?;
-    // Enabled destinations remain configured while both delivery modules are
-    // disabled, so inventory reads must not require a loaded target runtime.
-    env.start_rustfs_server_with_env(
-        vec![],
-        &[
-            ("RUSTFS_NOTIFY_ENABLE", "false"),
-            ("RUSTFS_AUDIT_ENABLE", "false"),
-            ("RUSTFS_NOTIFY_WEBHOOK_ENABLE_ACCEPTANCE", "on"),
-            ("RUSTFS_NOTIFY_WEBHOOK_ENDPOINT_ACCEPTANCE", "http://127.0.0.1:9/hook"),
-            ("RUSTFS_NOTIFY_WEBHOOK_AUTH_TOKEN_ACCEPTANCE", SECRET),
-            ("RUSTFS_AUDIT_WEBHOOK_ENABLE_ACCEPTANCE", "on"),
-            ("RUSTFS_AUDIT_WEBHOOK_ENDPOINT_ACCEPTANCE", "http://127.0.0.1:9/hook"),
-            ("RUSTFS_AUDIT_WEBHOOK_AUTH_TOKEN_ACCEPTANCE", SECRET),
-        ],
-    )
-    .await?;
-    admin_create_user(&env, LIMITED_KEY, LIMITED_SECRET).await?;
-
-    tokio::time::timeout(Duration::from_secs(60), async {
-        let assumed = build_test_sts_client(&env.url, &env.access_key, &env.secret_key, None, "e2e-target-inventory")
-            .assume_role()
-            .role_arn("arn:aws:iam::123456789012:role/target-inventory")
-            .role_session_name("target-inventory-console-session")
-            .send()
-            .await?;
-        let temporary = assumed
-            .credentials()
-            .ok_or("AssumeRole should return temporary inventory credentials")?;
-        assert_ne!(
-            temporary.access_key_id(),
-            env.access_key,
-            "inventory must exercise a distinct session credential"
-        );
-        assert!(
-            !temporary.session_token().is_empty(),
-            "temporary inventory credentials must include a token"
-        );
-
-        for path in PATHS {
-            for (principal, access_key, secret_key, session_token) in [
-                ("root", env.access_key.as_str(), env.secret_key.as_str(), None),
-                (
-                    "temporary admin",
-                    temporary.access_key_id(),
-                    temporary.secret_access_key(),
-                    Some(temporary.session_token()),
-                ),
-            ] {
-                let (status, body) = admin_request_with_session_token(
-                    &env.url,
-                    http::Method::GET,
-                    path,
-                    None,
-                    access_key,
-                    secret_key,
-                    session_token,
-                )
-                .await?;
-                assert_eq!(status, StatusCode::OK, "{path}: signed {principal} inventory failed");
-                assert!(!body.contains(SECRET), "{path}: inventory exposed a target secret");
-                let value: Value = serde_json::from_str(&body)?;
-                let entries: Vec<&Value> = if path.ends_with("/target/list") {
-                    let field = if path.contains("/audit/") {
-                        "audit_endpoints"
-                    } else {
-                        "notification_endpoints"
-                    };
-                    value[field].as_array().ok_or("missing endpoint inventory")?.iter().collect()
-                } else if path.ends_with("/instances") {
-                    value["instances"]
-                        .as_array()
-                        .ok_or("missing instance inventory")?
-                        .iter()
-                        .collect()
-                } else {
-                    vec![&value]
-                };
-                let targets: Vec<_> = entries
-                    .into_iter()
-                    .filter(|entry| {
-                        entry["account_id"]
-                            .as_str()
-                            .is_some_and(|id| id.eq_ignore_ascii_case("acceptance"))
-                    })
-                    .collect();
-                let expected = if path.ends_with("/instances") { 2 } else { 1 };
-                assert_eq!(targets.len(), expected, "{path}: configured targets disappeared");
-                for entry in &targets {
-                    assert_unloaded_target(entry, path);
-                    if path.contains("/v4/") {
-                        assert_eq!(entry["config"]["auth_token"], "***redacted***", "{path}: missing secret redaction");
-                    }
-                }
-                if expected == 2 {
-                    for domain in ["notify", "audit"] {
-                        assert!(targets.iter().any(|entry| entry["domain"] == domain), "{path}: missing {domain} domain");
-                    }
-                }
-            }
-
-            let unsigned = local_http_client().get(format!("{}{path}", env.url)).send().await?;
-            assert_eq!(unsigned.status(), StatusCode::FORBIDDEN, "{path}: unsigned request was not denied");
-            let body = unsigned.text().await?;
-            assert!(body.contains("<Code>AccessDenied</Code>") && body.contains("Signature is required"));
-
-            let ambiguous = duplicate_authorization(&env, path).await?;
-            assert_eq!(
-                ambiguous.status(),
-                StatusCode::FORBIDDEN,
-                "{path}: duplicate authorization was not rejected"
-            );
-            let body = ambiguous.text().await?;
-            assert!(body.contains("<Code>AccessDenied</Code>") && body.contains("Signature is required"));
-
-            let (status, body) = admin_request(&env.url, http::Method::GET, path, None, LIMITED_KEY, LIMITED_SECRET).await?;
-            assert_eq!(status, StatusCode::FORBIDDEN, "{path}: principal without admin policy was not denied");
-            assert!(body.contains("<Code>AccessDenied</Code>"), "{path}: unexpected authorization error");
-            assert!(!body.contains("Signature is required") && !body.contains("SignatureDoesNotMatch"));
-        }
-        Ok::<(), Box<dyn Error + Send + Sync>>(())
-    })
-    .await??;
-    env.stop_server();
-    Ok(())
-}

crates/e2e_test/src/common.rs

@@ -34,7 +34,7 @@ use rustfs_signer::sign_v4;
 use s3s::Body;
 use serde_json;
 use std::fs as stdfs;
-use std::io::{self, ErrorKind};
+use std::io::ErrorKind;
 use std::net::{Ipv6Addr, SocketAddr};
 use std::path::{Path, PathBuf};
 use std::process::{Child, Command, Stdio};
@@ -1272,7 +1272,6 @@ pub struct RustFSTestClusterEnvironment {
     /// Optional socket proxies used for the corresponding node's volume
     /// endpoints. Proxies must be installed before [`Self::start`].
     volume_proxy_addresses: Vec<Option<SocketAddr>>,
-    tls_ca_pem: Option<Vec<u8>>,
 }
 
 impl RustFSTestClusterEnvironment {
@@ -1313,10 +1312,7 @@ impl RustFSTestClusterEnvironment {
     pub async fn with_topology(topology: ClusterTopology) -> Result<Self, Box<dyn std::error::Error + Send + Sync>> {
         topology.validate()?;
 
-        let temp_dir = std::env::temp_dir()
-            .join(format!("rustfs_cluster_test_{}", Uuid::new_v4()))
-            .to_string_lossy()
-            .into_owned();
+        let temp_dir = format!("/tmp/rustfs_cluster_test_{}", Uuid::new_v4());
         fs::create_dir_all(&temp_dir).await?;
 
         // Map every node to its owning pool index.
@@ -1378,35 +1374,9 @@ impl RustFSTestClusterEnvironment {
             node_capture_log_paths: vec![None; topology.node_count],
             topology,
             volume_proxy_addresses: vec![None; node_count],
-            tls_ca_pem: None,
         })
     }
 
-    /// Configure verified HTTPS for both volume endpoints and S3 clients.
-    /// The bundle must be generated before any node starts.
-    pub async fn enable_tls(&mut self, directory: &Path) -> std::io::Result<()> {
-        if self.nodes.iter().any(|node| node.process.is_some()) {
-            return Err(std::io::Error::new(
-                ErrorKind::InvalidInput,
-                "configure cluster TLS before starting nodes",
-            ));
-        }
-        let directory = fs::canonicalize(directory).await?;
-        let ca_pem = fs::read(directory.join("ca.crt")).await?;
-        reqwest::Certificate::from_pem(&ca_pem).map_err(|error| std::io::Error::new(ErrorKind::InvalidData, error))?;
-        self.set_env(
-            "RUSTFS_TLS_PATH",
-            directory
-                .to_str()
-                .ok_or_else(|| std::io::Error::new(ErrorKind::InvalidInput, "TLS directory is not UTF-8"))?,
-        );
-        for node in &mut self.nodes {
-            node.url = format!("https://{}", node.address);
-        }
-        self.tls_ca_pem = Some(ca_pem);
-        Ok(())
-    }
-
     /// Add an extra environment variable applied to every cluster node process.
     pub fn set_env<K, V>(&mut self, key: K, value: V)
     where
@@ -1497,29 +1467,6 @@ impl RustFSTestClusterEnvironment {
         Ok(proxy)
     }
 
-    /// Route internode traffic through a method-aware HTTP proxy.
-    pub(crate) async fn start_rpc_proxy_for_node(
-        &mut self,
-        node_idx: usize,
-    ) -> io::Result<crate::rpc_fault_proxy::RpcFaultProxy> {
-        self.ensure_node_index(node_idx)
-            .map_err(|error| io::Error::new(ErrorKind::InvalidInput, error))?;
-        if self.volume_proxy_addresses[node_idx].is_some() {
-            return Err(io::Error::new(
-                ErrorKind::AlreadyExists,
-                format!("a volume proxy is already configured for node {node_idx}"),
-            ));
-        }
-        let target = self.nodes[node_idx]
-            .address
-            .parse::<SocketAddr>()
-            .map_err(|error| io::Error::new(ErrorKind::InvalidInput, error))?;
-        let listen = SocketAddr::from((Ipv6Addr::LOCALHOST, target.port()));
-        let proxy = crate::rpc_fault_proxy::RpcFaultProxy::start_on(listen, target).await?;
-        self.volume_proxy_addresses[node_idx] = Some(proxy.local_addr());
-        Ok(proxy)
-    }
-
     fn volume_address(&self, node_idx: usize) -> String {
         self.volume_proxy_addresses[node_idx]
             .map(|address| address.to_string())
@@ -1528,7 +1475,6 @@ impl RustFSTestClusterEnvironment {
 
     fn build_volumes_arg(&self) -> String {
         let pools = self.topology.normalized_pools();
-        let scheme = if self.tls_ca_pem.is_some() { "https" } else { "http" };
 
         if pools.len() <= 1 {
             // Single pool: explicit enumeration of every drive on every node.
@@ -1538,7 +1484,7 @@ impl RustFSTestClusterEnvironment {
                 .enumerate()
                 .flat_map(|(node_idx, n)| {
                     let address = self.volume_address(node_idx);
-                    n.data_dirs.iter().map(move |dir| format!("{scheme}://{address}{dir}"))
+                    n.data_dirs.iter().map(move |dir| format!("http://{}{}", address, dir))
                 })
                 .collect::<Vec<_>>()
                 .join(" ");
@@ -1558,7 +1504,7 @@ impl RustFSTestClusterEnvironment {
                     .and_then(|d| d.rsplit_once('/').map(|(parent, _)| parent))
                     .unwrap_or(&node.data_dir);
                 format!(
-                    "{scheme}://{}{}/drive{{0...{}}}",
+                    "http://{}{}/drive{{0...{}}}",
                     self.volume_address(node_idx),
                     base,
                     self.topology.drives_per_node - 1
@@ -1747,20 +1693,13 @@ impl RustFSTestClusterEnvironment {
         if node_idx >= self.nodes.len() {
             return Err("node_idx is invalid".into());
         }
-        let mut config =
-            build_test_s3_config(&self.nodes[node_idx].url, &self.access_key, &self.secret_key, None, "cluster-test");
-        if let Some(ca_pem) = &self.tls_ca_pem {
-            use aws_smithy_http_client::tls::{Provider, TlsContext, TrustStore, rustls_provider::CryptoMode};
-            let tls = TlsContext::builder()
-                .with_trust_store(TrustStore::empty().with_pem_certificate(ca_pem.clone()))
-                .build()?;
-            let client = SmithyHttpClientBuilder::new()
-                .tls_provider(Provider::Rustls(CryptoMode::AwsLc))
-                .tls_context(tls)
-                .build_https();
-            config = config.to_builder().http_client(client).build();
-        }
-        Ok(Client::from_conf(config))
+        Ok(Client::from_conf(build_test_s3_config(
+            &self.nodes[node_idx].url,
+            &self.access_key,
+            &self.secret_key,
+            None,
+            "cluster-test",
+        )))
     }
 
     /// Create S3 clients for all nodes in the RustFS cluster and collect them into a vector.
@@ -1885,7 +1824,7 @@ impl RustFSTestClusterEnvironment {
         }
 
         self.nodes.push(ClusterNode {
-            url: format!("{}://{address}", if self.tls_ca_pem.is_some() { "https" } else { "http" }),
+            url: format!("http://{address}"),
             address,
             data_dir: data_dirs[0].clone(),
             data_dirs,
@@ -1907,47 +1846,6 @@ impl RustFSTestClusterEnvironment {
         Ok(new_idx)
     }
 
-    /// Remove retired single-node pools from a stopped multi-pool cluster.
-    ///
-    /// A decommissioned pool must leave the server command line before the
-    /// next start; the server refuses to start while it is still listed. The
-    /// remaining pools keep their node order and are renumbered from zero.
-    /// Data directories are left on disk for the owning harness to clean up.
-    pub fn remove_single_node_pools(&mut self, retired: &[usize]) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        if self.nodes.iter().any(|node| node.process.is_some()) {
-            return Err("stop the cluster before removing a pool".into());
-        }
-        let pools = self.topology.normalized_pools();
-        if pools.iter().any(|nodes| nodes.len() != 1) {
-            return Err("remove_single_node_pools requires one node per pool".into());
-        }
-        if retired.iter().any(|pool| *pool >= pools.len()) || retired.len() >= pools.len() {
-            return Err(format!("cannot remove pools {retired:?} from {} pools", pools.len()).into());
-        }
-        let keep: Vec<usize> = (0..self.nodes.len())
-            .filter(|node_idx| !retired.contains(&self.nodes[*node_idx].pool_idx))
-            .collect();
-        fn retain_indices<T>(values: &mut Vec<T>, keep: &[usize]) {
-            let old = std::mem::take(values);
-            *values = old
-                .into_iter()
-                .enumerate()
-                .filter(|(idx, _)| keep.contains(idx))
-                .map(|(_, value)| value)
-                .collect();
-        }
-        retain_indices(&mut self.nodes, &keep);
-        retain_indices(&mut self.node_extra_env, &keep);
-        retain_indices(&mut self.node_capture_log_paths, &keep);
-        retain_indices(&mut self.volume_proxy_addresses, &keep);
-        for (pool_idx, node) in self.nodes.iter_mut().enumerate() {
-            node.pool_idx = pool_idx;
-        }
-        self.topology.node_count = self.nodes.len();
-        self.topology.pools = (0..self.nodes.len()).map(|node_idx| vec![node_idx]).collect();
-        Ok(())
-    }
-
     /// Gracefully stop one cluster node and wait for its process to exit.
     ///
     /// This is intentionally separate from [`Self::stop_node`]: the latter is
@@ -2499,7 +2397,6 @@ mod tests {
             node_capture_log_paths: vec![None; topology.node_count],
             topology,
             volume_proxy_addresses: vec![None; node_count],
-            tls_ca_pem: None,
         }
     }
 
@@ -2517,8 +2414,8 @@ mod tests {
         );
     }
 
-    #[tokio::test]
-    async fn volumes_single_pool_multidrive_enumerates_every_drive() {
+    #[test]
+    fn volumes_single_pool_multidrive_enumerates_every_drive() {
         // 4 nodes x 2 drives -> 8 explicit endpoints, one legacy pool. No
         // ellipses, so the server parser keeps this as a single DistErasure pool.
         let env = fake_cluster(ClusterTopology::single_pool_multidrive(4, 2));
@@ -2530,25 +2427,6 @@ mod tests {
             .join(" ");
         assert_eq!(env.build_volumes_arg(), expected);
         assert_eq!(env.build_volumes_arg().split(' ').count(), 8);
-
-        let directory = tempfile::tempdir().expect("TLS fixture directory");
-        crate::tls_gen::run(crate::tls_gen::Args {
-            out_dir: directory.path().to_owned(),
-            days: 1,
-            force: false,
-        })
-        .expect("generate TLS bundle");
-        for topology in [
-            ClusterTopology::single_pool_multidrive(4, 4),
-            ClusterTopology::per_node_pools(4, vec![vec![0], vec![1]]),
-        ] {
-            let mut cluster = fake_cluster(topology);
-            let plaintext_volumes = cluster.build_volumes_arg();
-            cluster.enable_tls(directory.path()).await.expect("configure TLS");
-            assert_eq!(cluster.build_volumes_arg(), plaintext_volumes.replace("http://", "https://"));
-            assert!(cluster.nodes.iter().all(|node| node.url.starts_with("https://")));
-            assert!(cluster.create_s3_client(0).is_ok(), "trusted SDK client should build");
-        }
     }
 
     #[test]
@@ -2636,22 +2514,6 @@ mod tests {
         proxy.shutdown().await;
     }
 
-    #[tokio::test]
-    async fn cluster_data_dirs_use_os_temporary_directory() {
-        let cluster = RustFSTestClusterEnvironment::new(1).await.expect("allocate isolated cluster");
-        let root = PathBuf::from(&cluster.temp_dir);
-        assert!(
-            root.starts_with(std::env::temp_dir()),
-            "cluster must honor the selected temporary filesystem"
-        );
-        for node in &cluster.nodes {
-            assert!(Path::new(&node.data_dir).starts_with(&root));
-            assert!(node.data_dirs.iter().all(|drive| Path::new(drive).starts_with(&root)));
-        }
-        drop(cluster);
-        assert!(!root.exists(), "dropping the fixture must remove its owned directories");
-    }
-
     #[test]
     fn cluster_node_env_supports_per_node_overrides() {
         let mut env = fake_cluster(ClusterTopology::single_pool(4));

crates/e2e_test/src/create_bucket_region_test.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Region-aware bucket creation and location regressions: backlog#629(b), rustfs#8729.
+//! Regression test for rustfs/backlog#629(b): region-aware `CreateBucket`.
 //!
 //! `minio-go`'s `MakeBucket(bucket, "us-east-1")` was reported to fail SigV4
 //! validation. The SigV4 signature is verified by `s3s` over the raw request
@@ -23,13 +23,7 @@
 
 #[cfg(test)]
 mod tests {
-    use crate::common::{
-        AdminTransport, RustFSTestEnvironment, admin_add_canned_policy_via, admin_attach_user_policy_via, admin_create_user,
-        build_test_s3_config, build_test_sts_client, init_logging, local_http_client, signed_s3_request_with_headers,
-    };
-    use aws_sdk_s3::Client;
-    use aws_sdk_s3::config::Region;
-    use aws_sdk_s3::error::ProvideErrorMetadata;
+    use crate::common::{RustFSTestEnvironment, init_logging};
     use aws_sdk_s3::types::{BucketLocationConstraint, CreateBucketConfiguration};
     use std::error::Error;
 
@@ -39,7 +33,7 @@ mod tests {
     async fn test_create_bucket_with_us_east_1_location_constraint() -> Result<(), Box<dyn Error + Send + Sync>> {
         init_logging();
         let mut env = RustFSTestEnvironment::new().await?;
-        env.start_rustfs_server(vec!["--region", "us-east-1"]).await?;
+        env.start_rustfs_server(vec![]).await?;
         let client = env.create_s3_client();
 
         client
@@ -54,13 +48,6 @@ mod tests {
             .await
             .expect("region-aware CreateBucket must pass SigV4 validation and succeed");
 
-        let location = client.get_bucket_location().bucket("region-aware-bucket").send().await?;
-        assert_eq!(
-            location.location_constraint().map(|value| value.as_str()),
-            Some(""),
-            "us-east-1 must serialize an empty LocationConstraint element"
-        );
-
         // The bucket exists and is listed.
         let listed = client.list_buckets().send().await?;
         let names: Vec<&str> = listed.buckets().iter().filter_map(|b| b.name()).collect();
@@ -76,7 +63,7 @@ mod tests {
     async fn test_create_bucket_without_location_constraint() -> Result<(), Box<dyn Error + Send + Sync>> {
         init_logging();
         let mut env = RustFSTestEnvironment::new().await?;
-        env.start_rustfs_server(vec!["--region", "us-east-1"]).await?;
+        env.start_rustfs_server(vec![]).await?;
         let client = env.create_s3_client();
 
         client
@@ -89,423 +76,4 @@ mod tests {
         env.stop_server();
         Ok(())
     }
-
-    #[tokio::test]
-    async fn test_create_bucket_rejects_unserved_location_constraints() -> Result<(), Box<dyn Error + Send + Sync>> {
-        init_logging();
-        let mut env = RustFSTestEnvironment::new().await?;
-        env.start_rustfs_server(vec!["--region", "us-east-1"]).await?;
-        let client = env.create_s3_client();
-
-        for (index, region) in ["eu-1", "not-a-real-region-42", "us-west-2", "EU"].iter().enumerate() {
-            let bucket = format!("rejected-region-{index}");
-            let error = client
-                .create_bucket()
-                .bucket(&bucket)
-                .create_bucket_configuration(
-                    CreateBucketConfiguration::builder()
-                        .location_constraint(BucketLocationConstraint::from(*region))
-                        .build(),
-                )
-                .send()
-                .await
-                .expect_err("a region not served by this instance must be rejected");
-            assert_eq!(error.raw_response().map(|response| response.status().as_u16()), Some(400));
-            assert_eq!(
-                error.as_service_error().and_then(ProvideErrorMetadata::code),
-                Some("InvalidLocationConstraint")
-            );
-
-            let missing = client
-                .head_bucket()
-                .bucket(&bucket)
-                .send()
-                .await
-                .expect_err("rejected bucket must not exist");
-            assert_eq!(missing.raw_response().map(|response| response.status().as_u16()), Some(404));
-        }
-
-        let missing = client
-            .get_bucket_location()
-            .bucket("missing-region-bucket")
-            .send()
-            .await
-            .expect_err("missing bucket must remain an error");
-        assert_eq!(missing.as_service_error().and_then(ProvideErrorMetadata::code), Some("NoSuchBucket"));
-        Ok(())
-    }
-
-    #[tokio::test]
-    async fn test_create_bucket_uses_configured_region() -> Result<(), Box<dyn Error + Send + Sync>> {
-        init_logging();
-        for region in ["eu-1", "eu-west-1"] {
-            let mut env = RustFSTestEnvironment::new().await?;
-            env.start_rustfs_server(vec!["--region", region]).await?;
-            let client = Client::from_conf(
-                env.create_s3_client()
-                    .config()
-                    .to_builder()
-                    .region(Region::new(region))
-                    .build(),
-            );
-            let mut configurations = vec![None, Some(CreateBucketConfiguration::builder().build())];
-            for constraint in ["", region].into_iter().chain((region == "eu-west-1").then_some("EU")) {
-                configurations.push(Some(
-                    CreateBucketConfiguration::builder()
-                        .location_constraint(BucketLocationConstraint::from(constraint))
-                        .build(),
-                ));
-            }
-
-            // Omitted and empty constraints retain the S3-compatible server's site default.
-            for (index, configuration) in configurations.into_iter().enumerate() {
-                let bucket = format!("configured-region-{index}");
-                client
-                    .create_bucket()
-                    .bucket(&bucket)
-                    .set_create_bucket_configuration(configuration)
-                    .send()
-                    .await?;
-                let location = client.get_bucket_location().bucket(&bucket).send().await?;
-                assert_eq!(location.location_constraint().map(|value| value.as_str()), Some(region));
-            }
-
-            // A correctly signed request still cannot choose another bucket region.
-            let error = client
-                .create_bucket()
-                .bucket("wrong-default-region")
-                .create_bucket_configuration(
-                    CreateBucketConfiguration::builder()
-                        .location_constraint(BucketLocationConstraint::from("us-east-1"))
-                        .build(),
-                )
-                .send()
-                .await
-                .expect_err("the default region must not bypass a custom site region");
-            assert_eq!(error.raw_response().map(|response| response.status().as_u16()), Some(400));
-            assert_eq!(
-                error.as_service_error().and_then(ProvideErrorMetadata::code),
-                Some("InvalidLocationConstraint")
-            );
-            let missing = client
-                .head_bucket()
-                .bucket("wrong-default-region")
-                .send()
-                .await
-                .expect_err("rejected bucket must not exist");
-            assert_eq!(missing.raw_response().map(|response| response.status().as_u16()), Some(404));
-        }
-        Ok(())
-    }
-
-    async fn location_policy_client(
-        env: &RustFSTestEnvironment,
-        user: &str,
-        statements: serde_json::Value,
-    ) -> Result<Client, Box<dyn Error + Send + Sync>> {
-        let secret = "location-policy-test-secret";
-        admin_create_user(env, user, secret).await?;
-        let policy = serde_json::json!({"Version":"2012-10-17", "Statement":statements});
-        admin_add_canned_policy_via(
-            AdminTransport::Signed,
-            &env.url,
-            &env.access_key,
-            &env.secret_key,
-            user,
-            &policy.to_string(),
-        )
-        .await?;
-        admin_attach_user_policy_via(AdminTransport::Signed, &env.url, &env.access_key, &env.secret_key, user, user).await?;
-        Ok(Client::from_conf(
-            build_test_s3_config(&env.url, user, secret, None, "location-policy")
-                .to_builder()
-                .region(Region::new("eu-west-1"))
-                .build(),
-        ))
-    }
-
-    #[tokio::test]
-    async fn test_create_bucket_location_constraint_policy_allow() -> Result<(), Box<dyn Error + Send + Sync>> {
-        init_logging();
-        let mut env = RustFSTestEnvironment::new().await?;
-        env.start_rustfs_server(vec!["--region", "eu-west-1"]).await?;
-        let root = Client::from_conf(
-            env.create_s3_client()
-                .config()
-                .to_builder()
-                .region(Region::new("eu-west-1"))
-                .build(),
-        );
-        let configuration = |region: &str| {
-            CreateBucketConfiguration::builder()
-                .location_constraint(BucketLocationConstraint::from(region))
-                .build()
-        };
-
-        for (user, condition, accepts_region, accepts_alias, accepts_missing) in [
-            (
-                "location-allow",
-                serde_json::json!({"StringEquals":{"s3:LocationConstraint":"eu-west-1"}}),
-                true,
-                false,
-                false,
-            ),
-            (
-                "location-alias",
-                serde_json::json!({"StringEquals":{"s3:LocationConstraint":"EU"}}),
-                false,
-                true,
-                false,
-            ),
-            (
-                "location-null",
-                serde_json::json!({"Null":{"s3:LocationConstraint":"true"}}),
-                false,
-                false,
-                true,
-            ),
-        ] {
-            let client = location_policy_client(
-                &env,
-                user,
-                serde_json::json!([{
-                    "Effect":"Allow", "Action":"s3:CreateBucket", "Resource":"arn:aws:s3:::location-*", "Condition":condition,
-                }]),
-            )
-            .await?;
-            for (index, (config, allowed)) in [
-                (Some(configuration("eu-west-1")), accepts_region),
-                (Some(configuration("EU")), accepts_alias),
-                (None, accepts_missing),
-                (Some(CreateBucketConfiguration::builder().build()), accepts_missing),
-                (Some(configuration("")), accepts_missing),
-            ]
-            .into_iter()
-            .enumerate()
-            {
-                let bucket = format!("{user}-{index}");
-                let result = client
-                    .create_bucket()
-                    .bucket(&bucket)
-                    .set_create_bucket_configuration(config)
-                    .send()
-                    .await;
-                if allowed {
-                    result.unwrap_or_else(|error| panic!("{bucket} should be allowed: {error:?}"));
-                    root.head_bucket().bucket(&bucket).send().await?;
-                } else {
-                    let denied = result.expect_err("the requested XML constraint must satisfy the conditional Allow");
-                    assert_eq!(denied.raw_response().map(|response| response.status().as_u16()), Some(403), "{bucket}");
-                    assert_eq!(
-                        denied.as_service_error().and_then(ProvideErrorMetadata::code),
-                        Some("AccessDenied"),
-                        "{bucket}"
-                    );
-                    let absent = root
-                        .head_bucket()
-                        .bucket(&bucket)
-                        .send()
-                        .await
-                        .expect_err("denied bucket must not be created");
-                    assert_eq!(absent.raw_response().map(|response| response.status().as_u16()), Some(404));
-                }
-            }
-        }
-        let object_lock_client = location_policy_client(
-            &env,
-            "location-lock",
-            serde_json::json!([
-                {"Effect":"Allow", "Action":"s3:CreateBucket", "Resource":"arn:aws:s3:::location-*",
-                 "Condition":{"StringEquals":{"s3:LocationConstraint":"eu-west-1"}}},
-                {"Effect":"Allow", "Action":["s3:PutBucketObjectLockConfiguration", "s3:PutBucketVersioning"],
-                 "Resource":"arn:aws:s3:::location-*", "Condition":{"Null":{"s3:LocationConstraint":"true"}}}
-            ]),
-        )
-        .await?;
-        object_lock_client
-            .create_bucket()
-            .bucket("location-with-lock")
-            .create_bucket_configuration(configuration("eu-west-1"))
-            .object_lock_enabled_for_bucket(true)
-            .send()
-            .await
-            .expect("only CreateBucket receives the XML condition; dependent actions see it absent");
-        let object_lock = root
-            .get_object_lock_configuration()
-            .bucket("location-with-lock")
-            .send()
-            .await?;
-        assert_eq!(
-            object_lock
-                .object_lock_configuration()
-                .and_then(|configuration| configuration.object_lock_enabled())
-                .map(|value| value.as_str()),
-            Some("Enabled")
-        );
-        let versioning = root.get_bucket_versioning().bucket("location-with-lock").send().await?;
-        assert_eq!(versioning.status().map(|value| value.as_str()), Some("Enabled"));
-
-        let user = "location-session";
-        location_policy_client(
-            &env,
-            user,
-            serde_json::json!([{
-                "Effect":"Allow", "Action":"s3:CreateBucket", "Resource":"arn:aws:s3:::location-*"
-            }]),
-        )
-        .await?;
-        let session_policy = serde_json::json!({"Version":"2012-10-17", "Statement":[
-            {"Effect":"Allow", "Action":"s3:CreateBucket", "Resource":"arn:aws:s3:::location-*"},
-            {"Effect":"Deny", "Action":"s3:CreateBucket", "Resource":"arn:aws:s3:::location-*",
-             "Condition":{"StringEquals":{"s3:LocationConstraint":"eu-west-1"}}}
-        ]});
-        let assumed = build_test_sts_client(&env.url, user, "location-policy-test-secret", None, "location-policy-sts")
-            .assume_role()
-            .role_arn("arn:aws:iam::123456789012:role/location-policy")
-            .role_session_name("location-policy-session")
-            .policy(session_policy.to_string())
-            .send()
-            .await?;
-        let credentials = assumed.credentials().expect("AssumeRole returns temporary credentials");
-        let session = Client::from_conf(
-            build_test_s3_config(
-                &env.url,
-                credentials.access_key_id(),
-                credentials.secret_access_key(),
-                Some(credentials.session_token()),
-                "location-policy-session",
-            )
-            .to_builder()
-            .region(Region::new("eu-west-1"))
-            .build(),
-        );
-        let denied = session
-            .create_bucket()
-            .bucket("location-session-denied")
-            .create_bucket_configuration(configuration("eu-west-1"))
-            .send()
-            .await
-            .expect_err("the STS session's conditional Deny must be enforced");
-        assert_eq!(denied.as_service_error().and_then(ProvideErrorMetadata::code), Some("AccessDenied"));
-        let absent = root
-            .head_bucket()
-            .bucket("location-session-denied")
-            .send()
-            .await
-            .expect_err("session denial must not create a bucket");
-        assert_eq!(absent.raw_response().map(|response| response.status().as_u16()), Some(404));
-        session.create_bucket().bucket("location-session-allowed").send().await?;
-        Ok(())
-    }
-
-    #[tokio::test]
-    async fn test_create_bucket_location_constraint_policy_deny() -> Result<(), Box<dyn Error + Send + Sync>> {
-        init_logging();
-        let mut env = RustFSTestEnvironment::new().await?;
-        env.start_rustfs_server(vec!["--region", "eu-west-1"]).await?;
-        let root = Client::from_conf(
-            env.create_s3_client()
-                .config()
-                .to_builder()
-                .region(Region::new("eu-west-1"))
-                .build(),
-        );
-        let user = "location-deny";
-        let client = location_policy_client(
-            &env,
-            user,
-            serde_json::json!([
-                {"Effect":"Allow", "Action":"s3:CreateBucket", "Resource":"arn:aws:s3:::location-*"},
-                {"Effect":"Deny", "Action":"s3:CreateBucket", "Resource":"arn:aws:s3:::location-*",
-                 "Condition":{"StringEquals":{"s3:LocationConstraint":"eu-west-1"}}},
-            ]),
-        )
-        .await?;
-        let denied = client
-            .create_bucket()
-            .bucket("location-deny-matching")
-            .create_bucket_configuration(
-                CreateBucketConfiguration::builder()
-                    .location_constraint(BucketLocationConstraint::from("eu-west-1"))
-                    .build(),
-            )
-            .send()
-            .await
-            .expect_err("a matching explicit Deny must override the unconditional Allow");
-        assert_eq!(denied.as_service_error().and_then(ProvideErrorMetadata::code), Some("AccessDenied"));
-        assert_eq!(denied.raw_response().map(|response| response.status().as_u16()), Some(403));
-        let absent = root
-            .head_bucket()
-            .bucket("location-deny-matching")
-            .send()
-            .await
-            .expect_err("denied bucket must not exist");
-        assert_eq!(absent.raw_response().map(|response| response.status().as_u16()), Some(404));
-        client.create_bucket().bucket("location-deny-missing").send().await?;
-
-        let xml = r#"<CreateBucketConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><LocationConstraint>eu-west-1</LocationConstraint></CreateBucketConfiguration>"#;
-        let mut headers = http::HeaderMap::new();
-        headers.insert("locationconstraint", http::HeaderValue::from_static("us-east-1"));
-        for (index, body) in [xml.to_owned(), xml.replace("eu-west-1", "eu-west-&#49;")]
-            .into_iter()
-            .enumerate()
-        {
-            let bucket = format!("location-deny-spoofed-{index}");
-            let spoofed = signed_s3_request_with_headers(
-                http::Method::PUT,
-                &format!("{}/{bucket}?LocationConstraint=us-east-1", env.url),
-                Some(body),
-                Some("application/xml"),
-                user,
-                "location-policy-test-secret",
-                &headers,
-            )
-            .await?;
-            assert_eq!(spoofed.status(), reqwest::StatusCode::FORBIDDEN);
-            assert!(spoofed.text().await?.contains("<Code>AccessDenied</Code>"));
-            let absent = root
-                .head_bucket()
-                .bucket(&bucket)
-                .send()
-                .await
-                .expect_err("spoofed conditions must not create a bucket");
-            assert_eq!(absent.raw_response().map(|response| response.status().as_u16()), Some(404));
-        }
-
-        let bucket = "location-anonymous";
-        root.create_bucket().bucket(bucket).send().await?;
-        for (effect, match_status, missing_status) in [
-            ("Allow", reqwest::StatusCode::CONFLICT, reqwest::StatusCode::FORBIDDEN),
-            ("Deny", reqwest::StatusCode::FORBIDDEN, reqwest::StatusCode::CONFLICT),
-        ] {
-            let mut statements = vec![];
-            if effect == "Deny" {
-                statements.push(serde_json::json!({"Effect":"Allow", "Principal":"*", "Action":"s3:CreateBucket", "Resource":format!("arn:aws:s3:::{bucket}")}));
-            }
-            statements.push(serde_json::json!({"Effect":effect, "Principal":"*", "Action":"s3:CreateBucket", "Resource":format!("arn:aws:s3:::{bucket}"),
-                "Condition":{"StringEquals":{"s3:LocationConstraint":"eu-west-1"}}}));
-            root.put_bucket_policy()
-                .bucket(bucket)
-                .policy(serde_json::json!({"Version":"2012-10-17", "Statement":statements}).to_string())
-                .send()
-                .await?;
-            let unsigned = local_http_client();
-            for (body, expected) in [(xml, match_status), ("", missing_status)] {
-                let response = unsigned
-                    .put(format!("{}/{bucket}", env.url))
-                    .header("content-type", "application/xml")
-                    .body(body)
-                    .send()
-                    .await?;
-                assert_eq!(response.status(), expected, "anonymous {effect}, XML present={}", !body.is_empty());
-                let response = response.text().await?;
-                assert!(response.contains(if expected == reqwest::StatusCode::FORBIDDEN {
-                    "<Code>AccessDenied</Code>"
-                } else {
-                    "<Code>BucketAlreadyExists</Code>"
-                }));
-            }
-        }
-        Ok(())
-    }
 }

crates/e2e_test/src/data_usage_test.rs

@@ -14,7 +14,6 @@
 
 use aws_sdk_s3::primitives::ByteStream;
 use aws_sdk_s3::types::{BucketVersioningStatus, VersioningConfiguration};
-use futures::{StreamExt, TryStreamExt, stream};
 use rustfs_data_usage::DataUsageInfo;
 use tokio::time::{Duration, sleep};
 
@@ -75,23 +74,16 @@ async fn data_usage_reports_all_objects() -> Result<(), Box<dyn std::error::Erro
     // Create bucket and upload objects
     client.create_bucket().bucket(TEST_BUCKET).send().await?;
 
-    // Keep the full fixture and await every durable PUT before checking publication.
-    stream::iter(0..1000)
-        .map(Ok)
-        .try_for_each_concurrent(16, |i| {
-            let client = &client;
-            async move {
-                client
-                    .put_object()
-                    .bucket(TEST_BUCKET)
-                    .key(format!("obj-{i:04}"))
-                    .body(ByteStream::from_static(b"hello-world"))
-                    .send()
-                    .await
-                    .map(|_| ())
-            }
-        })
-        .await?;
+    for i in 0..1000 {
+        let key = format!("obj-{i:04}");
+        client
+            .put_object()
+            .bucket(TEST_BUCKET)
+            .key(key)
+            .body(ByteStream::from_static(b"hello-world"))
+            .send()
+            .await?;
+    }
 
     let usage = wait_for_bucket_usage(&env, TEST_BUCKET, |usage| {
         usage

crates/e2e_test/src/degraded_listing_availability_test.rs

@@ -20,14 +20,15 @@
 //! offline before heal converges, a strict latest-listing quorum of 3 can only
 //! ever observe 2 copies, so ListObjectsV2 silently dropped the object even
 //! though GetObject (read quorum 2) still succeeded. Exposed by the flaky
-//! "Mixed-version rolling upgrade from rc.2" CI lane (run 33478999853). The
-//! listing now follows MinIO's rule: an entry needs `ceil(asked/2)` copies
-//! among the online drives it asked, so three online drives need two copies
-//! (see `SetDisks::list_path` in `crates/ecstore/src/store/list_objects.rs`).
+//! "Mixed-version rolling upgrade from rc.2" CI lane (run 33478999853); the
+//! product fix relaxes the listing's required object quorum by the number of
+//! set drives the listing could not consult (see
+//! `latest_listing_required_object_quorum` in
+//! `crates/ecstore/src/store/list_objects.rs`).
 
 #[cfg(test)]
 mod tests {
-    use crate::common::{ClusterTopology, RustFSTestClusterEnvironment, init_logging};
+    use crate::common::{RustFSTestClusterEnvironment, init_logging};
     use aws_sdk_s3::Client;
     use bytes::Bytes;
     use std::collections::HashSet;
@@ -50,13 +51,13 @@ mod tests {
         format!("degraded-object-{idx:02}")
     }
 
-    async fn list_all_keys(client: &Client, bucket: &str) -> Result<HashSet<String>, Box<dyn Error + Send + Sync>> {
+    async fn list_all_keys(client: &Client) -> Result<HashSet<String>, Box<dyn Error + Send + Sync>> {
         let mut keys = HashSet::new();
         let mut continuation_token: Option<String> = None;
         loop {
             let response = client
                 .list_objects_v2()
-                .bucket(bucket)
+                .bucket(BUCKET)
                 .set_continuation_token(continuation_token.clone())
                 .send()
                 .await?;
@@ -146,7 +147,7 @@ mod tests {
         let expected: HashSet<String> = (0..OBJECT_COUNT).map(object_key).collect();
         let deadline = Instant::now() + LISTING_DEADLINE;
         let listed = loop {
-            let listed = match list_all_keys(&client, BUCKET).await {
+            let listed = match list_all_keys(&client).await {
                 Ok(keys) => keys,
                 Err(error) if Instant::now() < deadline => {
                     info!("retrying degraded listing: {error}");
@@ -170,97 +171,4 @@ mod tests {
 
         Ok(())
     }
-
-    /// 4-node x 4-drive cluster (one 16-drive set), #8828 shape:
-    /// 1. PUT objects while the storage class is EC:8, so each is 8+8.
-    /// 2. Restart with the EC:4 default, as after a storage-class change.
-    /// 3. Stop two nodes (8 drives). Each object keeps eight data shards, so
-    ///    GET succeeds and ListObjectsV2 must list every key: the listing
-    ///    quorum is half of the eight drives it can ask.
-    /// 4. Stop a third node. Four online drives are below the set's read
-    ///    quorum, so LIST must report 503 instead of a partial page.
-    #[tokio::test]
-    async fn ec8_objects_stay_listable_with_half_of_an_ec4_set_offline() -> TestResult {
-        const EC8_BUCKET: &str = "degraded-listing-ec8";
-        init_logging();
-
-        let mut cluster = RustFSTestClusterEnvironment::with_topology(ClusterTopology::single_pool_multidrive(4, 4)).await?;
-        cluster.set_env("RUSTFS_HEAL_ENABLED", "false");
-        cluster.set_env("RUSTFS_SCANNER_ENABLED", "false");
-        cluster.set_env("RUSTFS_STORAGE_CLASS_STANDARD", "EC:8");
-        cluster.start().await?;
-        cluster.create_test_bucket(EC8_BUCKET).await?;
-        let client = cluster.create_s3_client(0)?;
-        for idx in 0..OBJECT_COUNT {
-            let key = object_key(idx);
-            client
-                .put_object()
-                .bucket(EC8_BUCKET)
-                .key(&key)
-                .body(Bytes::from(format!("ec8 listing payload {idx}")).into())
-                .send()
-                .await
-                .map_err(|error| format!("EC:8 PUT for {key} failed: {error}"))?;
-        }
-
-        info!("restarting with the EC:4 default storage class");
-        cluster.stop();
-        // A later entry for the same variable wins when the node process starts.
-        cluster.set_env("RUSTFS_STORAGE_CLASS_STANDARD", "EC:4");
-        cluster.start().await?;
-        let client = cluster.create_s3_client(0)?;
-
-        info!("stopping nodes 2 and 3 (eight of sixteen drives)");
-        cluster.stop_node(2)?;
-        cluster.stop_node(3)?;
-        for idx in 0..OBJECT_COUNT {
-            let key = object_key(idx);
-            let deadline = Instant::now() + GET_RETRY_DEADLINE;
-            loop {
-                match client.get_object().bucket(EC8_BUCKET).key(&key).send().await {
-                    Ok(response) => {
-                        let body = response.body.collect().await?.into_bytes();
-                        assert_eq!(body.as_ref(), format!("ec8 listing payload {idx}").as_bytes());
-                        break;
-                    }
-                    Err(error) if Instant::now() < deadline => {
-                        info!("retrying EC:8 GET for {key}: {error}");
-                        tokio::time::sleep(Duration::from_millis(500)).await;
-                    }
-                    Err(error) => return Err(format!("EC:8 object {key} failed GET with eight drives: {error}").into()),
-                }
-            }
-        }
-
-        let expected: HashSet<String> = (0..OBJECT_COUNT).map(object_key).collect();
-        let deadline = Instant::now() + LISTING_DEADLINE;
-        loop {
-            match list_all_keys(&client, EC8_BUCKET).await {
-                Ok(listed) if listed == expected => break,
-                Ok(listed) => assert!(
-                    Instant::now() < deadline,
-                    "EC:8 objects readable with eight drives stayed missing from ListObjectsV2: listed={listed:?}"
-                ),
-                Err(error) => assert!(
-                    Instant::now() < deadline,
-                    "ListObjectsV2 kept failing with eight of sixteen drives online: {error}"
-                ),
-            }
-            tokio::time::sleep(Duration::from_millis(500)).await;
-        }
-
-        info!("stopping node 1 (four of sixteen drives remain)");
-        cluster.stop_node(1)?;
-        let deadline = Instant::now() + LISTING_DEADLINE;
-        loop {
-            match client.list_objects_v2().bucket(EC8_BUCKET).send().await {
-                Err(error) if error.raw_response().is_some_and(|response| response.status().as_u16() == 503) => break,
-                Err(error) => assert!(Instant::now() < deadline, "below the set read quorum LIST must report 503, got {error}"),
-                Ok(response) => panic!("below the set read quorum LIST must fail, but listed {} keys", response.contents().len()),
-            }
-            tokio::time::sleep(Duration::from_millis(500)).await;
-        }
-
-        Ok(())
-    }
 }

crates/e2e_test/src/delete_objects_versioning_test.rs

@@ -24,163 +24,6 @@
 //! `xl.meta` immediately visible, and the old file-cache shortcut has been
 //! removed from the read path.
 
-use aws_sdk_s3::Client;
-use aws_sdk_s3::config::retry::RetryConfig;
-use aws_sdk_s3::types::{BucketVersioningStatus, Delete, ObjectIdentifier, VersioningConfiguration};
-use std::collections::BTreeMap;
-
-async fn delete_exact_marker_versions(
-    client: &Client,
-    bucket: &str,
-    key: &str,
-    versions: &[(String, bool)],
-) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    let objects = versions
-        .iter()
-        .map(|(version, _)| ObjectIdentifier::builder().key(key).version_id(version).build())
-        .collect::<Result<Vec<_>, _>>()?;
-    let response = client
-        .delete_objects()
-        .bucket(bucket)
-        .delete(Delete::builder().set_objects(Some(objects)).build()?)
-        .send()
-        .await?;
-    assert!(response.errors().is_empty(), "explicit batch returned errors: {response:?}");
-    let mut actual = BTreeMap::new();
-    for deleted in response.deleted() {
-        assert_eq!(deleted.key(), Some(key));
-        *actual
-            .entry((
-                deleted.version_id().ok_or("Deleted entry omitted version ID")?.to_string(),
-                deleted.delete_marker().unwrap_or(false),
-                deleted.delete_marker_version_id().map(str::to_string),
-            ))
-            .or_insert(0_usize) += 1;
-    }
-    let mut expected = BTreeMap::new();
-    for (version, marker) in versions {
-        *expected
-            .entry((version.clone(), *marker, marker.then(|| version.clone())))
-            .or_insert(0_usize) += 1;
-    }
-    assert_eq!(actual, expected, "every requested occurrence must report its own version identity");
-    Ok(())
-}
-
-pub(crate) async fn assert_explicit_marker_batch_cleanup(
-    clients: &[Client],
-    bucket: &str,
-) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    assert!(!clients.is_empty());
-    let clients: Vec<_> = clients
-        .iter()
-        .map(|client| {
-            Client::from_conf(
-                client
-                    .config()
-                    .to_builder()
-                    .retry_config(RetryConfig::standard().with_max_attempts(1))
-                    .build(),
-            )
-        })
-        .collect();
-    let writer = &clients[0];
-    let marker_writer = &clients[1 % clients.len()];
-    let deleter = &clients[2 % clients.len()];
-    let key = "same-key-history";
-    writer.create_bucket().bucket(bucket).send().await?;
-    writer
-        .put_bucket_versioning()
-        .bucket(bucket)
-        .versioning_configuration(
-            VersioningConfiguration::builder()
-                .status(BucketVersioningStatus::Enabled)
-                .build(),
-        )
-        .send()
-        .await?;
-    let mut data = Vec::new();
-    for byte in [41_u8, 73_u8] {
-        let body = vec![byte; 1024 * 1024];
-        let uploaded = writer
-            .put_object()
-            .bucket(bucket)
-            .key(key)
-            .body(body.clone().into())
-            .send()
-            .await?;
-        data.push((uploaded.version_id().ok_or("versioned PUT omitted ID")?.to_string(), body));
-    }
-    let mut markers = Vec::with_capacity(16);
-    for _ in 0..16 {
-        let deleted = marker_writer.delete_object().bucket(bucket).key(key).send().await?;
-        assert_eq!(deleted.delete_marker(), Some(true));
-        markers.push(deleted.version_id().ok_or("marker creation omitted ID")?.to_string());
-    }
-    let mut requested: Vec<_> = markers.iter().map(|id| (id.clone(), true)).collect();
-    requested.push((markers[0].clone(), true));
-    requested.push((markers[15].clone(), true));
-    delete_exact_marker_versions(deleter, bucket, key, &requested).await?;
-    for client in &clients {
-        let versions = client.list_object_versions().bucket(bucket).send().await?;
-        assert!(versions.delete_markers().is_empty(), "marker survived successful batch: {versions:?}");
-        let mut actual: Vec<_> = versions
-            .versions()
-            .iter()
-            .filter_map(|version| version.version_id())
-            .collect();
-        actual.sort_unstable();
-        let mut expected: Vec<_> = data.iter().map(|(id, _)| id.as_str()).collect();
-        expected.sort_unstable();
-        assert_eq!(actual, expected);
-        let current = client.get_object().bucket(bucket).key(key).send().await?;
-        assert_eq!(current.body.collect().await?.into_bytes().as_ref(), data[1].1.as_slice());
-        let historical = client
-            .get_object()
-            .bucket(bucket)
-            .key(key)
-            .version_id(&data[0].0)
-            .send()
-            .await?;
-        assert_eq!(historical.body.collect().await?.into_bytes().as_ref(), data[0].1.as_slice());
-    }
-    let uuid_marker = marker_writer.delete_object().bucket(bucket).key(key).send().await?;
-    let uuid_marker = uuid_marker.version_id().ok_or("marker creation omitted UUID")?.to_string();
-    writer
-        .put_bucket_versioning()
-        .bucket(bucket)
-        .versioning_configuration(
-            VersioningConfiguration::builder()
-                .status(BucketVersioningStatus::Suspended)
-                .build(),
-        )
-        .send()
-        .await?;
-    let null_marker = marker_writer.delete_object().bucket(bucket).key(key).send().await?;
-    assert_eq!(null_marker.delete_marker(), Some(true));
-    assert_eq!(null_marker.version_id(), Some("null"));
-    let requested = [
-        (uuid_marker.clone(), true),
-        (data[1].0.clone(), false),
-        ("null".to_string(), true),
-        (data[0].0.clone(), false),
-        (uuid_marker, true),
-    ];
-    delete_exact_marker_versions(deleter, bucket, key, &requested).await?;
-    for client in &clients {
-        let versions = client.list_object_versions().bucket(bucket).send().await?;
-        assert!(versions.versions().is_empty() && versions.delete_markers().is_empty(), "{versions:?}");
-    }
-    clients
-        .last()
-        .expect("nonempty clients")
-        .delete_bucket()
-        .bucket(bucket)
-        .send()
-        .await?;
-    Ok(())
-}
-
 #[cfg(test)]
 mod tests {
     use crate::common::{RustFSTestEnvironment, init_logging};
@@ -192,16 +35,6 @@ mod tests {
         env.create_s3_client()
     }
 
-    #[tokio::test]
-    async fn test_explicit_delete_marker_batch_removes_versions_without_client_retries()
-    -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        init_logging();
-        let mut env = RustFSTestEnvironment::new().await?;
-        env.start_rustfs_server_with_env(vec![], &[("RUSTFS_CONSOLE_ENABLE", "false")])
-            .await?;
-        super::assert_explicit_marker_batch_cleanup(&[env.create_s3_client()], "explicit-marker-batch").await
-    }
-
     /// Regression test for Issue #1878.
     ///
     /// Verifies that after calling `delete_objects` (the batch plural API) on

crates/e2e_test/src/distributed/chaos_test.rs

@@ -13,20 +13,18 @@
 // limitations under the License.
 
 use super::harness::{
-    DistCluster, DistLayout, TestResult, assert_object_bytes, cluster_admin_ok, get_object_bytes, payload_for, put_object,
-    retrying_get_equals, retrying_put, s3_probe_client, s3_probe_error_code, unique_bucket, wait_for_ready, wait_until,
+    DistCluster, DistLayout, TestResult, assert_object_bytes, payload_for, put_object, retrying_get_equals, unique_bucket,
+    wait_for_ready, wait_until,
 };
 use crate::chaos::{census_object_version_on_disk, signed_admin_post};
 use crate::common::{build_test_s3_config, init_logging};
 use crate::fault_proxy::FaultMode;
 use aws_sdk_s3::Client;
-use aws_sdk_s3::error::SdkError;
-use aws_sdk_s3::operation::{get_object::GetObjectError, put_object::PutObjectError};
 use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::{Barrier, mpsc};
-use tokio::time::{Instant, timeout};
+use tokio::time::timeout;
 
 #[tokio::test]
 async fn kill_and_restart_node_preserves_objects() -> TestResult {
@@ -46,133 +44,6 @@ async fn kill_and_restart_node_preserves_objects() -> TestResult {
     Ok(())
 }
 
-#[tokio::test]
-async fn ec4_partial_node_return_restores_read_write_quorum() -> TestResult {
-    init_logging();
-    let mut dist = DistCluster::start_with_env(
-        DistLayout::FourByFour,
-        &[
-            ("RUSTFS_ERASURE_SET_DRIVE_COUNT", "16"),
-            ("RUSTFS_STORAGE_CLASS_STANDARD", "EC:4"),
-        ],
-    )
-    .await?;
-    let storage = cluster_admin_ok(&dist.cluster, http::Method::GET, "/rustfs/admin/v3/storageinfo", None).await?;
-    let storage: serde_json::Value = serde_json::from_str(&storage)?;
-    let storage: rustfs_madmin::StorageInfo = serde_json::from_value(storage["info"].clone())?;
-    assert_eq!(storage.disks.len(), 16);
-    assert_eq!(storage.backend.total_sets, vec![1]);
-    assert_eq!(storage.backend.drives_per_set, vec![16]);
-    assert_eq!(storage.backend.standard_sc_parity, Some(4));
-
-    let bucket = unique_bucket("partial-ec4");
-    dist.create_bucket(&bucket).await?;
-    let client = s3_probe_client(&dist.client(0)?);
-    let baseline = payload_for("partial-recovery/baseline", 8 * 1024 * 1024);
-    put_object(&client, &bucket, "baseline.bin", baseline.clone()).await?;
-    wait_until(
-        Duration::from_secs(30),
-        || async {
-            for node in &dist.cluster.nodes {
-                for directory in &node.data_dirs {
-                    let census = census_object_version_on_disk(std::path::Path::new(directory), &bucket, "baseline.bin", None)?;
-                    if !census.is_complete() {
-                        return Ok(false);
-                    }
-                    assert_eq!(census.data_blocks, Some(12), "the object must require twelve data shards");
-                    assert_eq!(census.parity_blocks, Some(4), "the object must have four parity shards");
-                    assert!(!census.expected_part_numbers.is_empty(), "the baseline must use physical shards");
-                }
-            }
-            Ok(true)
-        },
-        "the baseline is complete on all sixteen EC:4 drives",
-    )
-    .await?;
-
-    dist.cluster.stop_node(2)?;
-    dist.cluster.stop_node(3)?;
-    let read_error = timeout(Duration::from_secs(60), get_object_bytes(&client, &bucket, "baseline.bin"))
-        .await?
-        .expect_err("eight unavailable drives must prevent the baseline GET");
-    assert!(
-        matches!(
-            s3_probe_error_code(read_error.as_ref()),
-            Some("SlowDown" | "SlowDownRead" | "ServiceUnavailable")
-        ),
-        "quorum loss must produce an availability error: {read_error:?}"
-    );
-    assert_eq!(
-        read_error
-            .downcast_ref::<SdkError<GetObjectError>>()
-            .and_then(SdkError::raw_response)
-            .map(|response| response.status().as_u16()),
-        Some(503),
-        "read quorum loss must remain a service availability failure"
-    );
-    let write_error = timeout(Duration::from_secs(60), put_object(&client, &bucket, "unavailable.bin", baseline.clone()))
-        .await?
-        .expect_err("eight unavailable drives must prevent a successful PUT");
-    assert!(
-        matches!(s3_probe_error_code(write_error.as_ref()), Some("SlowDown" | "ServiceUnavailable")),
-        "quorum loss must produce an availability error: {write_error:?}"
-    );
-    assert_eq!(
-        write_error
-            .downcast_ref::<SdkError<PutObjectError>>()
-            .and_then(SdkError::raw_response)
-            .map(|response| response.status().as_u16()),
-        Some(503),
-        "write quorum loss must remain a service availability failure"
-    );
-
-    // Recover only four drives. The remaining node must stay stopped while
-    // every live coordinator serves old data and acknowledges new writes.
-    dist.cluster.start_node_process(2).await?;
-    let recovery_deadline = Instant::now() + Duration::from_secs(90);
-    let mut recovered_objects = Vec::new();
-    for node in 0..3 {
-        assert!(dist.cluster.nodes[3].process.is_none(), "the fourth node must remain unavailable");
-        let client = s3_probe_client(&dist.client(node)?);
-        retrying_get_equals(
-            &client,
-            &bucket,
-            "baseline.bin",
-            &baseline,
-            recovery_deadline.saturating_duration_since(Instant::now()),
-        )
-        .await?;
-        let key = format!("partial-{node}.bin");
-        let body = payload_for(&key, 1024 * 1024);
-        retrying_put(
-            &client,
-            &bucket,
-            &key,
-            body.clone(),
-            recovery_deadline.saturating_duration_since(Instant::now()),
-        )
-        .await?;
-        recovered_objects.push((key, body));
-    }
-    for node in 0..3 {
-        assert!(dist.cluster.nodes[3].process.is_none(), "reads must complete before all drives return");
-        let client = s3_probe_client(&dist.client(node)?);
-        assert_object_bytes(&client, &bucket, "baseline.bin", &baseline).await?;
-        for (key, body) in &recovered_objects {
-            assert_object_bytes(&client, &bucket, key, body).await?;
-        }
-    }
-
-    dist.cluster.start_node(3).await?;
-    wait_for_ready(&dist.cluster).await?;
-    let client = s3_probe_client(&dist.client(3)?);
-    assert_object_bytes(&client, &bucket, "baseline.bin", &baseline).await?;
-    for (key, body) in &recovered_objects {
-        assert_object_bytes(&client, &bucket, key, body).await?;
-    }
-    Ok(())
-}
-
 #[tokio::test]
 async fn full_cluster_restart_preserves_objects() -> TestResult {
     init_logging();

crates/e2e_test/src/distributed/harness.rs

@@ -34,12 +34,11 @@ use crate::common::{
 };
 use crate::replication_extension_test::LOOPBACK_REPLICATION_TARGET_ENV;
 use aws_sdk_s3::Client;
-use aws_sdk_s3::config::{Credentials, retry::RetryConfig};
+use aws_sdk_s3::config::retry::RetryConfig;
 use aws_sdk_s3::error::{ProvideErrorMetadata, SdkError};
 use aws_sdk_s3::operation::{get_object::GetObjectError, put_object::PutObjectError};
 use aws_sdk_s3::primitives::ByteStream;
 use aws_sdk_s3::types::{BucketVersioningStatus, VersioningConfiguration};
-use futures::future::try_join_all;
 use http::{Method, StatusCode};
 use sha2::{Digest, Sha256};
 use std::collections::BTreeMap;
@@ -78,7 +77,6 @@ pub(crate) struct DistCluster {
     pub cluster: RustFSTestClusterEnvironment,
     pool_storage_roots: Option<Vec<PathBuf>>,
     owned_pool_dirs: Vec<PathBuf>,
-    capture_log_dir: Option<PathBuf>,
 }
 
 impl DistCluster {
@@ -130,12 +128,11 @@ impl DistCluster {
         for &(key, value) in extra_env {
             cluster.set_env(key, value);
         }
-        configure_node_logs(&mut cluster, None)?;
+        configure_node_logs(&mut cluster)?;
         Ok(Self {
             cluster,
             pool_storage_roots,
             owned_pool_dirs,
-            capture_log_dir: None,
         })
     }
 
@@ -173,34 +170,17 @@ impl DistCluster {
         Ok(())
     }
 
-    /// Append every node's stdout/stderr to `directory/node-<idx>.log`, including
-    /// nodes added by later pool expansion. Call before the first start so startup
-    /// events such as the resolved durability mode are captured.
-    pub fn capture_logs_under(&mut self, directory: &Path) -> TestResult {
-        self.capture_log_dir = Some(directory.to_path_buf());
-        configure_node_logs(&mut self.cluster, Some(directory))
-    }
-
     pub fn client_with_credentials(&self, node_idx: usize, access_key: &str, secret_key: &str) -> TestResult<Client> {
         if node_idx >= self.cluster.nodes.len() {
             return Err("node_idx is invalid".into());
         }
-        let config = self.cluster.create_s3_client(node_idx)?.config().to_builder();
-        Ok(Client::from_conf(
-            config
-                .credentials_provider(Credentials::new(access_key, secret_key, None, None, "cluster-iam-test"))
-                .build(),
-        ))
-    }
-
-    /// Stop the fleet, drop retired pools from the command line, and restart
-    /// the remaining pools, which are renumbered from zero.
-    pub async fn remove_retired_pools_and_restart(&mut self, retired: &[usize]) -> TestResult {
-        self.stop_all_gracefully().await?;
-        self.cluster.remove_single_node_pools(retired)?;
-        self.cluster.start().await?;
-        wait_for_ready(&self.cluster).await?;
-        Ok(())
+        Ok(Client::from_conf(build_test_s3_config(
+            &self.cluster.nodes[node_idx].url,
+            access_key,
+            secret_key,
+            None,
+            "cluster-iam-test",
+        )))
     }
 
     pub async fn append_pool_and_restart(&mut self) -> TestResult<usize> {
@@ -212,7 +192,7 @@ impl DistCluster {
             .ok_or("pool expansion requires configured isolated pool filesystems")?;
         self.owned_pool_dirs
             .push(relocate_pool_storage(&mut self.cluster, node_idx, roots)?);
-        configure_node_logs(&mut self.cluster, self.capture_log_dir.as_deref())?;
+        configure_node_logs(&mut self.cluster)?;
         self.cluster.start().await?;
         wait_for_ready(&self.cluster).await?;
         Ok(node_idx)
@@ -346,22 +326,7 @@ fn relocate_pool_storage(cluster: &mut RustFSTestClusterEnvironment, node_idx: u
     Ok(pool_run_root)
 }
 
-pub(super) fn configure_node_logs(cluster: &mut RustFSTestClusterEnvironment, capture_dir: Option<&Path>) -> TestResult {
-    if let Ok(filter) = std::env::var("RUSTFS_E2E_LOG_FILTER") {
-        cluster.set_env("RUST_LOG", filter);
-    }
-    if let Some(directory) = capture_dir {
-        std::fs::create_dir_all(directory)?;
-        for node_idx in 0..cluster.nodes.len() {
-            // Overrides a path assigned from RUSTFS_E2E_LOG_DIR so every node of
-            // the run, including the seed node, logs into the same directory.
-            let path = directory.join(format!("node-{node_idx}.log"));
-            if cluster.node_capture_log_paths[node_idx].as_deref() != Some(path.to_string_lossy().as_ref()) {
-                cluster.set_node_capture_log_path(node_idx, path.to_string_lossy().into_owned())?;
-            }
-        }
-        return Ok(());
-    }
+fn configure_node_logs(cluster: &mut RustFSTestClusterEnvironment) -> TestResult {
     let Some(log_dir) = std::env::var_os("RUSTFS_E2E_LOG_DIR") else {
         return Ok(());
     };
@@ -691,50 +656,13 @@ pub(crate) async fn wait_for_replicated_bytes(
     .await
 }
 
-/// Quota stats for `bucket` from every node at once. Each node answers from
-/// its own cached copy of the persisted usage snapshot, and only the scanner
-/// leader's save invalidates that copy. Leadership goes to whichever node
-/// starts its scanner first, so a probe pinned to one node can wait out the
-/// whole cache TTL on a node that never saves.
-pub(crate) async fn quota_stats_on_every_node(
-    cluster: &RustFSTestClusterEnvironment,
-    bucket: &str,
-) -> TestResult<Vec<(StatusCode, String)>> {
-    let path = format!("/rustfs/admin/v3/quota-stats/{bucket}");
-    try_join_all(
-        cluster
-            .nodes
-            .iter()
-            .map(|node| admin_request(&node.url, Method::GET, &path, None, &cluster.access_key, &cluster.secret_key)),
-    )
-    .await
-}
-
-/// `current_usage` from a quota-stats body. `None` means the node has no
-/// scanner usage for the bucket yet: a quota admitted by the reservation
-/// ledger reports `null` rather than a guess.
-pub(crate) fn quota_stats_current_usage(body: &str) -> TestResult<Option<u64>> {
-    let stats: serde_json::Value =
-        serde_json::from_str(body).map_err(|error| format!("quota stats returned invalid JSON: {error}: {body}"))?;
-    match stats.get("current_usage") {
-        Some(serde_json::Value::Null) => Ok(None),
-        Some(usage) => Ok(Some(
-            usage
-                .as_u64()
-                .ok_or_else(|| format!("quota stats current_usage is not a byte count: {stats}"))?,
-        )),
-        None => Err(format!("quota stats omitted current_usage: {stats}").into()),
-    }
-}
-
 pub(crate) async fn set_bucket_quota(cluster: &RustFSTestClusterEnvironment, bucket: &str, quota_bytes: u64) -> TestResult {
     wait_until(
         Duration::from_secs(30),
         || async {
-            let stats = quota_stats_on_every_node(cluster, bucket).await?;
-            Ok(stats
-                .iter()
-                .any(|(status, _)| status.is_success() || *status == StatusCode::NOT_FOUND))
+            let (status, _) =
+                cluster_admin(cluster, Method::GET, &format!("/rustfs/admin/v3/quota-stats/{bucket}"), None).await?;
+            Ok(status.is_success() || status == StatusCode::NOT_FOUND)
         },
         "quota stats ready",
     )
@@ -758,44 +686,23 @@ pub(crate) async fn set_bucket_quota(cluster: &RustFSTestClusterEnvironment, buc
     .await
 }
 
-/// The existing decommission cases wait up to 180 s for movement to finish; a
-/// start refused because a movement gate is busy is retried within the same budget.
-const DECOMMISSION_START_BUSY_BUDGET: Duration = Duration::from_secs(180);
-const DECOMMISSION_START_PROOF_BUDGET: Duration = Duration::from_secs(45);
-
 /// Start decommission and fail closed unless the admin API acknowledges it.
 pub(crate) async fn start_decommission(cluster: &RustFSTestClusterEnvironment, pool_id: usize) -> TestResult {
     let path = format!("/rustfs/admin/v3/pools/decommission?pool={pool_id}&by-id=true");
-    post_decommission_start(cluster, &path, DECOMMISSION_START_BUSY_BUDGET).await?;
-    Ok(())
-}
-
-/// POST a decommission start and return the response body. A start that meets
-/// a busy movement gate answers a retryable 503 and is retried within
-/// `busy_budget`; the init stage's missing fleet capability proof (500) is
-/// retried for 45 s. Every other status is fatal.
-pub(crate) async fn post_decommission_start(
-    cluster: &RustFSTestClusterEnvironment,
-    path: &str,
-    busy_budget: Duration,
-) -> TestResult<String> {
-    let started = Instant::now();
-    let mut delay = Duration::from_millis(250);
+    let deadline = Instant::now() + Duration::from_secs(45);
     loop {
-        let (status, response) = cluster_admin(cluster, Method::POST, path, None).await?;
+        let (status, response) = cluster_admin(cluster, Method::POST, &path, None).await?;
         if status.is_success() {
-            return Ok(response);
+            return Ok(());
         }
-        let elapsed = started.elapsed();
-        let busy = status == StatusCode::SERVICE_UNAVAILABLE && elapsed < busy_budget;
-        let awaiting_proof = status == StatusCode::INTERNAL_SERVER_ERROR
+        if status == StatusCode::INTERNAL_SERVER_ERROR
             && response.contains("requires a live fleet capability proof")
-            && elapsed < DECOMMISSION_START_PROOF_BUDGET;
-        if !busy && !awaiting_proof {
-            return Err(format!("POST {path} did not start decommission: {status} {response}").into());
+            && Instant::now() < deadline
+        {
+            sleep(Duration::from_secs(1)).await;
+            continue;
         }
-        sleep(delay).await;
-        delay = (delay * 2).min(Duration::from_secs(2));
+        return Err(format!("POST {path} did not start decommission: {status} {response}").into());
     }
 }
 
@@ -978,21 +885,6 @@ pub(crate) async fn rebalance_status_json(cluster: &RustFSTestClusterEnvironment
     Ok(serde_json::from_str(&body)?)
 }
 
-/// Mirrors `REBALANCE_DEFERRED_ENTRY_ERROR_PREFIX` in `crates/ecstore/src/services/rebalance`.
-const REBALANCE_DEFERRED_ENTRY_ERROR_PREFIX: &str = "deferred transient rebalance entry failure:";
-
-/// A transient entry failure (for example a write quorum miss on a busy
-/// target) is recorded as `lastError` and retried at the end of the run; the
-/// worker clears it when the pool completes. It is only acceptable while the
-/// pool is still started: a terminal pool keeping it is a real failure.
-fn is_retrying_deferred_rebalance_error(pool: &serde_json::Value, error: &str) -> bool {
-    error.starts_with(REBALANCE_DEFERRED_ENTRY_ERROR_PREFIX)
-        && pool
-            .get("status")
-            .and_then(serde_json::Value::as_str)
-            .is_some_and(|status| status.eq_ignore_ascii_case("started"))
-}
-
 fn validate_rebalance_status<'a>(status: &'a serde_json::Value, expected_id: &str) -> TestResult<&'a [serde_json::Value]> {
     let id = status
         .get("id")
@@ -1020,7 +912,7 @@ fn validate_rebalance_status<'a>(status: &'a serde_json::Value, expected_id: &st
         if pool
             .get("lastError")
             .and_then(serde_json::Value::as_str)
-            .is_some_and(|error| !error.is_empty() && !is_retrying_deferred_rebalance_error(pool, error))
+            .is_some_and(|error| !error.is_empty())
         {
             return Err(format!("rebalance reported lastError: {status}").into());
         }
@@ -1181,16 +1073,11 @@ pub(crate) async fn retrying_get_equals(
                 )
                 .into()),
                 Err(error) => {
-                    let retryable = match s3_probe_error_code(error.as_ref()) {
-                        Some("SlowDown" | "ServiceUnavailable") => true,
-                        // GET preserves this compatibility code for a lost data quorum.
-                        Some("SlowDownRead") => error
-                            .downcast_ref::<SdkError<GetObjectError>>()
-                            .and_then(SdkError::raw_response)
-                            .is_some_and(|response| response.status().as_u16() == 503),
-                        _ => false,
-                    };
-                    if retryable { Ok(false) } else { Err(error) }
+                    if matches!(s3_probe_error_code(error.as_ref()), Some("SlowDown" | "ServiceUnavailable")) {
+                        Ok(false)
+                    } else {
+                        Err(error)
+                    }
                 }
             }
         },
@@ -1329,62 +1216,6 @@ mod retry_tests {
         Ok(())
     }
 
-    #[tokio::test(start_paused = true)]
-    async fn retrying_get_allows_read_quorum_recovery() -> TestResult {
-        use aws_sdk_s3::config::Region;
-        use aws_smithy_http_client::test_util::{ReplayEvent, StaticReplayClient};
-        use aws_smithy_types::body::SdkBody;
-
-        let endpoint = "http://read-quorum.example.invalid";
-        let event = |status: u16, body: &'static str| {
-            ReplayEvent::new(
-                http::Request::builder()
-                    .method(Method::GET)
-                    .uri(format!("{endpoint}/retry-probe/key?x-id=GetObject"))
-                    .body(SdkBody::empty())
-                    .expect("build replay request"),
-                http::Response::builder()
-                    .status(status)
-                    .header("content-type", "application/xml")
-                    .header("content-length", body.len())
-                    .body(SdkBody::from(body))
-                    .expect("build replay response"),
-            )
-        };
-        for status in [503, 403, 500] {
-            let transport = StaticReplayClient::new(vec![
-                event(status, "<Error><Code>SlowDownRead</Code></Error>"),
-                event(200, "expected bytes"),
-            ]);
-            let client = Client::from_conf(
-                aws_sdk_s3::Config::builder()
-                    .behavior_version_latest()
-                    .credentials_provider(Credentials::new(FAKE_ACCESS_KEY, FAKE_SECRET_KEY, None, None, "read-quorum-test"))
-                    .region(Region::new("us-east-1"))
-                    .endpoint_url(endpoint)
-                    .force_path_style(true)
-                    .retry_config(RetryConfig::disabled())
-                    .http_client(transport.clone())
-                    .build(),
-            );
-            let result = retrying_get_equals(&client, "retry-probe", "key", b"expected bytes", Duration::from_secs(5)).await;
-            if status == 503 {
-                result?;
-                assert_eq!(
-                    transport.actual_requests().count(),
-                    2,
-                    "the probe must retry the read-quorum error exactly once"
-                );
-                transport.assert_requests_match(&[]);
-            } else {
-                let error = result.expect_err("the compatibility code must not hide a non-503 failure");
-                assert_eq!(s3_probe_error_code(error.as_ref()), Some("SlowDownRead"));
-                assert_eq!(transport.actual_requests().count(), 1, "non-availability errors must fail immediately");
-            }
-        }
-        Ok(())
-    }
-
     #[tokio::test]
     async fn object_polls_distinguish_committed_and_replicated_keys() -> TestResult {
         let target = FakeS3Target::start().await?;
@@ -1428,29 +1259,6 @@ async fn append_single_node_pool_extends_ellipses_volumes() {
     assert!(volumes.contains("/drive{0...1}"), "expanded layout must keep drive ellipses: {volumes}");
 }
 
-#[tokio::test]
-async fn remove_single_node_pools_drops_retired_pools_and_renumbers() {
-    let mut env =
-        RustFSTestClusterEnvironment::with_topology(ClusterTopology::per_node_pools(2, vec![vec![0], vec![1], vec![2], vec![3]]))
-            .await
-            .expect("four-pool topology");
-    let kept: Vec<String> = env.nodes[2..].iter().map(|node| node.address.clone()).collect();
-
-    env.remove_single_node_pools(&[0, 1]).expect("remove two retired pools");
-    assert_eq!(env.nodes.len(), 2);
-    assert_eq!(env.nodes.iter().map(|node| node.address.clone()).collect::<Vec<_>>(), kept);
-    assert_eq!(env.nodes.iter().map(|node| node.pool_idx).collect::<Vec<_>>(), vec![0, 1]);
-    let volumes = env.rustfs_volumes_arg();
-    assert_eq!(volumes.split(' ').count(), 2, "expected two pool arguments, got: {volumes}");
-    assert!(
-        volumes.contains(&kept[0]) && volumes.contains(&kept[1]),
-        "retired pools must leave the command line: {volumes}"
-    );
-
-    env.remove_single_node_pools(&[0, 1])
-        .expect_err("the last remaining pool cannot be removed");
-}
-
 #[tokio::test]
 async fn append_single_node_pool_rejects_striped_single_pool() {
     let mut env = RustFSTestClusterEnvironment::new(4).await.expect("four-node single pool");
@@ -1604,23 +1412,3 @@ fn rebalance_complete_accepts_non_participating_pools_but_requires_progress() {
     });
     assert!(!rebalance_complete(&no_movement, "run-1").unwrap());
 }
-
-#[test]
-fn rebalance_status_tolerates_deferred_entry_error_only_while_started() {
-    let deferred = "deferred transient rebalance entry failure: Storage resources are insufficient for the write operation: b/k";
-    let mut status = serde_json::json!({
-        "id": "run-1",
-        "pools": [{ "id": 0, "status": "Started", "stopping": false, "lastError": deferred, "progress": { "objects": 1, "bytes": 1 } }]
-    });
-    assert!(rebalance_active(&status, "run-1").expect("a retried deferral keeps the run active"));
-
-    status["pools"][0]["status"] = serde_json::json!("Completed");
-    assert!(
-        rebalance_complete(&status, "run-1").is_err(),
-        "a completed pool must have cleared its deferred entry error"
-    );
-
-    status["pools"][0]["status"] = serde_json::json!("Started");
-    status["pools"][0]["lastError"] = serde_json::json!("rebalance entry failed: Storage resources are insufficient");
-    assert!(rebalance_active(&status, "run-1").is_err(), "a non-deferred lastError stays fatal");
-}

crates/e2e_test/src/distributed/internode_tls_test.rs

@@ -1,291 +0,0 @@
-// Copyright 2026 RustFS Team
-// Licensed under the Apache License, Version 2.0.
-
-use super::harness::{DistCluster, DistLayout, TestResult, unique_bucket};
-use crate::tls_gen;
-use aws_sdk_s3::{Client, config::retry::RetryConfig, primitives::ByteStream};
-use rand::{Rng, SeedableRng, rngs::StdRng};
-use sha2::{Digest, Sha256};
-use std::io::{Read, Seek, SeekFrom, Write};
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use std::time::{Duration, Instant};
-use tokio::task::JoinSet;
-
-const MIB: u64 = 1024 * 1024;
-const READ_TIMEOUT: Duration = Duration::from_secs(180);
-
-struct ExpectedRead {
-    range: Option<(u64, u64)>,
-    length: u64,
-    sha256: String,
-}
-
-struct ObjectFixture {
-    key: String,
-    path: PathBuf,
-    length: u64,
-    reads: Vec<ExpectedRead>,
-}
-
-fn fixture(directory: &Path, length: u64) -> TestResult<ObjectFixture> {
-    let key = format!("object-{length}");
-    let path = directory.join(&key);
-    let mut file = std::fs::File::create(&path)?;
-    let mut rng = StdRng::seed_from_u64(length);
-    let mut block = vec![0; usize::try_from(MIB)?];
-    let mut remaining = length;
-    let mut digest = Sha256::new();
-    while remaining != 0 {
-        let count = usize::try_from(remaining.min(MIB))?;
-        rng.fill_bytes(&mut block[..count]);
-        file.write_all(&block[..count])?;
-        digest.update(&block[..count]);
-        remaining -= u64::try_from(count)?;
-    }
-    drop(file);
-    let mut reads = vec![ExpectedRead {
-        range: None,
-        length,
-        sha256: hex_simd::encode_to_string(digest.finalize(), hex_simd::AsciiCase::Lower),
-    }];
-    // Unaligned ranges cross TLS frames and EC blocks; the tail detects
-    // truncation and incorrect range offsets independently of a full GET.
-    for (start, end) in [(17, (MIB + 31).min(length - 1)), (length.saturating_sub(65537), length - 1)] {
-        let mut input = std::fs::File::open(&path)?;
-        input.seek(SeekFrom::Start(start))?;
-        let range_length = end - start + 1;
-        let mut hasher = Sha256::new();
-        let mut input = input.take(range_length);
-        loop {
-            let count = input.read(&mut block)?;
-            if count == 0 {
-                break;
-            }
-            hasher.update(&block[..count]);
-        }
-        reads.push(ExpectedRead {
-            range: Some((start, end)),
-            length: range_length,
-            sha256: hex_simd::encode_to_string(hasher.finalize(), hex_simd::AsciiCase::Lower),
-        });
-    }
-    Ok(ObjectFixture {
-        key,
-        path,
-        length,
-        reads,
-    })
-}
-
-async fn verified_get(
-    client: &Client,
-    node: usize,
-    bucket: &str,
-    object: &ObjectFixture,
-    expected: &ExpectedRead,
-    concurrent: bool,
-) -> TestResult<serde_json::Value> {
-    let started = Instant::now();
-    let mut received = 0u64;
-    let mut stage = "response headers";
-    tokio::time::timeout(READ_TIMEOUT, async {
-        let mut request = client.get_object().bucket(bucket).key(&object.key);
-        if let Some((start, end)) = expected.range {
-            request = request.range(format!("bytes={start}-{end}"));
-        }
-        let mut output = request.send().await?;
-        assert_eq!(output.content_length(), Some(i64::try_from(expected.length)?));
-        if let Some((start, end)) = expected.range {
-            assert_eq!(output.content_range(), Some(format!("bytes {start}-{end}/{}", object.length).as_str()));
-        } else {
-            assert_eq!(output.content_range(), None);
-        }
-        stage = "response body";
-        let mut digest = Sha256::new();
-        while let Some(chunk) = output.body.next().await {
-            let chunk = chunk.inspect_err(|error| {
-                eprintln!(
-                    "TLS acceptance: GET body failed: node={node}, key={}, range={:?}, concurrent={concurrent}, received={received}/{}, elapsed={:?}, error={error}",
-                    object.key, expected.range, expected.length, started.elapsed()
-                );
-            })?;
-            received += u64::try_from(chunk.len())?;
-            assert!(received <= expected.length, "node {node}: GET exceeded the requested length");
-            digest.update(&chunk);
-        }
-        let actual_sha256 = hex_simd::encode_to_string(digest.finalize(), hex_simd::AsciiCase::Lower);
-        assert_eq!(received, expected.length, "node {node}: truncated GET {}", object.key);
-        assert_eq!(actual_sha256, expected.sha256, "node {node}: corrupt GET {}", object.key);
-        eprintln!(
-            "TLS acceptance: GET node={node}, key={}, range={:?}, concurrent={concurrent}, bytes={received}, elapsed={:?}",
-            object.key, expected.range, started.elapsed()
-        );
-        Ok(serde_json::json!({
-            "operation": "get", "node": node, "key": object.key,
-            "range": expected.range, "bytes": received, "sha256": actual_sha256,
-            "concurrent": concurrent, "elapsed_ms": started.elapsed().as_secs_f64() * 1000.0,
-        }))
-    })
-    .await
-    .map_err(|error| {
-        std::io::Error::new(
-            std::io::ErrorKind::TimedOut,
-            format!(
-                "TLS GET timed out: node={node}, key={}, range={:?}, concurrent={concurrent}, stage={stage}, received={received}/{}, elapsed={:?}: {error}",
-                object.key, expected.range, expected.length, started.elapsed()
-            ),
-        )
-    })?
-}
-
-/// This case always exercises the full acceptance sizes; do not substitute
-/// tiny objects and count that as a large distributed-read pass.
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn four_node_tls_large_and_range_gets_preserve_bytes() -> TestResult {
-    let mode = std::env::var("RUSTFS_E2E_INTERNODE_HTTP_MODE").unwrap_or_else(|_| "http1".into());
-    let protocol = match mode.as_str() {
-        "http1" => "http1",
-        "auto" | "unpooled" => "auto",
-        _ => return Err("RUSTFS_E2E_INTERNODE_HTTP_MODE must be http1, auto or unpooled".into()),
-    };
-    let mut dist = DistCluster::new_stopped_with_env(
-        DistLayout::FourByFour,
-        &[
-            ("RUSTFS_INTERNODE_HTTP_PROTOCOL", protocol),
-            ("RUSTFS_SCANNER_ENABLED", "true"),
-            ("RUSTFS_SCANNER_START_DELAY_SECS", "0"),
-            ("RUSTFS_SCANNER_CYCLE", "1"),
-            ("RUSTFS_HEAL_ENABLED", "true"),
-            ("RUST_LOG", "warn"),
-        ],
-    )
-    .await?;
-    if mode == "unpooled" {
-        dist.cluster.set_env("RUSTFS_INTERNODE_HTTP_POOL_MAX_IDLE_PER_HOST", "0");
-    }
-    let directory = PathBuf::from(&dist.cluster.temp_dir);
-    let tls_directory = directory.join("tls");
-    tls_gen::run(tls_gen::Args {
-        out_dir: tls_directory.clone(),
-        days: 1,
-        force: false,
-    })?;
-    dist.cluster.enable_tls(&tls_directory).await?;
-    let report_path = std::env::var_os("RUSTFS_INTERNODE_ACCEPTANCE_REPORT").map(PathBuf::from);
-    if let Some(path) = &report_path
-        && (path.exists() || path.with_extension("pids.json").exists())
-    {
-        return Err("acceptance report paths must be unused".into());
-    }
-    let log_directory = report_path.as_ref().map_or_else(
-        || {
-            std::env::var_os("RUSTFS_E2E_LOG_DIR")
-                .map_or_else(|| directory.join("logs"), |root| PathBuf::from(root).join(unique_bucket("internode-tls")))
-        },
-        |path| path.with_extension("logs"),
-    );
-    std::fs::create_dir(&log_directory)?;
-    dist.capture_logs_under(&log_directory)?;
-    dist.cluster.start().await?;
-    let clients = dist
-        .clients()?
-        .into_iter()
-        .map(|client| Client::from_conf(client.config().to_builder().retry_config(RetryConfig::disabled()).build()))
-        .collect::<Vec<_>>();
-    let bucket = unique_bucket("internode-tls");
-    clients[0].create_bucket().bucket(&bucket).send().await?;
-    let pids = dist
-        .cluster
-        .nodes
-        .iter()
-        .map(|node| node.process.as_ref().map(std::process::Child::id))
-        .collect::<Vec<_>>();
-    if let Some(path) = &report_path {
-        std::fs::write(path.with_extension("pids.json"), serde_json::to_vec(&pids)?)?;
-    }
-
-    let mut results = Vec::new();
-    for length in [32 * 1024, 100 * MIB, 1024 * MIB] {
-        let fixture_directory = directory.clone();
-        let object = Arc::new(tokio::task::spawn_blocking(move || fixture(&fixture_directory, length)).await??);
-        eprintln!("TLS acceptance: fixture key={}, bytes={length}", object.key);
-        let started = Instant::now();
-        tokio::time::timeout(
-            READ_TIMEOUT,
-            clients[0]
-                .put_object()
-                .bucket(&bucket)
-                .key(&object.key)
-                .body(ByteStream::from_path(&object.path).await?)
-                .send(),
-        )
-        .await
-        .map_err(|error| {
-            std::io::Error::new(
-                std::io::ErrorKind::TimedOut,
-                format!(
-                    "TLS PUT timed out: key={}, bytes={length}, elapsed={:?}: {error}",
-                    object.key,
-                    started.elapsed()
-                ),
-            )
-        })??;
-        eprintln!("TLS acceptance: PUT key={}, bytes={length}, elapsed={:?}", object.key, started.elapsed());
-        results.push(
-            serde_json::json!({"operation": "put", "bytes": length, "elapsed_ms": started.elapsed().as_secs_f64() * 1000.0}),
-        );
-        if length == 32 * 1024 {
-            let alternate = dist.client_with_credentials(0, &dist.cluster.access_key, &dist.cluster.secret_key)?;
-            let alternate = Client::from_conf(alternate.config().to_builder().retry_config(RetryConfig::disabled()).build());
-            results.push(verified_get(&alternate, 0, &bucket, &object, &object.reads[0], false).await?);
-            let invalid = dist.client_with_credentials(0, "invalid-tls-user", "invalid-tls-secret-password")?;
-            let invalid = Client::from_conf(invalid.config().to_builder().retry_config(RetryConfig::disabled()).build());
-            let denied = invalid
-                .list_buckets()
-                .send()
-                .await
-                .expect_err("alternate credentials must not inherit the root identity");
-            assert_eq!(denied.raw_response().map(|response| response.status().as_u16()), Some(403));
-        }
-        for expected in &object.reads {
-            for (node, client) in clients.iter().enumerate() {
-                results.push(verified_get(client, node, &bucket, &object, expected, false).await?);
-            }
-        }
-        // Each reader owns a Tokio task and its cooperative budget. Polling
-        // every body and synchronous digest in one parent task can let an
-        // always-ready reader starve its siblings and their deadlines.
-        let mut readers = JoinSet::new();
-        for (node, client) in clients.iter().enumerate() {
-            let client = client.clone();
-            let bucket = bucket.clone();
-            let object = Arc::clone(&object);
-            readers.spawn(async move { verified_get(&client, node, &bucket, &object, &object.reads[0], true).await });
-        }
-        while let Some(result) = readers.join_next().await {
-            results.push(result??);
-        }
-        tokio::fs::remove_file(&object.path).await?;
-    }
-    for node in 0..clients.len() {
-        let log = tokio::fs::read_to_string(log_directory.join(format!("node-{node}.log"))).await?;
-        assert!(
-            !log.contains("internode body stalled"),
-            "node {node}: internode body stall during verified reads"
-        );
-    }
-    let report = serde_json::json!({
-        "schema": 1, "mode": mode, "tls_verified": true, "nodes": 4, "drives_per_node": 4,
-        "source_revision": env!("RUSTFS_E2E_BUILD_COMMIT"),
-        "source_dirty": env!("RUSTFS_E2E_BUILD_DIRTY"),
-        "scanner_enabled": true, "heal_enabled": true,
-        "scanner_progress_verified": false, "heal_progress_verified": false,
-        "results": results,
-    });
-    if let Some(path) = report_path {
-        std::fs::write(path, serde_json::to_vec_pretty(&report)?)?;
-    }
-    eprintln!("internode_tls_acceptance={report}");
-    Ok(())
-}

crates/e2e_test/src/distributed/mod.rs

@@ -26,20 +26,12 @@ mod expand_decommission_rebalance_test;
 mod extra_test;
 mod harness;
 mod heal_test;
-mod internode_tls_test;
-mod multipart_fence_acceptance_test;
-mod multipart_rpc_delay_test;
 mod object_lock_test;
 mod observability_test;
-mod publication_log;
 mod replication_delete_marker_test;
 mod replication_quota_test;
 mod s3_basic_test;
 mod s3_during_data_movement_test;
-mod scanner_heal_topology_fixture;
-mod scanner_heal_topology_test;
-mod scanner_heal_topology_tier_test;
 mod site_replication_test;
-mod table_catalog_test;
 mod upgrade_test;
 mod versioning_test;

crates/e2e_test/src/distributed/publication_log.rs

@@ -1,413 +0,0 @@
-// Copyright 2026 RustFS Team
-// SPDX-License-Identifier: Apache-2.0
-
-//! Follow the same append-only log files without rescanning previous JSON rows.
-
-use same_file::Handle;
-use serde::{Deserialize, Deserializer};
-use serde_json::Value;
-use std::fs::File;
-use std::io::{self, Read};
-use std::path::PathBuf;
-
-// Captured RPC spans already produce valid rows above 2 MiB. Keep complete
-// rows bounded independently from the much smaller selected-event history.
-const MAX_LINE_BYTES: usize = 4 << 20;
-const MAX_EVENTS: usize = 128;
-const MAX_EVENT_BYTES: usize = 1 << 20;
-
-fn invalid(reason: &'static str) -> io::Error {
-    io::Error::new(io::ErrorKind::InvalidData, reason)
-}
-
-#[derive(Default, Deserialize)]
-struct Selector {
-    #[serde(default)]
-    event: Value,
-    #[serde(default)]
-    op: Value,
-    #[serde(default)]
-    bucket: Value,
-    #[serde(default)]
-    object: Value,
-}
-
-impl Selector {
-    fn matches(&self, bucket: &str, object: &str) -> bool {
-        self.event.as_str() == Some("object_namespace_lock")
-            && self.op.as_str() == Some("data_movement_publication")
-            && self.bucket.as_str() == Some(bucket)
-            && self.object.as_str() == Some(object)
-    }
-}
-
-#[derive(Deserialize)]
-struct Probe {
-    #[serde(default)]
-    event: Value,
-    #[serde(default)]
-    op: Value,
-    #[serde(default)]
-    bucket: Value,
-    #[serde(default)]
-    object: Value,
-    // A present null is not a missing fields object. The old reader uses the
-    // root only when this key is absent, including for non-object JSON values.
-    #[serde(default, deserialize_with = "present_fields")]
-    fields: Option<Option<Selector>>,
-}
-
-fn present_fields<'de, D: Deserializer<'de>>(d: D) -> Result<Option<Option<Selector>>, D::Error> {
-    Option::<Selector>::deserialize(d).map(Some)
-}
-
-impl Probe {
-    fn matches(&self, bucket: &str, object: &str) -> bool {
-        match &self.fields {
-            Some(Some(fields)) => fields.matches(bucket, object),
-            Some(None) => false,
-            None => {
-                self.event.as_str() == Some("object_namespace_lock")
-                    && self.op.as_str() == Some("data_movement_publication")
-                    && self.bucket.as_str() == Some(bucket)
-                    && self.object.as_str() == Some(object)
-            }
-        }
-    }
-}
-
-fn select(line: &[u8], bucket: &str, object: &str, full_decodes: &mut u64) -> io::Result<Option<Value>> {
-    let text = std::str::from_utf8(line).map_err(|_| invalid("invalid UTF-8 in a completed log row"))?;
-    // Skip unknown fields without allocating a Value tree for every RPC trace.
-    // A shape/duplicate-field error falls back to the original Value parser;
-    // it must not discard valid escaped strings or last-key-wins JSON.
-    if let Ok(probe) = serde_json::from_str::<Probe>(text)
-        && !probe.matches(bucket, object)
-    {
-        return Ok(None);
-    }
-    *full_decodes += 1;
-    let Ok(row) = serde_json::from_str::<Value>(text) else {
-        return Ok(None);
-    };
-    let fields = row.get("fields").unwrap_or(&row);
-    if fields.get("event").and_then(Value::as_str) != Some("object_namespace_lock")
-        || fields.get("op").and_then(Value::as_str) != Some("data_movement_publication")
-        || fields.get("bucket").and_then(Value::as_str) != Some(bucket)
-        || fields.get("object").and_then(Value::as_str) != Some(object)
-    {
-        return Ok(None);
-    }
-    let mut event = fields.clone();
-    event["timestamp"] = row["timestamp"].clone();
-    Ok(Some(event))
-}
-
-struct Tail {
-    path: PathBuf,
-    handle: Handle,
-    offset: u64,
-    pending: Vec<u8>,
-}
-
-impl Tail {
-    fn open(path: PathBuf) -> io::Result<Self> {
-        let file = File::open(&path)?;
-        if !file.metadata()?.is_file() {
-            return Err(invalid("publication log is not a regular file"));
-        }
-        Ok(Self {
-            path,
-            handle: Handle::from_file(file)?,
-            offset: 0,
-            pending: Vec::new(),
-        })
-    }
-
-    fn check_identity(&self) -> io::Result<()> {
-        if Handle::from_path(&self.path)? != self.handle {
-            return Err(invalid("publication log file was replaced"));
-        }
-        Ok(())
-    }
-
-    fn poll(&mut self, bytes_read: &mut u64, mut accept: impl FnMut(&[u8]) -> io::Result<()>) -> io::Result<()> {
-        self.check_identity()?;
-        let end = self.handle.as_file().metadata()?.len();
-        if end < self.offset {
-            return Err(invalid("publication log file was truncated"));
-        }
-        // A fixed high-water snapshot bounds each poll even if writers append
-        // faster than the reader. Bytes after it remain for the next poll.
-        let mut chunk = [0_u8; 64 * 1024];
-        while self.offset < end {
-            let size = usize::try_from((end - self.offset).min(64 * 1024)).expect("a log chunk fits usize");
-            self.handle.as_file_mut().read_exact(&mut chunk[..size])?;
-            self.offset += u64::try_from(size).expect("a bounded log read fits u64");
-            *bytes_read += u64::try_from(size).expect("a bounded log read fits u64");
-            let appended_at = self.pending.len();
-            self.pending.extend_from_slice(&chunk[..size]);
-            let mut start = 0;
-            for end in self.pending[appended_at..]
-                .iter()
-                .enumerate()
-                .filter_map(|(i, byte)| (*byte == b'\n').then_some(appended_at + i + 1))
-            {
-                if end - start > MAX_LINE_BYTES {
-                    return Err(invalid("publication log row exceeds its fixed bound"));
-                }
-                accept(&self.pending[start..end])?;
-                start = end;
-            }
-            self.pending.drain(..start);
-            if self.pending.len() > MAX_LINE_BYTES {
-                return Err(invalid("unfinished publication log row exceeds its fixed bound"));
-            }
-        }
-        self.check_identity()
-    }
-}
-
-pub(super) struct PublicationEvents {
-    tails: Vec<Tail>,
-    bucket: String,
-    object: String,
-    events: Vec<Value>,
-    per_file: Vec<Vec<Value>>,
-    event_count: usize,
-    event_bytes: usize,
-    bytes_read: u64,
-    full_decodes: u64,
-    failed: bool,
-}
-
-impl PublicationEvents {
-    pub(super) fn new(paths: Vec<PathBuf>, bucket: &str, object: &str) -> io::Result<Self> {
-        if paths.is_empty() || paths.len() > 4 {
-            return Err(invalid("publication capture requires one to four log files"));
-        }
-        let tails: Vec<Tail> = paths.into_iter().map(Tail::open).collect::<io::Result<_>>()?;
-        let mut reader = Self {
-            per_file: vec![Vec::new(); tails.len()],
-            tails,
-            bucket: bucket.to_owned(),
-            object: object.to_owned(),
-            events: Vec::new(),
-            event_bytes: 0,
-            event_count: 0,
-            bytes_read: 0,
-            full_decodes: 0,
-            failed: false,
-        };
-        // Prime before holding remote DELETE or starting a movement attempt.
-        // Retain earlier matching events too: the caller still applies its
-        // original timestamp boundary, and evidence keeps the complete history.
-        reader.poll()?;
-        Ok(reader)
-    }
-
-    pub(super) fn poll(&mut self) -> io::Result<&[Value]> {
-        if self.failed {
-            return Err(invalid("publication log reader was already invalidated"));
-        }
-        let result = (|| {
-            for (tail, history) in self.tails.iter_mut().zip(&mut self.per_file) {
-                tail.poll(&mut self.bytes_read, |line| {
-                    if let Some(event) = select(line, &self.bucket, &self.object, &mut self.full_decodes)? {
-                        let bytes = serde_json::to_vec(&event).map_err(io::Error::other)?.len();
-                        if self.event_count >= MAX_EVENTS || bytes > MAX_EVENT_BYTES - self.event_bytes {
-                            return Err(invalid("publication event history exceeds its fixed bound"));
-                        }
-                        self.event_bytes += bytes;
-                        self.event_count += 1;
-                        history.push(event);
-                    }
-                    Ok(())
-                })?;
-            }
-            Ok(())
-        })();
-        // Preserve the old file-then-row order, even when a later poll appends
-        // to an earlier file. Only bounded selected history is copied here.
-        self.events = self.per_file.iter().flatten().cloned().collect();
-        if let Err(error) = result {
-            self.failed = true;
-            return Err(error);
-        }
-        Ok(&self.events)
-    }
-
-    /// Diagnostics only: after a read error this history can be incomplete.
-    pub(super) fn cached(&self) -> &[Value] {
-        &self.events
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-    use std::io::Write;
-
-    fn event(id: &str) -> Value {
-        json!({"timestamp":"2026-10-26T00:00:00Z","event":"object_namespace_lock","op":"data_movement_publication","bucket":"bucket","object":"object","lock_attempt_id":id,"state":"acquiring","extra":{"kept":[1,2]}})
-    }
-    fn append(path: &std::path::Path, raw: &[u8]) {
-        std::fs::OpenOptions::new()
-            .append(true)
-            .open(path)
-            .expect("open append log")
-            .write_all(raw)
-            .expect("append log bytes");
-    }
-    fn legacy(raw: &[u8]) -> Vec<Value> {
-        std::str::from_utf8(raw)
-            .expect("fixture UTF-8")
-            .lines()
-            .filter_map(|line| {
-                let row: Value = serde_json::from_str(line).ok()?;
-                let fields = row.get("fields").unwrap_or(&row);
-                if fields.get("event").and_then(Value::as_str) == Some("object_namespace_lock")
-                    && fields.get("op").and_then(Value::as_str) == Some("data_movement_publication")
-                    && fields.get("bucket").and_then(Value::as_str) == Some("bucket")
-                    && fields.get("object").and_then(Value::as_str) == Some("object")
-                {
-                    let mut result = fields.clone();
-                    result["timestamp"] = row["timestamp"].clone();
-                    Some(result)
-                } else {
-                    None
-                }
-            })
-            .collect()
-    }
-
-    #[test]
-    fn appended_events_keep_full_fields_without_history_rescans() {
-        let file = tempfile::NamedTempFile::new().expect("log file");
-        let mut raw = (json!({"message":"unrelated trace","payload":"x".repeat(4096)}).to_string() + "\n")
-            .repeat(64)
-            .into_bytes();
-        raw.extend_from_slice(
-            format!("{}\n", json!({"event":"object_namespace_lock","op":"get_object","bucket":"bucket","object":"object","spans":"x".repeat(2401832)})).as_bytes(),
-        );
-        raw.extend_from_slice(format!("{}\n", event("first")).as_bytes());
-        std::fs::write(file.path(), &raw).expect("seed log");
-        let mut reader = PublicationEvents::new(vec![file.path().to_owned()], "bucket", "object").expect("prime log");
-        assert_eq!(reader.cached(), legacy(&raw));
-        assert_eq!(reader.full_decodes, 1);
-        let bytes = reader.bytes_read;
-        assert_eq!(reader.poll().expect("unchanged poll"), legacy(&raw));
-        assert_eq!(reader.bytes_read, bytes);
-        let next = format!("{}\n", event("second"));
-        append(file.path(), next.as_bytes());
-        raw.extend_from_slice(next.as_bytes());
-        assert_eq!(reader.poll().expect("new rows"), legacy(&raw));
-        assert_eq!(reader.bytes_read, u64::try_from(raw.len()).expect("fixture length"));
-        assert_eq!(reader.full_decodes, 2);
-    }
-
-    #[test]
-    fn later_appends_preserve_the_old_file_then_row_order() {
-        let first = tempfile::NamedTempFile::new().expect("first log");
-        let second = tempfile::NamedTempFile::new().expect("second log");
-        std::fs::write(first.path(), format!("{}\n", event("a1"))).expect("seed first");
-        std::fs::write(second.path(), format!("{}\n", event("b1"))).expect("seed second");
-        let mut reader = PublicationEvents::new(vec![first.path().to_owned(), second.path().to_owned()], "bucket", "object")
-            .expect("prime both");
-        append(first.path(), format!("{}\n", event("a2")).as_bytes());
-        let mut expected = legacy(&std::fs::read(first.path()).expect("first bytes"));
-        expected.extend(legacy(&std::fs::read(second.path()).expect("second bytes")));
-        assert_eq!(reader.poll().expect("append first after second was read"), expected);
-    }
-
-    #[test]
-    fn root_nested_escaped_and_duplicate_fields_match_the_old_reader() {
-        let file = tempfile::NamedTempFile::new().expect("log file");
-        let root = event("root");
-        let mut nested = json!({"timestamp":root["timestamp"],"fields":root});
-        nested["fields"]["extra"] = json!({"unicode":"é"});
-        let null = json!({"fields":null,"event":"object_namespace_lock","op":"data_movement_publication","bucket":"bucket","object":"object"});
-        let escaped = root
-            .to_string()
-            .replace("object_namespace_lock", "\\u006fbject_namespace_lock");
-        let duplicate = root.to_string().replacen("{", "{\"event\":\"earlier-value\",", 1);
-        let raw = format!("{root}\n{nested}\n{null}\n{escaped}\n{duplicate}\nnot json\n{{\"fields\":[]}}\n");
-        std::fs::write(file.path(), &raw).expect("mixed log");
-        let reader = PublicationEvents::new(vec![file.path().to_owned()], "bucket", "object").expect("probe and fallback");
-        assert_eq!(reader.cached(), legacy(raw.as_bytes()));
-        assert_eq!(reader.cached().len(), 4);
-    }
-
-    #[test]
-    fn incomplete_rows_and_split_utf8_wait_for_the_newline() {
-        let file = tempfile::NamedTempFile::new().expect("log file");
-        let mut row = event("partial");
-        row["extra"] = json!("é");
-        let raw = format!("{row}\n").into_bytes();
-        let cut = raw.iter().position(|b| *b == 0xc3).expect("UTF-8 prefix") + 1;
-        std::fs::write(file.path(), &raw[..cut]).expect("partial code point");
-        let mut reader =
-            PublicationEvents::new(vec![file.path().to_owned()], "bucket", "object").expect("incomplete row is pending");
-        assert!(reader.cached().is_empty());
-        append(file.path(), &raw[cut..raw.len() - 1]);
-        assert!(reader.poll().expect("complete JSON without delimiter").is_empty());
-        append(file.path(), b"\n");
-        assert_eq!(reader.poll().expect("published row"), legacy(&raw));
-    }
-
-    #[test]
-    fn truncation_is_sticky_even_after_the_file_grows_again() {
-        let file = tempfile::NamedTempFile::new().expect("log file");
-        std::fs::write(file.path(), format!("{}\n", event("first"))).expect("seed log");
-        let mut reader = PublicationEvents::new(vec![file.path().to_owned()], "bucket", "object").expect("prime log");
-        file.as_file().set_len(0).expect("truncate");
-        assert!(reader.poll().is_err());
-        append(file.path(), format!("{}\n", event("longer replacement")).as_bytes());
-        assert!(reader.poll().is_err());
-        assert_eq!(reader.cached().len(), 1);
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn a_replaced_path_does_not_switch_to_the_new_log() {
-        let dir = tempfile::tempdir().expect("log dir");
-        let path = dir.path().join("node.log");
-        std::fs::write(&path, b"").expect("log file");
-        let mut reader = PublicationEvents::new(vec![path.clone()], "bucket", "object").expect("open log");
-        std::fs::rename(&path, dir.path().join("retired.log")).expect("replace log");
-        std::fs::write(&path, format!("{}\n", event("other-generation"))).expect("replacement");
-        assert!(reader.poll().is_err());
-        assert!(reader.cached().is_empty());
-    }
-
-    #[test]
-    fn invalid_utf8_and_oversized_or_excessive_records_fail_closed() {
-        let file = tempfile::NamedTempFile::new().expect("log file");
-        let mut reader = PublicationEvents::new(vec![file.path().to_owned()], "bucket", "object").expect("empty log");
-        append(file.path(), b"\xff\n");
-        assert!(reader.poll().is_err());
-        let file = tempfile::NamedTempFile::new().expect("log file");
-        let mut reader = PublicationEvents::new(vec![file.path().to_owned()], "bucket", "object").expect("empty log");
-        append(file.path(), &vec![b'x'; MAX_LINE_BYTES + 1]);
-        assert!(reader.poll().is_err());
-        let file = tempfile::NamedTempFile::new().expect("log file");
-        let mut reader = PublicationEvents::new(vec![file.path().to_owned()], "bucket", "object").expect("empty log");
-        for _ in 0..=MAX_EVENTS {
-            append(file.path(), format!("{}\n", event("attempt")).as_bytes());
-        }
-        assert!(reader.poll().is_err());
-        assert_eq!(reader.cached().len(), MAX_EVENTS);
-        assert!(reader.poll().is_err());
-        let file = tempfile::NamedTempFile::new().expect("log file");
-        let mut reader = PublicationEvents::new(vec![file.path().to_owned()], "bucket", "object").expect("empty log");
-        let mut large = event("large");
-        large["extra"] = json!("x".repeat(600 * 1024));
-        for _ in 0..2 {
-            append(file.path(), format!("{large}\n").as_bytes());
-        }
-        assert!(reader.poll().is_err());
-        assert_eq!(reader.cached().len(), 1);
-        assert!(reader.poll().is_err());
-    }
-}

crates/e2e_test/src/distributed/replication_quota_test.rs

@@ -13,14 +13,13 @@
 // limitations under the License.
 
 use super::harness::{
-    DistCluster, DistLayout, TestResult, cluster_admin_ok, enable_versioning, put_bucket_replication, put_object,
-    quota_stats_current_usage, quota_stats_on_every_node, retrying_put, set_bucket_quota, set_remote_target, unique_bucket,
-    wait_for_ready, wait_for_replicated_bytes, wait_until,
+    DistCluster, DistLayout, TestResult, enable_versioning, put_bucket_replication, put_object, retrying_put, set_bucket_quota,
+    set_remote_target, unique_bucket, wait_for_ready, wait_for_replicated_bytes, wait_until,
 };
-use crate::common::{FAST_DATA_USAGE_SCANNER_ENV, admin_request, init_logging};
+use crate::common::{FAST_DATA_USAGE_SCANNER_ENV, init_logging};
 use aws_sdk_s3::error::ProvideErrorMetadata;
 use aws_sdk_s3::primitives::ByteStream;
-use http::{Method, StatusCode};
+use http::Method;
 use std::time::Duration;
 
 async fn wait_for_replication_status(
@@ -110,165 +109,12 @@ async fn four_node_bucket_replication_converges_to_peer_cluster() -> TestResult
     Ok(())
 }
 
-#[tokio::test]
-async fn four_node_quota_changes_refresh_peers_before_response() -> TestResult {
-    init_logging();
-    let mut dist = DistCluster::start(DistLayout::FourByFour).await?;
-    let bucket = unique_bucket("quota-refresh");
-    dist.create_bucket(&bucket).await?;
-    let native_path = format!("/rustfs/admin/v3/quota/{bucket}");
-    let compat_set = format!("/rustfs/admin/v3/set-bucket-quota?bucket={bucket}");
-    let compat_get = format!("/rustfs/admin/v3/get-bucket-quota?bucket={bucket}");
-
-    // Warm every node's no-quota cache. The compatibility GET does not
-    // depend on a scanner usage snapshot for this newly created bucket.
-    for node in &dist.cluster.nodes {
-        let (status, body) = admin_request(
-            &node.url,
-            Method::GET,
-            &compat_get,
-            None,
-            &dist.cluster.access_key,
-            &dist.cluster.secret_key,
-        )
-        .await?;
-        assert_eq!(status, StatusCode::OK, "{body}");
-        assert_eq!(serde_json::from_str::<serde_json::Value>(&body)?["quota"], 0);
-    }
-    wait_until(
-        Duration::from_secs(30),
-        || async {
-            let (status, body) = admin_request(
-                &dist.cluster.nodes[0].url,
-                Method::PUT,
-                &native_path,
-                Some(serde_json::json!({"quota": 8192, "quota_type": "HARD"}).to_string()),
-                &dist.cluster.access_key,
-                &dist.cluster.secret_key,
-            )
-            .await?;
-            if status == StatusCode::SERVICE_UNAVAILABLE {
-                return Ok(false);
-            }
-            assert_eq!(status, StatusCode::OK, "{body}");
-            Ok(true)
-        },
-        "quota fleet capability ready",
-    )
-    .await?;
-
-    for (method, path, payload, expected) in [
-        (Method::GET, native_path.as_str(), None, Some(8192_u64)),
-        (
-            Method::PUT,
-            native_path.as_str(),
-            Some(serde_json::json!({"quota": 4096, "quota_type": "HARD"})),
-            Some(4096),
-        ),
-        (Method::DELETE, native_path.as_str(), None, None),
-        (
-            Method::PUT,
-            compat_set.as_str(),
-            Some(serde_json::json!({"quota": 16384, "quotatype": "hard", "reservation_protocol": 2})),
-            Some(16384),
-        ),
-        (
-            Method::PUT,
-            compat_set.as_str(),
-            Some(serde_json::json!({"quota": 0, "quotatype": "hard"})),
-            None,
-        ),
-    ] {
-        if method != Method::GET {
-            cluster_admin_ok(&dist.cluster, method, path, payload.map(|value| value.to_string())).await?;
-        }
-        // No polling: a successful mutation waits for healthy peers to reload.
-        for (index, node) in dist.cluster.nodes.iter().enumerate() {
-            let (status, body) = admin_request(
-                &node.url,
-                Method::GET,
-                &compat_get,
-                None,
-                &dist.cluster.access_key,
-                &dist.cluster.secret_key,
-            )
-            .await?;
-            assert_eq!(status, StatusCode::OK, "node {index}: {body}");
-            assert_eq!(
-                serde_json::from_str::<serde_json::Value>(&body)?["quota"],
-                expected.unwrap_or(0),
-                "node {index} kept stale quota metadata",
-            );
-            if expected.is_some() {
-                let (status, body) = admin_request(
-                    &node.url,
-                    Method::GET,
-                    &native_path,
-                    None,
-                    &dist.cluster.access_key,
-                    &dist.cluster.secret_key,
-                )
-                .await?;
-                assert_eq!(status, StatusCode::OK, "node {index}: {body}");
-                assert_eq!(serde_json::from_str::<serde_json::Value>(&body)?["quota"].as_u64(), expected);
-            }
-        }
-    }
-
-    cluster_admin_ok(
-        &dist.cluster,
-        Method::PUT,
-        &native_path,
-        Some(serde_json::json!({"quota": 8192, "quota_type": "HARD"}).to_string()),
-    )
-    .await?;
-    dist.cluster.stop_node(3)?;
-    // An unreachable peer cannot turn an already committed clear into a failure.
-    cluster_admin_ok(&dist.cluster, Method::DELETE, &native_path, None).await?;
-    for node in dist.cluster.nodes.iter().take(3) {
-        let (status, body) = admin_request(
-            &node.url,
-            Method::GET,
-            &compat_get,
-            None,
-            &dist.cluster.access_key,
-            &dist.cluster.secret_key,
-        )
-        .await?;
-        assert_eq!(status, StatusCode::OK, "{body}");
-        assert_eq!(serde_json::from_str::<serde_json::Value>(&body)?["quota"], 0);
-    }
-    Ok(())
-}
-
 #[tokio::test]
 async fn four_node_four_drive_hard_quota_rejects_over_limit_put() -> TestResult {
     init_logging();
     let dist = DistCluster::start_with_env(DistLayout::FourByFour, FAST_DATA_USAGE_SCANNER_ENV).await?;
     let bucket = unique_bucket("quota");
     dist.create_bucket(&bucket).await?;
-    // A bucket without a quota reports usage only once a snapshot covers it.
-    // The scanner leader sees its own save at once; every other node holds a
-    // snapshot cached before the bucket existed and must reload it early
-    // rather than answer 503 for the rest of the 30 s cache TTL.
-    wait_until(
-        Duration::from_secs(30),
-        || async {
-            let stats = quota_stats_on_every_node(&dist.cluster, &bucket).await?;
-            Ok(stats.iter().any(|(status, _)| status.is_success()))
-        },
-        "first node reports quota stats for the new bucket",
-    )
-    .await?;
-    wait_until(
-        Duration::from_secs(15),
-        || async {
-            let stats = quota_stats_on_every_node(&dist.cluster, &bucket).await?;
-            Ok(stats.iter().all(|(status, _)| status.is_success()))
-        },
-        "every node reports quota stats for the new bucket",
-    )
-    .await?;
     set_bucket_quota(&dist.cluster, &bucket, 8 * 1024).await?;
 
     let client = dist.client(1)?;
@@ -276,12 +122,23 @@ async fn four_node_four_drive_hard_quota_rejects_over_limit_put() -> TestResult
     wait_until(
         Duration::from_secs(30),
         || async {
-            for (status, body) in quota_stats_on_every_node(&dist.cluster, &bucket).await? {
-                if status.is_success() && quota_stats_current_usage(&body)?.is_some_and(|usage| usage >= 1024) {
-                    return Ok(true);
-                }
+            let (status, body) = super::harness::cluster_admin(
+                &dist.cluster,
+                Method::GET,
+                &format!("/rustfs/admin/v3/quota-stats/{bucket}"),
+                None,
+            )
+            .await?;
+            if !status.is_success() {
+                return Ok(false);
             }
-            Ok(false)
+            let stats: serde_json::Value =
+                serde_json::from_str(&body).map_err(|error| format!("quota stats returned invalid JSON: {error}: {body}"))?;
+            let usage = stats
+                .get("current_usage")
+                .and_then(serde_json::Value::as_u64)
+                .ok_or_else(|| format!("quota stats omitted current_usage: {stats}"))?;
+            Ok(usage >= 1024)
         },
         "quota stats observe small object",
     )

crates/e2e_test/src/distributed/scanner_heal_topology_test.rs

@@ -1,761 +0,0 @@
-// 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.
-
-//! `scanner_heal_topology_` protection matrix (backlog#2873, S00).
-//!
-//! Every case seeds the deterministic inventory from the fixture into one
-//! pool, then drives expansion, rebalance or decommission while re-verifying
-//! the recorded versions through every node and the physical pool placement
-//! from `xl.meta`. Fault cases hold the mover at a proven window through the
-//! `e2e-test-hooks` barriers before injecting a kill or a commit failure. The
-//! gate mapping is documented in `docs/testing/scanner-heal-topology-gates.md`.
-
-use super::harness::unique_bucket;
-use super::harness::{
-    DECOMMISSION_POOL_ID, TestResult, decommission_status_json, rebalance_complete, rebalance_status_json, start_decommission,
-    start_rebalance, wait_for_decommission_active, wait_for_decommission_complete, wait_for_decommission_running_with_progress,
-    wait_for_rebalance_active, wait_for_rebalance_complete,
-};
-use super::scanner_heal_topology_fixture::{
-    LiveWorkload, MOVEMENT_ACTIVE_TIMEOUT, MOVEMENT_COMPLETE_TIMEOUT, MovementOperation, SEED_POOL,
-    STAGE_AFTER_RESPONSIBILITY_PERSISTED, STAGE_BEFORE_SOURCE_CLEANUP, STAGE_BEFORE_TARGET_COMMIT, TopologyManifest, TopologyRun,
-    assert_bucket_durability_strict, assert_every_node_serves, assert_probe_objects, assert_process_durability_strict,
-    assert_seed_pool_census_unchanged, assert_single_pool_placement, cancel_decommission, capture_seed_pool_census,
-    clear_decommission, expect_decommission_rejected, expected_live_state, incarnation_sidecar_census, pool_count, pools_holding,
-    put_probe_objects, rebalance_stopped, require_test_hooks, run_live_workload, seed_manifest, start_decommission_targets,
-    stop_rebalance, verify_from_every_node, verify_live_state, verify_manifest, wait_for_decommission_flag,
-};
-use crate::common::{admin_request, init_logging};
-use http::Method;
-use serde_json::{Value, json};
-use std::collections::BTreeSet;
-use std::time::Duration;
-use tokio::time::{Instant, sleep};
-
-const ALL_POOLS: [usize; 4] = [0, 1, 2, 3];
-const TARGET_POOLS: [usize; 3] = [1, 2, 3];
-const LIVE_WRITERS: usize = 6;
-const LIVE_ROUNDS: usize = 6;
-/// Locally the decommission start reaches its durable save in about a second
-/// (POST to response ~0.8 s); 60 s separates a stalled start path from slow I/O.
-const PRE_ACK_REACH_TIMEOUT: Duration = Duration::from_secs(60);
-/// Cancel and stop are acknowledged before every in-flight entry finishes its
-/// cleanup; terminal state and placement are polled within this budget.
-const TERMINAL_TRANSITION_TIMEOUT: Duration = Duration::from_secs(90);
-/// Recovery includes the fleet-proof retry before migration can resume. A
-/// healthy CI restart completed after 253 s while still making progress; keep
-/// this recovery budget below the distributed profile's 720 s process limit.
-const DECOMMISSION_RESUME_COMPLETE_TIMEOUT: Duration = Duration::from_secs(360);
-
-fn pools(ids: &[usize]) -> BTreeSet<usize> {
-    ids.iter().copied().collect()
-}
-
-fn seed_pool_sidecars(
-    census: &std::collections::BTreeMap<String, crate::chaos::VersionShardCensus>,
-) -> Vec<(&String, &crate::chaos::VersionShardCensus)> {
-    census
-        .iter()
-        .filter(|(location, _)| location.starts_with(&format!("{SEED_POOL}/")))
-        .collect()
-}
-
-/// Expansion and restart must leave the seed pool's sidecar census unchanged.
-fn assert_seed_sidecars_unchanged(run: &TopologyRun, manifest: &TopologyManifest, label: &str) -> TestResult {
-    for bucket in manifest.buckets() {
-        let now = incarnation_sidecar_census(&run.dist, bucket)?;
-        let before = &manifest.incarnation_sidecars[bucket];
-        if seed_pool_sidecars(&now) != seed_pool_sidecars(before) {
-            return Err(format!(
-                "{label}: bucket incarnation sidecar of {bucket} changed on the seed pool: before {before:?} now {now:?}"
-            )
-            .into());
-        }
-    }
-    Ok(())
-}
-
-/// After the seed pool is retired every bucket must keep its incarnation
-/// sidecar on at least one target pool.
-fn assert_sidecars_survive_on_targets(
-    run: &TopologyRun,
-    manifest: &TopologyManifest,
-    targets: &BTreeSet<usize>,
-    label: &str,
-) -> TestResult<Value> {
-    let mut summary = serde_json::Map::new();
-    for bucket in manifest.buckets() {
-        let now = incarnation_sidecar_census(&run.dist, bucket)?;
-        let on_targets: Vec<&String> = now
-            .keys()
-            .filter(|location| {
-                location
-                    .split('/')
-                    .next()
-                    .and_then(|pool| pool.parse::<usize>().ok())
-                    .is_some_and(|pool| targets.contains(&pool))
-            })
-            .collect();
-        if on_targets.is_empty() {
-            return Err(
-                format!("{label}: bucket {bucket} has no incarnation sidecar on target pools {targets:?}: {now:?}").into(),
-            );
-        }
-        summary.insert(bucket.to_string(), json!(on_targets));
-    }
-    Ok(Value::Object(summary))
-}
-
-fn manifest_summary(manifest: &TopologyManifest) -> Value {
-    let mut shapes = std::collections::BTreeMap::new();
-    for entry in &manifest.entries {
-        *shapes.entry(entry.shape).or_insert(0usize) += 1;
-    }
-    json!({
-        "buckets": manifest.buckets(),
-        "entries": manifest.entries.len(),
-        "keys": manifest.entries.iter().map(|entry| format!("{}/{}", entry.bucket, entry.key)).collect::<BTreeSet<_>>().len(),
-        "shapes": shapes,
-        "bytes": manifest.entries.iter().map(|entry| entry.length).sum::<u64>(),
-    })
-}
-
-fn timeouts() -> Value {
-    json!({
-        "movement_active_secs": MOVEMENT_ACTIVE_TIMEOUT.as_secs(),
-        "movement_complete_secs": MOVEMENT_COMPLETE_TIMEOUT.as_secs(),
-        "decommission_resume_complete_secs": DECOMMISSION_RESUME_COMPLETE_TIMEOUT.as_secs(),
-        "barrier_reach_secs": MOVEMENT_COMPLETE_TIMEOUT.as_secs(),
-        "terminal_transition_secs": TERMINAL_TRANSITION_TIMEOUT.as_secs(),
-    })
-}
-
-/// Cancel and stop acknowledge before every in-flight entry has finished its
-/// cleanup, so placement is polled until it settles within the terminal budget.
-async fn wait_for_single_pool_placement(
-    run: &TopologyRun,
-    manifest: &TopologyManifest,
-    allowed: &BTreeSet<usize>,
-    label: &str,
-) -> TestResult<std::collections::BTreeMap<String, usize>> {
-    let deadline = Instant::now() + TERMINAL_TRANSITION_TIMEOUT;
-    loop {
-        match assert_single_pool_placement(&run.dist, manifest, allowed, label) {
-            Ok(placement) => return Ok(placement),
-            Err(error) if Instant::now() < deadline => {
-                tracing::info!("{label}: placement not settled yet: {error}");
-                sleep(Duration::from_secs(1)).await;
-            }
-            Err(error) => return Err(error),
-        }
-    }
-}
-
-/// A stopped run may leave a committed target beside its retained source.
-/// Every version must still be held by at least one pool; returns the
-/// versions held by more than one.
-fn assert_held_by_some_pool(run: &TopologyRun, manifest: &TopologyManifest, label: &str) -> TestResult<Vec<String>> {
-    let mut duplicated = Vec::new();
-    for entry in &manifest.entries {
-        let held = pools_holding(&run.dist, &entry.bucket, &entry.key, entry.version_id.as_deref())?;
-        if held.is_empty() {
-            return Err(format!(
-                "{label}: {}/{} version {:?} is held by no pool",
-                entry.bucket, entry.key, entry.version_id
-            )
-            .into());
-        }
-        if held.len() > 1 {
-            duplicated.push(format!("{}/{}@{} {held:?}", entry.bucket, entry.key, entry.listed_version_id()));
-        }
-    }
-    Ok(duplicated)
-}
-
-async fn expand_and_verify(run: &mut TopologyRun, manifest: &TopologyManifest) -> TestResult {
-    run.dist.expand_to_four_pools().await?;
-    assert_eq!(pool_count(&run.dist.cluster).await?, 4, "expected four pools after expansion");
-    verify_from_every_node(&run.dist, manifest, "after expansion to four pools").await?;
-    assert_single_pool_placement(&run.dist, manifest, &pools(&[SEED_POOL]), "before data movement")?;
-    Ok(())
-}
-
-/// G-EXP: 1→2→4 pools with scanner and heal enabled; old versions intact on
-/// every node, seed-pool shards and set placement untouched, new writes land
-/// in exactly one pool, and the pool map survives a full restart.
-#[tokio::test]
-async fn scanner_heal_topology_expand_one_to_four_pools_preserves_versions_and_placement() -> TestResult {
-    init_logging();
-    let mut run = TopologyRun::start("expand").await?;
-    let manifest = seed_manifest(&run).await?;
-    let bucket_durability = assert_bucket_durability_strict(&run.dist.cluster, &manifest.buckets()).await?;
-    verify_from_every_node(&run.dist, &manifest, "seeded").await?;
-    let seed_census = capture_seed_pool_census(&run.dist, &manifest)?;
-    let scratch = unique_bucket("sht-scratch");
-    run.dist.create_bucket(&scratch).await?;
-
-    let mut steps = Vec::new();
-    for expected_pools in 2..=4 {
-        let new_node = run.dist.append_pool_and_restart().await?;
-        if new_node + 1 != expected_pools {
-            return Err(format!("appended node index {new_node} does not match pool count {expected_pools}").into());
-        }
-        let label = format!("after expanding to {expected_pools} pools");
-        assert_eq!(pool_count(&run.dist.cluster).await?, expected_pools, "{label}: pool list");
-        verify_from_every_node(&run.dist, &manifest, &label).await?;
-        assert_seed_pool_census_unchanged(&run.dist, &manifest, &seed_census, &label)?;
-        assert_seed_sidecars_unchanged(&run, &manifest, &label)?;
-        steps.push(json!({ "pools": expected_pools, "verified_nodes": run.dist.cluster.nodes.len() }));
-    }
-
-    let probes = put_probe_objects(&run.dist, &scratch, "post-expand", 8).await?;
-    let probe_placement = assert_probe_objects(&run.dist, &scratch, &probes, &pools(&ALL_POOLS), "post-expand probes").await?;
-
-    run.dist.restart_current_binary_gracefully().await?;
-    assert_eq!(pool_count(&run.dist.cluster).await?, 4, "pool map after restart");
-    verify_from_every_node(&run.dist, &manifest, "after full restart").await?;
-    assert_seed_pool_census_unchanged(&run.dist, &manifest, &seed_census, "after full restart")?;
-    assert_seed_sidecars_unchanged(&run, &manifest, "after full restart")?;
-    assert_probe_objects(&run.dist, &scratch, &probes, &pools(&ALL_POOLS), "post-expand probes after restart").await?;
-    assert_bucket_durability_strict(&run.dist.cluster, &manifest.buckets()).await?;
-    let strict_nodes = assert_process_durability_strict(&run.node_log_paths())?;
-
-    run.write_evidence(
-        "g-exp-expand",
-        &json!({
-            "gate": "G-EXP",
-            "manifest": manifest_summary(&manifest),
-            "bucket_durability": bucket_durability,
-            "process_durability_strict_nodes": strict_nodes,
-            "expansion_steps": steps,
-            "probe_placement": probe_placement,
-            "timeouts": timeouts(),
-        }),
-    )?;
-    Ok(())
-}
-
-/// Wait for the first rebalance run to report either `stopped` (the expected
-/// outcome) or `completed` (the inventory moved before the stop arrived).
-async fn wait_for_rebalance_stopped_or_completed(run: &TopologyRun, rebalance_id: &str) -> TestResult<(&'static str, Value)> {
-    let deadline = Instant::now() + TERMINAL_TRANSITION_TIMEOUT;
-    loop {
-        let status = rebalance_status_json(&run.dist.cluster).await?;
-        if rebalance_stopped(&status, rebalance_id)? {
-            return Ok(("stopped", status));
-        }
-        if rebalance_complete(&status, rebalance_id).unwrap_or(false) {
-            return Ok(("completed_before_stop", status));
-        }
-        if Instant::now() >= deadline {
-            return Err(format!(
-                "rebalance {rebalance_id} reached neither stopped nor completed within {TERMINAL_TRANSITION_TIMEOUT:?}: {status}"
-            )
-            .into());
-        }
-        sleep(Duration::from_millis(500)).await;
-    }
-}
-
-/// G-REB: rebalance with concurrent PUT/GET/DELETE and the scanner running;
-/// stop mid-run, verify no content error and no lost acknowledged version,
-/// restart the cluster, then rebalance to completion.
-#[tokio::test]
-async fn scanner_heal_topology_rebalance_survives_live_writes_stop_and_restart() -> TestResult {
-    init_logging();
-    let mut run = TopologyRun::start("rebalance").await?;
-    let manifest = seed_manifest(&run).await?;
-    assert_bucket_durability_strict(&run.dist.cluster, &manifest.buckets()).await?;
-    verify_from_every_node(&run.dist, &manifest, "seeded").await?;
-    let scratch = unique_bucket("sht-scratch");
-    run.dist.create_bucket(&scratch).await?;
-    expand_and_verify(&mut run, &manifest).await?;
-
-    let baseline: Vec<(String, String)> = manifest
-        .plain_entries()
-        .filter(|entry| matches!(entry.shape, "inline" | "external" | "special"))
-        .map(|entry| (entry.key.clone(), entry.sha256.clone()))
-        .collect();
-
-    let first_id = start_rebalance(&run.dist.cluster).await?;
-    wait_for_rebalance_active(&run.dist.cluster, &first_id, MOVEMENT_ACTIVE_TIMEOUT).await?;
-    let during_rebalance = put_probe_objects(&run.dist, &scratch, "during-rebalance", 4).await?;
-    let workload = tokio::spawn(run_live_workload(LiveWorkload {
-        clients: run.dist.clients()?,
-        bucket: scratch.clone(),
-        prefix: "live".to_string(),
-        writers: LIVE_WRITERS,
-        rounds: LIVE_ROUNDS,
-        baseline_bucket: manifest.plain_bucket.clone(),
-        baseline: baseline.clone(),
-        pause: Duration::from_millis(100),
-    }));
-    sleep(Duration::from_secs(2)).await;
-    stop_rebalance(&run.dist.cluster).await?;
-    let (first_outcome, first_status) = wait_for_rebalance_stopped_or_completed(&run, &first_id).await?;
-    let ops = workload.await??;
-    let live_state = expected_live_state(&ops);
-
-    for node_idx in 0..run.dist.cluster.nodes.len() {
-        let client = run.dist.client(node_idx)?;
-        verify_manifest(&client, &manifest, &format!("after rebalance {first_outcome} via node {node_idx}")).await?;
-        verify_live_state(
-            &client,
-            &scratch,
-            &live_state,
-            &format!("after rebalance {first_outcome} via node {node_idx}"),
-        )
-        .await?;
-    }
-    let retained_after_stop = assert_held_by_some_pool(&run, &manifest, &format!("after rebalance {first_outcome}"))?;
-    let during_placement = assert_probe_objects(
-        &run.dist,
-        &scratch,
-        &during_rebalance,
-        &pools(&TARGET_POOLS),
-        "writes issued while the seed pool was rebalancing must avoid it",
-    )
-    .await?;
-
-    run.dist.restart_current_binary_gracefully().await?;
-    assert_every_node_serves(&run.dist, &scratch, "after-stop-restart").await?;
-    verify_from_every_node(&run.dist, &manifest, "after restart following the stop").await?;
-    verify_live_state(&run.dist.client(0)?, &scratch, &live_state, "after restart following the stop").await?;
-
-    let second_id = start_rebalance(&run.dist.cluster).await?;
-    wait_for_rebalance_active(&run.dist.cluster, &second_id, MOVEMENT_ACTIVE_TIMEOUT).await?;
-    wait_for_rebalance_complete(&run.dist.cluster, &second_id, MOVEMENT_COMPLETE_TIMEOUT).await?;
-    verify_from_every_node(&run.dist, &manifest, "after the second rebalance completed").await?;
-    verify_live_state(&run.dist.client(3)?, &scratch, &live_state, "after the second rebalance completed").await?;
-    let final_placement =
-        assert_single_pool_placement(&run.dist, &manifest, &pools(&ALL_POOLS), "after the second rebalance completed")?;
-    let moved = final_placement.values().filter(|pool| **pool != SEED_POOL).count();
-    if moved == 0 {
-        return Err("rebalance completed without moving any manifest version off the seed pool".into());
-    }
-    let strict_nodes = assert_process_durability_strict(&run.node_log_paths())?;
-
-    run.write_evidence(
-        "g-reb-rebalance",
-        &json!({
-            "gate": "G-REB",
-            "manifest": manifest_summary(&manifest),
-            "first_run": { "id": first_id, "outcome": first_outcome, "status": first_status, "versions_held_by_two_pools_after_stop": retained_after_stop },
-            "second_run": { "id": second_id, "versions_off_seed_pool": moved },
-            "live_ops": ops,
-            "probe_placement_during_rebalance": during_placement,
-            "process_durability_strict_nodes": strict_nodes,
-            "timeouts": timeouts(),
-        }),
-    )?;
-    Ok(())
-}
-
-/// G-DEC: cancel an active decommission and keep every version; queue two
-/// pools, retire them in order, reject retiring the last active pools, and
-/// keep listings, history, markers and locks correct across a restart.
-#[tokio::test]
-async fn scanner_heal_topology_decommission_queue_cancel_resume_and_last_pool_guard() -> TestResult {
-    init_logging();
-    let mut run = TopologyRun::start("decommission").await?;
-    let manifest = seed_manifest(&run).await?;
-    assert_bucket_durability_strict(&run.dist.cluster, &manifest.buckets()).await?;
-    verify_from_every_node(&run.dist, &manifest, "seeded").await?;
-    let scratch = unique_bucket("sht-scratch");
-    run.dist.create_bucket(&scratch).await?;
-    expand_and_verify(&mut run, &manifest).await?;
-
-    start_decommission(&run.dist.cluster, DECOMMISSION_POOL_ID).await?;
-    wait_for_decommission_running_with_progress(&run.dist.cluster, DECOMMISSION_POOL_ID, MOVEMENT_ACTIVE_TIMEOUT).await?;
-    cancel_decommission(&run.dist.cluster, DECOMMISSION_POOL_ID).await?;
-    let canceled =
-        wait_for_decommission_flag(&run.dist.cluster, DECOMMISSION_POOL_ID, "canceled", TERMINAL_TRANSITION_TIMEOUT).await?;
-    let after_cancel = wait_for_single_pool_placement(&run, &manifest, &pools(&ALL_POOLS), "after cancel").await?;
-    verify_from_every_node(&run.dist, &manifest, "after cancel").await?;
-    clear_decommission(&run.dist.cluster, DECOMMISSION_POOL_ID).await?;
-
-    start_decommission_targets(&run.dist.cluster, "0,1").await?;
-    let queued = wait_for_decommission_flag(&run.dist.cluster, 1, "queued", Duration::from_secs(5)).await?;
-    wait_for_decommission_active(&run.dist.cluster, 0, MOVEMENT_ACTIVE_TIMEOUT).await?;
-    let during = put_probe_objects(&run.dist, &scratch, "during-decommission", 4).await?;
-    wait_for_decommission_complete(&run.dist.cluster, 0, MOVEMENT_COMPLETE_TIMEOUT).await?;
-    wait_for_decommission_complete(&run.dist.cluster, 1, MOVEMENT_COMPLETE_TIMEOUT).await?;
-    let (rejected_status, rejected_body) = expect_decommission_rejected(&run.dist.cluster, "2,3").await?;
-    verify_from_every_node(&run.dist, &manifest, "after retiring pools 0 and 1").await?;
-    let final_placement = assert_single_pool_placement(&run.dist, &manifest, &pools(&[2, 3]), "after retiring pools 0 and 1")?;
-    assert_probe_objects(&run.dist, &scratch, &during, &pools(&[2, 3]), "writes issued during decommission").await?;
-    let sidecars = assert_sidecars_survive_on_targets(&run, &manifest, &pools(&[2, 3]), "after retiring pools 0 and 1")?;
-
-    // A decommissioned pool must leave the command line; the server refuses to
-    // start while it is still listed. Pools 2 and 3 are renumbered to 0 and 1.
-    run.dist.remove_retired_pools_and_restart(&[0, 1]).await?;
-    let pools_after_restart = pool_count(&run.dist.cluster).await?;
-    if pools_after_restart != 2 {
-        return Err(format!("expected two pools after removing the retired pools, found {pools_after_restart}").into());
-    }
-    verify_from_every_node(&run.dist, &manifest, "after restart without the retired pools").await?;
-    assert_single_pool_placement(&run.dist, &manifest, &pools(&[0, 1]), "after restart without the retired pools")?;
-    let status_after_restart = decommission_status_json(&run.dist.cluster).await?;
-    let strict_nodes = assert_process_durability_strict(&run.node_log_paths())?;
-
-    run.write_evidence(
-        "g-dec-decommission",
-        &json!({
-            "gate": "G-DEC",
-            "manifest": manifest_summary(&manifest),
-            "cancel": canceled,
-            "placement_after_cancel_pools": after_cancel.values().collect::<BTreeSet<_>>(),
-            "queued_pool_1": queued,
-            "final_placement_pools": final_placement.values().collect::<BTreeSet<_>>(),
-            "sidecars_on_targets": sidecars,
-            "last_pool_rejection": { "status": rejected_status.as_u16(), "body": rejected_body },
-            "status_after_restart": status_after_restart,
-            "process_durability_strict_nodes": strict_nodes,
-            "timeouts": timeouts(),
-        }),
-    )?;
-    Ok(())
-}
-
-/// Outcome of a fault case: the worker result and the data verdict are
-/// reported separately so a fail-closed worker and a lost version never hide
-/// each other.
-async fn settle_decommission(
-    run: &TopologyRun,
-    manifest: &TopologyManifest,
-    label: &str,
-    completion_timeout: Duration,
-) -> TestResult<Value> {
-    let completion = wait_for_decommission_complete(&run.dist.cluster, DECOMMISSION_POOL_ID, completion_timeout).await;
-    let allowed = if completion.is_ok() {
-        pools(&TARGET_POOLS)
-    } else {
-        pools(&ALL_POOLS)
-    };
-    let integrity = async {
-        verify_from_every_node(&run.dist, manifest, label).await?;
-        wait_for_single_pool_placement(run, manifest, &allowed, label).await
-    }
-    .await;
-    let status = decommission_status_json(&run.dist.cluster).await.unwrap_or(Value::Null);
-    settle(label, completion, integrity, status)
-}
-
-async fn settle_rebalance(run: &TopologyRun, manifest: &TopologyManifest, rebalance_id: &str, label: &str) -> TestResult<Value> {
-    let completion = wait_for_rebalance_complete(&run.dist.cluster, rebalance_id, MOVEMENT_COMPLETE_TIMEOUT).await;
-    let integrity = async {
-        verify_from_every_node(&run.dist, manifest, label).await?;
-        wait_for_single_pool_placement(run, manifest, &pools(&ALL_POOLS), label).await
-    }
-    .await;
-    let status = rebalance_status_json(&run.dist.cluster).await.unwrap_or(Value::Null);
-    settle(label, completion, integrity, status)
-}
-
-fn settle(
-    label: &str,
-    completion: TestResult,
-    integrity: TestResult<std::collections::BTreeMap<String, usize>>,
-    status: Value,
-) -> TestResult<Value> {
-    match (completion, integrity) {
-        (Ok(()), Ok(placement)) => {
-            Ok(json!({ "worker": "completed", "placement_pools": placement.values().collect::<BTreeSet<_>>(), "status": status }))
-        }
-        (Err(worker), Ok(_)) => {
-            Err(format!("{label}: data stayed intact but the worker did not complete: {worker}; status {status}").into())
-        }
-        (Ok(()), Err(data)) => Err(format!("{label}: worker completed but data diverged: {data}").into()),
-        (Err(worker), Err(data)) => {
-            Err(format!("{label}: worker did not complete: {worker}; and data diverged: {data}; status {status}").into())
-        }
-    }
-}
-
-fn record(run: &TopologyRun, case: &str, outcome: &TestResult<Value>, mut evidence: Value) -> TestResult {
-    evidence["outcome"] = match outcome {
-        Ok(detail) => detail.clone(),
-        Err(error) => json!({ "error": error.to_string() }),
-    };
-    run.write_evidence(case, &evidence)?;
-    Ok(())
-}
-
-/// G-DEC fault: SIGKILL the decommission leader while an entry is held after
-/// its target commit and before source cleanup; the resumed worker must
-/// finish without losing or duplicating the version.
-#[tokio::test]
-async fn scanner_heal_topology_decommission_kill_before_source_cleanup_resumes_without_loss() -> TestResult {
-    init_logging();
-    require_test_hooks();
-    let mut run = TopologyRun::start("decom-kill").await?;
-    let manifest = seed_manifest(&run).await?;
-    verify_from_every_node(&run.dist, &manifest, "seeded").await?;
-    expand_and_verify(&mut run, &manifest).await?;
-
-    let key = manifest.plain_key("external", 3)?;
-    run.movement_barrier
-        .arm_movement("decommission", &manifest.plain_bucket, &key, STAGE_BEFORE_SOURCE_CLEANUP)?;
-    start_decommission(&run.dist.cluster, DECOMMISSION_POOL_ID).await?;
-    let reached = run
-        .movement_barrier
-        .wait_reached_during(
-            &run.dist.cluster,
-            MovementOperation::Decommission(DECOMMISSION_POOL_ID),
-            MOVEMENT_COMPLETE_TIMEOUT,
-        )
-        .await?;
-    let window = pools_holding(&run.dist, &manifest.plain_bucket, &key, None)?;
-    if !window.contains(&SEED_POOL) || window.len() < 2 {
-        return Err(format!(
-            "barrier window did not show a committed target beside the retained source for {key}: pools {window:?}"
-        )
-        .into());
-    }
-
-    let killed_pid = run.kill_node(SEED_POOL)?;
-    run.movement_barrier.disarm()?;
-    let restarted_pid = run.restart_killed_node(SEED_POOL).await?;
-    let label = "after the killed leader resumed decommission";
-    let outcome = settle_decommission(&run, &manifest, label, MOVEMENT_COMPLETE_TIMEOUT).await;
-    let strict_nodes = assert_process_durability_strict(&run.node_log_paths());
-    record(
-        &run,
-        "g-dec-kill-before-source-cleanup",
-        &outcome,
-        json!({
-            "gate": "G-DEC",
-            "window": STAGE_BEFORE_SOURCE_CLEANUP,
-            "nonce": run.movement_barrier.nonce(),
-            "object": key,
-            "reached": reached,
-            "pools_holding_at_window": window,
-            "killed_pid": killed_pid,
-            "restarted_pid": restarted_pid,
-            "process_durability_strict_nodes": strict_nodes.as_ref().ok(),
-            "timeouts": timeouts(),
-        }),
-    )?;
-    outcome?;
-    strict_nodes?;
-    Ok(())
-}
-
-/// G-DEC fault: inject a target commit failure after the multipart copy is
-/// staged; the source must stay authoritative and a later attempt completes.
-#[tokio::test]
-async fn scanner_heal_topology_decommission_target_commit_failure_retains_source() -> TestResult {
-    init_logging();
-    require_test_hooks();
-    let mut run = TopologyRun::start("decom-target-fail").await?;
-    let manifest = seed_manifest(&run).await?;
-    verify_from_every_node(&run.dist, &manifest, "seeded").await?;
-    expand_and_verify(&mut run, &manifest).await?;
-
-    let key = manifest.plain_key("multipart", 0)?;
-    run.movement_barrier
-        .arm_movement("decommission", &manifest.plain_bucket, &key, STAGE_BEFORE_TARGET_COMMIT)?;
-    start_decommission(&run.dist.cluster, DECOMMISSION_POOL_ID).await?;
-    let reached = run
-        .movement_barrier
-        .wait_reached_during(
-            &run.dist.cluster,
-            MovementOperation::Decommission(DECOMMISSION_POOL_ID),
-            MOVEMENT_COMPLETE_TIMEOUT,
-        )
-        .await?;
-    let window = pools_holding(&run.dist, &manifest.plain_bucket, &key, None)?;
-    if window != pools(&[SEED_POOL]) {
-        return Err(format!("the target must not be published before its commit; {key} is held by {window:?}").into());
-    }
-    run.movement_barrier.disarm()?;
-    run.movement_barrier.release_movement_with_io_error()?;
-
-    let label = "after the failed target commit was retried";
-    let outcome = settle_decommission(&run, &manifest, label, MOVEMENT_COMPLETE_TIMEOUT).await;
-    let strict_nodes = assert_process_durability_strict(&run.node_log_paths());
-    record(
-        &run,
-        "g-dec-target-commit-failure",
-        &outcome,
-        json!({
-            "gate": "G-DEC",
-            "window": STAGE_BEFORE_TARGET_COMMIT,
-            "nonce": run.movement_barrier.nonce(),
-            "object": key,
-            "reached": reached,
-            "injection": "io_error",
-            "process_durability_strict_nodes": strict_nodes.as_ref().ok(),
-            "timeouts": timeouts(),
-        }),
-    )?;
-    outcome?;
-    strict_nodes?;
-    Ok(())
-}
-
-/// G-DEC fault: kill the leader after the decommission start transaction is
-/// durable in `pool.bin` but before the admin request is acknowledged and
-/// before any worker starts; the persisted responsibility must resume on restart.
-#[tokio::test]
-async fn scanner_heal_topology_decommission_kill_after_responsibility_persisted_before_ack_resumes() -> TestResult {
-    init_logging();
-    require_test_hooks();
-    let mut run = TopologyRun::start("decom-ack").await?;
-    let manifest = seed_manifest(&run).await?;
-    verify_from_every_node(&run.dist, &manifest, "seeded").await?;
-    expand_and_verify(&mut run, &manifest).await?;
-
-    run.movement_barrier
-        .arm_movement("decommission_start", ".rustfs.sys", "pool.bin", STAGE_AFTER_RESPONSIBILITY_PERSISTED)?;
-    let leader_url = run.dist.cluster.nodes[SEED_POOL].url.clone();
-    let access_key = run.dist.cluster.access_key.clone();
-    let secret_key = run.dist.cluster.secret_key.clone();
-    let start_request = tokio::spawn(async move {
-        // Mirror start_decommission: the init stage answers 500 with the fleet
-        // proof marker until the fleet has proven its capability.
-        let path = format!("/rustfs/admin/v3/pools/decommission?pool={DECOMMISSION_POOL_ID}&by-id=true");
-        // A busy movement gate answers a retryable 503; keep retrying within
-        // the window budget so a refused start is never read as a reached window.
-        let deadline = Instant::now() + PRE_ACK_REACH_TIMEOUT;
-        loop {
-            match admin_request(&leader_url, Method::POST, &path, None, &access_key, &secret_key).await {
-                Ok((status, body))
-                    if (status.as_u16() == 503
-                        || (status.as_u16() == 500 && body.contains("requires a live fleet capability proof")))
-                        && Instant::now() < deadline =>
-                {
-                    sleep(Duration::from_secs(1)).await;
-                }
-                Ok((status, body)) => return Ok(format!("{status} {body}")),
-                Err(error) => return Err(error.to_string()),
-            }
-        }
-    });
-    // The start request normally reaches the durable save within about a
-    // second. If it returns first the window was never entered; if it stays in
-    // flight past the budget, the start path itself stalled before the save.
-    let requested_at = Instant::now();
-    let mut start_request = start_request;
-    let reached = tokio::select! {
-        reached = run.movement_barrier.wait_reached(PRE_ACK_REACH_TIMEOUT) => match reached {
-            Ok(reached) => reached,
-            Err(error) => {
-                return Err(format!(
-                    "the decommission start stayed in flight for {PRE_ACK_REACH_TIMEOUT:?} without reaching the durable start save: {error}"
-                )
-                .into());
-            }
-        },
-        finished = &mut start_request => {
-            return Err(format!("the decommission start returned before the pre-ACK window was reached: {:?}", finished?).into());
-        }
-    };
-    let reach_elapsed = requested_at.elapsed();
-    let killed_pid = run.kill_node(SEED_POOL)?;
-    let start_outcome = start_request.await?;
-    if let Ok(response) = &start_outcome {
-        return Err(format!(
-            "the decommission start was acknowledged ({response}) although the leader was killed in the pre-ACK window"
-        )
-        .into());
-    }
-    run.movement_barrier.disarm()?;
-    let restarted_pid = run.restart_killed_node(SEED_POOL).await?;
-
-    let label = "after the persisted decommission resumed";
-    let resumed = wait_for_decommission_active(&run.dist.cluster, DECOMMISSION_POOL_ID, Duration::from_secs(60)).await;
-    let outcome = match resumed {
-        Ok(()) => settle_decommission(&run, &manifest, label, DECOMMISSION_RESUME_COMPLETE_TIMEOUT).await,
-        Err(error) => Err(format!("{label}: the persisted decommission did not become active after the restart: {error}").into()),
-    };
-    let strict_nodes = assert_process_durability_strict(&run.node_log_paths());
-    record(
-        &run,
-        "g-dec-kill-before-ack",
-        &outcome,
-        json!({
-            "gate": "G-DEC",
-            "window": STAGE_AFTER_RESPONSIBILITY_PERSISTED,
-            "nonce": run.movement_barrier.nonce(),
-            "reached": reached,
-            "reach_elapsed_ms": reach_elapsed.as_millis() as u64,
-            "start_request": { "outcome": "uncertain", "error": start_outcome.err() },
-            "killed_pid": killed_pid,
-            "restarted_pid": restarted_pid,
-            "process_durability_strict_nodes": strict_nodes.as_ref().ok(),
-            "timeouts": timeouts(),
-        }),
-    )?;
-    outcome?;
-    strict_nodes?;
-    Ok(())
-}
-
-/// G-REB fault: SIGKILL the rebalancing node while an entry is held after its
-/// target commit and before source cleanup; the resumed run must complete
-/// without losing or duplicating the version.
-#[tokio::test]
-async fn scanner_heal_topology_rebalance_kill_before_source_cleanup_resumes_without_loss() -> TestResult {
-    init_logging();
-    require_test_hooks();
-    let mut run = TopologyRun::start("rebal-kill").await?;
-    let manifest = seed_manifest(&run).await?;
-    verify_from_every_node(&run.dist, &manifest, "seeded").await?;
-    expand_and_verify(&mut run, &manifest).await?;
-
-    let key = manifest.plain_key("empty", 0)?;
-    run.movement_barrier
-        .arm_movement("rebalance", &manifest.plain_bucket, &key, STAGE_BEFORE_SOURCE_CLEANUP)?;
-    let rebalance_id = start_rebalance(&run.dist.cluster).await?;
-    let reached = run
-        .movement_barrier
-        .wait_reached_during(&run.dist.cluster, MovementOperation::Rebalance(&rebalance_id), MOVEMENT_COMPLETE_TIMEOUT)
-        .await?;
-    let window = pools_holding(&run.dist, &manifest.plain_bucket, &key, None)?;
-    if !window.contains(&SEED_POOL) || window.len() < 2 {
-        return Err(format!(
-            "barrier window did not show a committed target beside the retained source for {key}: pools {window:?}"
-        )
-        .into());
-    }
-
-    let killed_pid = run.kill_node(SEED_POOL)?;
-    run.movement_barrier.disarm()?;
-    let restarted_pid = run.restart_killed_node(SEED_POOL).await?;
-    let label = "after the killed node resumed rebalance";
-    let outcome = settle_rebalance(&run, &manifest, &rebalance_id, label).await;
-    let strict_nodes = assert_process_durability_strict(&run.node_log_paths());
-    record(
-        &run,
-        "g-reb-kill-before-source-cleanup",
-        &outcome,
-        json!({
-            "gate": "G-REB",
-            "window": STAGE_BEFORE_SOURCE_CLEANUP,
-            "nonce": run.movement_barrier.nonce(),
-            "object": key,
-            "reached": reached,
-            "pools_holding_at_window": window,
-            "rebalance_id": rebalance_id,
-            "killed_pid": killed_pid,
-            "restarted_pid": restarted_pid,
-            "process_durability_strict_nodes": strict_nodes.as_ref().ok(),
-            "timeouts": timeouts(),
-        }),
-    )?;
-    outcome?;
-    strict_nodes?;
-    Ok(())
-}

crates/e2e_test/src/distributed/scanner_heal_topology_tier_test.rs

@@ -1,599 +0,0 @@
-// 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.
-
-//! G-TIER: real mover processes contend with a held remote DELETE while a
-//! free version owns the old remote tuple beside a live transitioned version.
-//! The remote is the HTTP fake S3 target, not a provider interoperability test.
-
-use super::harness::{
-    DECOMMISSION_POOL_ID, DRIVES_PER_NODE, TestResult, cluster_admin_ok, decommission_status_json, enable_versioning,
-    rebalance_status_json, sha256_hex, start_decommission, start_rebalance, unique_bucket, wait_for_decommission_complete,
-    wait_for_rebalance_complete,
-};
-use super::publication_log::PublicationEvents;
-use super::scanner_heal_topology_fixture::{
-    MOVEMENT_COMPLETE_TIMEOUT, MovementOperation, SEED_POOL, STAGE_AFTER_RESPONSIBILITY_PERSISTED, STAGE_BEFORE_SOURCE_CLEANUP,
-    TopologyRun, assert_bucket_durability_strict, assert_process_durability_strict, require_test_hooks,
-};
-use crate::common::init_logging;
-use crate::fake_s3_target::{FAKE_ACCESS_KEY, FAKE_SECRET_KEY, FakeS3Target, Operation, RequestRecord};
-use crate::storage_api::OBJECT_LOCK_TRACE_FILTER;
-use aws_sdk_s3::primitives::ByteStream;
-use aws_sdk_s3::types::{
-    BucketLifecycleConfiguration, ExpirationStatus, LifecycleRule, LifecycleRuleFilter, Transition, TransitionStorageClass,
-};
-use http::Method;
-use rustfs_filemeta::{FileMeta, TransitionVersionState};
-use rustfs_utils::http::{SUFFIX_TRANSITION_TIER_DESTINATION_ID, get_consistent_str};
-use serde::Serialize;
-use serde_json::{Value, json};
-use std::collections::BTreeSet;
-use std::path::Path;
-use std::time::Duration;
-use time::{OffsetDateTime, format_description::well_known::Rfc3339};
-use tokio::time::{Instant, sleep, timeout, timeout_at};
-
-const TIER: &str = "TOPOLOGYCOLD";
-const KEY: &str = "000-tier-owner.bin";
-const TRANSITION_TIMEOUT: Duration = Duration::from_secs(90);
-// Free-version cleanup holds its locks for at most 30 s during remote DELETE.
-// Fail before that deadline instead of confusing a retry with the held attempt.
-const DELETE_OVERLAP_TIMEOUT: Duration = Duration::from_secs(20);
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
-struct RemoteTuple {
-    bucket: String,
-    key: String,
-    version: String,
-    tier: String,
-    destination: String,
-}
-
-#[derive(Debug, PartialEq, Eq, Serialize)]
-struct Owner {
-    pool: usize,
-    drive: usize,
-    version: String,
-    free: bool,
-    remote: RemoteTuple,
-}
-
-fn owners(run: &TopologyRun, bucket: &str, remote_bucket: &str) -> TestResult<Vec<Owner>> {
-    let mut owners = Vec::new();
-    for node in &run.dist.cluster.nodes {
-        for (drive, root) in node.data_dirs.iter().enumerate() {
-            let bytes = match std::fs::read(Path::new(root).join(bucket).join(KEY).join("xl.meta")) {
-                Ok(bytes) => bytes,
-                Err(error) if error.kind() == std::io::ErrorKind::NotFound => continue,
-                Err(error) => return Err(error.into()),
-            };
-            for version in FileMeta::load(&bytes)?.get_file_info_versions(bucket, KEY, true)?.versions {
-                if version.transition_status != "complete" && !version.tier_free_version() {
-                    continue;
-                }
-                assert_eq!(version.transition_version_state, TransitionVersionState::Exact);
-                owners.push(Owner {
-                    pool: node.pool_idx,
-                    drive,
-                    version: version.version_id.ok_or("tier owner omitted its local version")?.to_string(),
-                    free: version.tier_free_version(),
-                    remote: RemoteTuple {
-                        bucket: remote_bucket.to_string(),
-                        key: version.transitioned_objname.clone(),
-                        version: version
-                            .transition_version
-                            .clone()
-                            .ok_or("tier owner omitted its remote version")?,
-                        tier: version.transition_tier.clone(),
-                        destination: get_consistent_str(&version.metadata, SUFFIX_TRANSITION_TIER_DESTINATION_ID)
-                            .ok_or("tier owner omitted its destination identity")?
-                            .to_string(),
-                    },
-                });
-            }
-        }
-    }
-    Ok(owners)
-}
-
-fn assert_remote(target: &FakeS3Target, remote: &RemoteTuple, expected: &[u8]) -> TestResult {
-    assert_eq!(target.stored_versions(&remote.bucket, &remote.key), vec![(remote.version.clone(), false)]);
-    let (body, metadata) = target
-        .stored_object(&remote.bucket, &remote.key)
-        .ok_or("remote bytes are missing")?;
-    assert_eq!(body.as_ref(), expected, "remote bytes changed for {remote:?}");
-    assert_eq!(
-        get_consistent_str(&metadata, SUFFIX_TRANSITION_TIER_DESTINATION_ID),
-        Some(remote.destination.as_str())
-    );
-    assert_eq!(remote.tier, TIER);
-    Ok(())
-}
-
-async fn transition_version(
-    run: &TopologyRun,
-    target: &FakeS3Target,
-    bucket: &str,
-    remote_bucket: &str,
-    body: &[u8],
-) -> TestResult<(String, RemoteTuple)> {
-    let client = run.dist.client(0)?;
-    let put = client
-        .put_object()
-        .bucket(bucket)
-        .key(KEY)
-        .body(ByteStream::from(body.to_vec()))
-        .send()
-        .await?;
-    let version = put.version_id().ok_or("versioned PUT omitted its version")?.to_string();
-    cluster_admin_ok(
-        &run.dist.cluster,
-        Method::POST,
-        &format!("/rustfs/admin/v3/ilm/transition/run?bucket={bucket}&prefix={KEY}&tier={TIER}&dryRun=false"),
-        None,
-    )
-    .await?;
-    let deadline = Instant::now() + TRANSITION_TIMEOUT;
-    loop {
-        let current = owners(run, bucket, remote_bucket)?;
-        let shards: Vec<_> = current
-            .iter()
-            .filter(|owner| owner.version == version && !owner.free)
-            .collect();
-        if let Some(first) = shards.first()
-            && shards.len() == DRIVES_PER_NODE
-            && shards
-                .iter()
-                .all(|owner| owner.pool == SEED_POOL && owner.remote == first.remote)
-        {
-            let head = client
-                .head_object()
-                .bucket(bucket)
-                .key(KEY)
-                .version_id(&version)
-                .send()
-                .await?;
-            assert_eq!(head.storage_class().map(|class| class.as_str()), Some(TIER));
-            assert_remote(target, &first.remote, body)?;
-            return Ok((version, first.remote.clone()));
-        }
-        if Instant::now() >= deadline {
-            return Err(format!("transition of {bucket}/{KEY}@{version} did not reach every seed drive: {current:?}").into());
-        }
-        sleep(Duration::from_millis(200)).await;
-    }
-}
-
-fn event_time(event: &Value) -> TestResult<OffsetDateTime> {
-    Ok(OffsetDateTime::parse(
-        event["timestamp"].as_str().ok_or("lock event omitted its timestamp")?,
-        &Rfc3339,
-    )?)
-}
-
-async fn pending_publication(events: &mut PublicationEvents, started: OffsetDateTime) -> TestResult<Value> {
-    loop {
-        let observed = events.poll()?;
-        for event in observed {
-            if event_time(event)? < started {
-                continue;
-            }
-            assert_ne!(
-                event["state"], "acquired",
-                "mover acquired its publication lock while remote DELETE was held"
-            );
-            if event["state"] == "acquiring"
-                && !observed
-                    .iter()
-                    .any(|later| later["lock_attempt_id"] == event["lock_attempt_id"] && later["state"] != "acquiring")
-            {
-                assert!(event["lock_attempt_id"].as_str().is_some_and(|id| !id.is_empty()));
-                return Ok(event.clone());
-            }
-        }
-        sleep(Duration::from_millis(50)).await;
-    }
-}
-
-async fn acquired_publication(events: &mut PublicationEvents, pending: &Value) -> TestResult<Value> {
-    loop {
-        for event in events.poll()? {
-            if event["lock_attempt_id"] != pending["lock_attempt_id"] {
-                continue;
-            }
-            match event["state"].as_str() {
-                Some("acquired") => return Ok(event.clone()),
-                Some("failed" | "cancelled") => return Err(format!("held publication attempt did not acquire: {event}").into()),
-                _ => {}
-            }
-        }
-        sleep(Duration::from_millis(50)).await;
-    }
-}
-
-fn deletes(target: &FakeS3Target, remote: &RemoteTuple) -> Vec<RequestRecord> {
-    target
-        .requests()
-        .into_iter()
-        .filter(|request| {
-            request.operation == Operation::DeleteObject
-                && request.bucket == remote.bucket
-                && request.key.as_deref() == Some(remote.key.as_str())
-        })
-        .collect()
-}
-
-async fn verify_live(run: &TopologyRun, bucket: &str, live_version: &str, old_version: &str, body: &[u8]) -> TestResult {
-    for client in run.dist.clients()? {
-        let got = client
-            .get_object()
-            .bucket(bucket)
-            .key(KEY)
-            .version_id(live_version)
-            .send()
-            .await?;
-        assert_eq!(got.body.collect().await?.into_bytes().as_ref(), body);
-        let latest = client.head_object().bucket(bucket).key(KEY).send().await?;
-        assert_eq!(latest.version_id(), Some(live_version));
-        assert_eq!(latest.storage_class().map(|class| class.as_str()), Some(TIER));
-        let deleted = client
-            .get_object()
-            .bucket(bucket)
-            .key(KEY)
-            .version_id(old_version)
-            .send()
-            .await;
-        let error = deleted.expect_err("deleted source version must not be visible");
-        assert_eq!(error.raw_response().map(|response| response.status().as_u16()), Some(404));
-        let listed = client.list_object_versions().bucket(bucket).prefix(KEY).send().await?;
-        assert_eq!(listed.versions().len(), 1, "free owners must not appear as object versions");
-        assert_eq!(listed.versions()[0].version_id(), Some(live_version));
-        assert!(
-            listed.delete_markers().is_empty(),
-            "moving the free owner must not create a delete marker"
-        );
-    }
-    Ok(())
-}
-
-async fn tier_delete_during_movement(decommission: bool) -> TestResult {
-    init_logging();
-    require_test_hooks();
-    let operation = if decommission { "decommission" } else { "rebalance" };
-    let target = FakeS3Target::start().await?;
-    let remote_bucket = unique_bucket("sht-cold");
-    target.create_bucket(&remote_bucket);
-    let mut run = TopologyRun::start_with_env(
-        &format!("tier-{operation}"),
-        &[
-            ("RUSTFS_TIER_RUSTFS_ALLOW_LOOPBACK_ENDPOINT", "true"),
-            ("RUSTFS_OBJECT_LOCK_DIAG_ENABLE", "true"),
-            ("RUST_LOG", OBJECT_LOCK_TRACE_FILTER),
-        ],
-    )
-    .await?;
-    let tier = json!({
-        "type": "rustfs",
-        "rustfs": {
-            "name": TIER, "endpoint": target.endpoint(), "accessKey": FAKE_ACCESS_KEY,
-            "secretKey": FAKE_SECRET_KEY, "bucket": remote_bucket, "prefix": "",
-            "region": "us-east-1", "storageClass": ""
-        }
-    });
-    let deadline = Instant::now() + Duration::from_secs(30);
-    loop {
-        match cluster_admin_ok(&run.dist.cluster, Method::PUT, "/rustfs/admin/v3/tier", Some(tier.to_string())).await {
-            Ok(_) => break,
-            Err(_) if Instant::now() < deadline => sleep(Duration::from_millis(250)).await,
-            Err(error) => return Err(error),
-        }
-    }
-    let bucket = unique_bucket("sht-tier");
-    run.dist.create_bucket(&bucket).await?;
-    let client = run.dist.client(0)?;
-    enable_versioning(&client, &bucket).await?;
-    let rule = LifecycleRule::builder()
-        .id("tier-owner")
-        .status(ExpirationStatus::Enabled)
-        .filter(LifecycleRuleFilter::builder().prefix(KEY).build())
-        .transitions(
-            Transition::builder()
-                .days(0)
-                .storage_class(TransitionStorageClass::from(TIER))
-                .build(),
-        )
-        .build()?;
-    client
-        .put_bucket_lifecycle_configuration()
-        .bucket(&bucket)
-        .lifecycle_configuration(BucketLifecycleConfiguration::builder().rules(rule).build()?)
-        .send()
-        .await?;
-    let old_body = vec![0x31; 4096];
-    let live_body = vec![0x92; 8192];
-    let (old_version, old_remote) = transition_version(&run, &target, &bucket, &remote_bucket, &old_body).await?;
-    let (live_version, live_remote) = transition_version(&run, &target, &bucket, &remote_bucket, &live_body).await?;
-    assert_ne!(
-        old_remote.key, live_remote.key,
-        "the obsolete and live versions need distinct remote tuples"
-    );
-    // Keep the seed pool above the rebalance goal until the first key is visited.
-    // These local objects are outside the transition rule's prefix.
-    for index in 0..16 {
-        client
-            .put_object()
-            .bucket(&bucket)
-            .key(format!("zz-load/{index:02}.bin"))
-            .body(ByteStream::from(vec![index as u8; 1024 * 1024]))
-            .send()
-            .await?;
-    }
-    let bucket_durability = assert_bucket_durability_strict(&run.dist.cluster, &[&bucket]).await?;
-    run.dist.expand_to_four_pools().await?;
-    assert_bucket_durability_strict(&run.dist.cluster, &[&bucket]).await?;
-    let seeded = owners(&run, &bucket, &remote_bucket)?;
-    assert_eq!(seeded.len(), 2 * DRIVES_PER_NODE);
-    assert!(seeded.iter().all(|owner| owner.pool == SEED_POOL && !owner.free));
-
-    let mut decommission_start = Box::pin(start_decommission(&run.dist.cluster, DECOMMISSION_POOL_ID));
-    let mut startup = Value::Null;
-    if decommission {
-        run.movement_barrier.arm_movement(
-            "decommission_start",
-            ".rustfs.sys",
-            "pool.bin",
-            STAGE_AFTER_RESPONSIBILITY_PERSISTED,
-        )?;
-        let requested_at = OffsetDateTime::now_utc();
-        let preparation_started = Instant::now();
-        let reached = tokio::select! {
-            reached = run.movement_barrier.wait_reached(MOVEMENT_COMPLETE_TIMEOUT) => {
-                reached.map_err(|error| format!(
-                    "G-TIER decommission start preparation failed before DELETE: {error}"
-                ))?
-            }
-            result = &mut decommission_start => {
-                return Err(format!(
-                    "G-TIER decommission start preparation returned before durable-start barrier {}: {result:?}",
-                    run.movement_barrier.nonce()
-                ).into());
-            }
-        };
-        startup = json!({
-            "requested_at": requested_at.format(&Rfc3339)?,
-            "parked_at": OffsetDateTime::now_utc().format(&Rfc3339)?,
-            "preparation_elapsed_ms": preparation_started.elapsed().as_millis(),
-            "barrier": reached,
-        });
-    }
-    // The durable-start barrier has released the movement writer but has not
-    // started a worker. Install a separate release nonce before holding DELETE.
-    let cleanup_barrier = run.movement_barrier.next_phase();
-    cleanup_barrier.arm_movement(operation, &bucket, KEY, STAGE_BEFORE_SOURCE_CLEANUP)?;
-    let mut publication_events = PublicationEvents::new(run.node_log_paths(), &bucket, KEY)?;
-    let mut delete_gate = target.hold_delete_object(&remote_bucket, &old_remote.key);
-    // The public DELETE persists a free owner and enqueues its remote cleanup.
-    let client = run.dist.client(0)?;
-    client
-        .delete_object()
-        .bucket(&bucket)
-        .key(KEY)
-        .version_id(&old_version)
-        .send()
-        .await
-        .map_err(|error| format!("G-TIER {operation} public DELETE before remote gate failed: {error}; startup={startup}"))?;
-    timeout(TRANSITION_TIMEOUT, delete_gate.wait_until_entered())
-        .await
-        .map_err(|error| format!("G-TIER {operation} DELETE gate entry timed out: {error}; startup={startup}"))?
-        .map_err(|error| format!("G-TIER {operation} DELETE gate entry failed: {error}; startup={startup}"))?;
-    let delete_gate_entered_at = OffsetDateTime::now_utc();
-    let overlap_started = Instant::now();
-    let overlap_deadline = overlap_started + DELETE_OVERLAP_TIMEOUT;
-    let held = owners(&run, &bucket, &remote_bucket)?;
-    assert_eq!(held.len(), 2 * DRIVES_PER_NODE);
-    let old_owners: Vec<_> = held.iter().filter(|owner| owner.remote == old_remote).collect();
-    assert_eq!(old_owners.len(), DRIVES_PER_NODE);
-    assert!(
-        old_owners
-            .iter()
-            .all(|owner| owner.pool == SEED_POOL && owner.free && owner.version != old_version)
-    );
-    assert_eq!(old_owners.iter().map(|owner| &owner.version).collect::<BTreeSet<_>>().len(), 1);
-    assert_eq!(
-        held.iter()
-            .filter(|owner| {
-                owner.pool == SEED_POOL && !owner.free && owner.version == live_version && owner.remote == live_remote
-            })
-            .count(),
-        DRIVES_PER_NODE
-    );
-    assert_remote(&target, &old_remote, &old_body)?;
-    assert_remote(&target, &live_remote, &live_body)?;
-    let held_deletes = deletes(&target, &old_remote);
-    assert!(!held_deletes.is_empty());
-    assert!(held_deletes.iter().all(|request| {
-        request.prepared_response.is_none() && request.version_id.as_deref() == Some(old_remote.version.as_str())
-    }));
-    assert!(deletes(&target, &live_remote).is_empty());
-
-    let movement_started = OffsetDateTime::now_utc();
-    if decommission {
-        startup["released_at"] = json!(movement_started.format(&Rfc3339)?);
-        run.movement_barrier.release_movement()?;
-    }
-    let rebalance_id = timeout_at(overlap_deadline, async {
-        if decommission {
-            decommission_start.as_mut().await?;
-            Ok::<_, Box<dyn std::error::Error + Send + Sync>>(None)
-        } else {
-            Ok(Some(start_rebalance(&run.dist.cluster).await?))
-        }
-    })
-    .await
-    .map_err(|error| {
-        format!("G-TIER {operation} start acknowledgment timed out within DELETE overlap: {error}; startup={startup}")
-    })?
-    .map_err(|error| {
-        format!("G-TIER {operation} start acknowledgment failed within DELETE overlap: {error}; startup={startup}")
-    })?;
-    drop(decommission_start);
-    let movement_acknowledged_at = OffsetDateTime::now_utc();
-    let pending = timeout_at(overlap_deadline, pending_publication(&mut publication_events, movement_started))
-        .await
-        .map_err(|error| format!(
-            "G-TIER {operation} publication pending timed out within DELETE overlap: {error}; startup={startup}; lock_events={:?}; cleanup_barrier={:?}",
-            publication_events.cached(), cleanup_barrier.reached_observations()
-        ))?
-        .map_err(|error| format!("G-TIER {operation} publication pending failed within DELETE overlap: {error}"))?;
-    // Positive gate entry, exact physical ownership and the pending lock attempt
-    // establish the overlap; an absent log alone is not an ordering assertion.
-    assert_eq!(owners(&run, &bucket, &remote_bucket)?, held);
-    assert_remote(&target, &old_remote, &old_body)?;
-    let released_at = OffsetDateTime::now_utc();
-    let delete_overlap_elapsed_ms = overlap_started.elapsed().as_millis();
-    drop(delete_gate);
-    let acquired = timeout(DELETE_OVERLAP_TIMEOUT, acquired_publication(&mut publication_events, &pending))
-        .await
-        .map_err(|error| format!(
-            "G-TIER {operation} publication acquired after DELETE release timed out: {error}; pending={pending}; lock_events={:?}; cleanup_barrier={:?}",
-            publication_events.cached(), cleanup_barrier.reached_observations()
-        ))?
-        .map_err(|error| format!("G-TIER {operation} publication acquired after DELETE release failed: {error}"))?;
-    assert!(event_time(&pending)? >= movement_started && event_time(&pending)? < released_at);
-    assert!(
-        event_time(&acquired)? >= released_at,
-        "the same publication attempt must acquire after DELETE is released"
-    );
-    drop(publication_events);
-    let reached = cleanup_barrier
-        .wait_reached_during(
-            &run.dist.cluster,
-            match rebalance_id.as_deref() {
-                Some(id) => MovementOperation::Rebalance(id),
-                None => MovementOperation::Decommission(DECOMMISSION_POOL_ID),
-            },
-            MOVEMENT_COMPLETE_TIMEOUT,
-        )
-        .await
-        .map_err(|error| format!("G-TIER {operation} before-source-cleanup barrier failed: {error}"))?;
-    let published = owners(&run, &bucket, &remote_bucket)?;
-    assert!(
-        published
-            .iter()
-            .all(|owner| !owner.free && owner.version == live_version && owner.remote == live_remote)
-    );
-    let publication_pools: BTreeSet<_> = published.iter().map(|owner| owner.pool).collect();
-    assert!(publication_pools.contains(&SEED_POOL) && publication_pools.iter().any(|pool| *pool != SEED_POOL));
-    assert_eq!(published.len(), publication_pools.len() * DRIVES_PER_NODE);
-    assert!(target.stored_versions(&remote_bucket, &old_remote.key).is_empty());
-    assert_remote(&target, &live_remote, &live_body)?;
-    cleanup_barrier.release_movement()?;
-    cleanup_barrier.disarm()?;
-    let completion = match rebalance_id.as_deref() {
-        Some(id) => {
-            wait_for_rebalance_complete(&run.dist.cluster, id, MOVEMENT_COMPLETE_TIMEOUT).await?;
-            rebalance_status_json(&run.dist.cluster).await?
-        }
-        None => {
-            wait_for_decommission_complete(&run.dist.cluster, DECOMMISSION_POOL_ID, MOVEMENT_COMPLETE_TIMEOUT).await?;
-            decommission_status_json(&run.dist.cluster).await?
-        }
-    };
-    let settled = owners(&run, &bucket, &remote_bucket)?;
-    assert_eq!(settled.len(), DRIVES_PER_NODE);
-    assert_eq!(settled.iter().map(|owner| owner.pool).collect::<BTreeSet<_>>().len(), 1);
-    assert!(
-        settled
-            .iter()
-            .all(|owner| owner.pool != SEED_POOL && !owner.free && owner.remote == live_remote)
-    );
-    verify_live(&run, &bucket, &live_version, &old_version, &live_body).await?;
-    if decommission {
-        run.dist.remove_retired_pools_and_restart(&[SEED_POOL]).await?;
-    } else {
-        run.dist.restart_current_binary_gracefully().await?;
-    }
-    verify_live(&run, &bucket, &live_version, &old_version, &live_body).await?;
-    let restarted = owners(&run, &bucket, &remote_bucket)?;
-    assert_eq!(restarted.len(), DRIVES_PER_NODE);
-    assert_eq!(restarted.iter().map(|owner| owner.pool).collect::<BTreeSet<_>>().len(), 1);
-    assert!(
-        restarted
-            .iter()
-            .all(|owner| !owner.free && owner.version == live_version && owner.remote == live_remote)
-    );
-    assert_remote(&target, &live_remote, &live_body)?;
-    assert!(target.stored_versions(&remote_bucket, &old_remote.key).is_empty());
-    assert!(
-        deletes(&target, &live_remote).is_empty(),
-        "the live transitioned tuple must never receive DELETE"
-    );
-    let remote_deletes = deletes(&target, &old_remote);
-    assert!(!remote_deletes.is_empty());
-    assert!(
-        remote_deletes
-            .iter()
-            .all(|request| request.version_id.as_deref() == Some(old_remote.version.as_str()))
-    );
-    let successful = remote_deletes
-        .iter()
-        .filter_map(|request| request.prepared_response.as_ref())
-        .find(|response| response.status == 204)
-        .ok_or("old remote tuple never completed DELETE")?;
-    let deleted_at_ms = i128::from(
-        successful
-            .prepared_at_unix_millis
-            .ok_or("DELETE response omitted its timestamp")?,
-    );
-    assert!(deleted_at_ms >= released_at.unix_timestamp_nanos() / 1_000_000);
-    assert!(event_time(&acquired)?.unix_timestamp_nanos() / 1_000_000 >= deleted_at_ms);
-    assert_bucket_durability_strict(&run.dist.cluster, &[&bucket]).await?;
-    let strict_nodes = assert_process_durability_strict(&run.node_log_paths())?;
-    run.write_evidence(
-        &format!("g-tier-{operation}"),
-        &json!({
-            "gate": "G-TIER", "operation": operation, "rebalance_id": rebalance_id,
-            "startup": startup,
-            "delete_gate_entered_at": delete_gate_entered_at.format(&Rfc3339)?,
-            "movement_overlap_started_at": movement_started.format(&Rfc3339)?,
-            "movement_acknowledged_at": movement_acknowledged_at.format(&Rfc3339)?,
-            "delete_overlap_timeout_ms": DELETE_OVERLAP_TIMEOUT.as_millis(),
-            "delete_overlap_elapsed_ms": delete_overlap_elapsed_ms,
-            "remote_backend": "HTTP fake_s3_target with versioning enabled",
-            "ordering": "remote DELETE held, mover publication waiting, DELETE released, same publication acquired",
-            "bucket": bucket, "key": KEY, "bucket_durability": bucket_durability,
-            "process_durability_strict_nodes": strict_nodes,
-            "old_version": old_version, "old_remote": old_remote, "old_sha256": sha256_hex(&old_body),
-            "live_version": live_version, "live_remote": live_remote, "live_sha256": sha256_hex(&live_body),
-            "owners_while_delete_held": held, "publication_waiting": pending, "publication_acquired": acquired,
-            "held_delete_sequences": held_deletes.iter().map(|request| request.sequence).collect::<Vec<_>>(),
-            "delete_released_at": released_at.format(&Rfc3339)?, "remote_delete_completed_at_unix_millis": deleted_at_ms,
-            "barrier": reached, "owners_before_source_cleanup": published, "owners_after_movement": settled,
-            "owners_after_restart": restarted, "completion": completion,
-            "old_remote_delete_attempts": remote_deletes.len(), "live_remote_delete_attempts": 0,
-            "source_readback_nodes": run.dist.cluster.nodes.len(),
-        }),
-    )?;
-    Ok(())
-}
-
-#[tokio::test]
-async fn scanner_heal_topology_tier_free_owner_delete_overlaps_rebalance() -> TestResult {
-    tier_delete_during_movement(false).await
-}
-
-#[tokio::test]
-async fn scanner_heal_topology_tier_free_owner_delete_overlaps_decommission() -> TestResult {
-    tier_delete_during_movement(true).await
-}

crates/e2e_test/src/distributed/table_catalog_test.rs

@@ -1,140 +0,0 @@
-// 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::harness::{DistCluster, DistLayout, TestResult, get_object_bytes, put_object, unique_bucket};
-use crate::common::{init_logging, signed_request};
-use http::{Method, StatusCode};
-use serde_json::{Value, json};
-
-async fn catalog_request(
-    dist: &DistCluster,
-    node: usize,
-    method: Method,
-    path: &str,
-    body: Option<Value>,
-    expected: StatusCode,
-) -> TestResult<Value> {
-    let response = signed_request(
-        method.clone(),
-        &format!("{}{path}", dist.cluster.nodes[node].url),
-        &dist.cluster.access_key,
-        &dist.cluster.secret_key,
-        body.map(|value| serde_json::to_vec(&value)).transpose()?,
-        Some("application/json"),
-    )
-    .await?;
-    let status = response.status();
-    let text = response.text().await?;
-    assert_eq!(status, expected, "node {node}: {method} {path}: {text}");
-    if text.is_empty() {
-        Ok(Value::Null)
-    } else {
-        Ok(serde_json::from_str(&text)?)
-    }
-}
-
-async fn assert_bucket_state(dist: &DistCluster, bucket: &str, enabled: bool) -> TestResult {
-    for node in 0..dist.cluster.nodes.len() {
-        let response =
-            catalog_request(dist, node, Method::GET, &format!("/iceberg/v1/buckets/{bucket}"), None, StatusCode::OK).await?;
-        assert_eq!(response["enabled"], enabled, "node {node}: {response}");
-        assert_eq!(response["table-bucket"], bucket);
-        let expected = if enabled { StatusCode::OK } else { StatusCode::BAD_REQUEST };
-        catalog_request(dist, node, Method::GET, &format!("/iceberg/v1/{bucket}/namespaces"), None, expected).await?;
-        assert_eq!(
-            get_object_bytes(&dist.client(node)?, bucket, "ordinary.txt").await?,
-            b"ordinary bucket object",
-            "node {node}: toggling table support changed an ordinary object"
-        );
-    }
-    Ok(())
-}
-
-async fn assert_table_state(dist: &DistCluster, table_path: &str, created: &Value, pointer: &Value) -> TestResult {
-    for node in 0..dist.cluster.nodes.len() {
-        let loaded = catalog_request(dist, node, Method::GET, table_path, None, StatusCode::OK).await?;
-        assert_eq!(loaded["metadata-location"], created["metadata-location"], "node {node}");
-        assert_eq!(loaded["metadata"], created["metadata"], "node {node}");
-        let actual_pointer =
-            catalog_request(dist, node, Method::GET, &format!("{table_path}/metadata-location"), None, StatusCode::OK).await?;
-        assert_eq!(&actual_pointer, pointer, "node {node}: catalog pointer changed");
-    }
-    Ok(())
-}
-
-#[tokio::test]
-async fn table_bucket_toggles_reload_cached_metadata_on_every_peer() -> TestResult {
-    init_logging();
-    let dist = DistCluster::start_with_env(DistLayout::FourByFour, &[("RUSTFS_TABLE_CATALOG_BACKING", "object")]).await?;
-    let bucket = unique_bucket("table-peer-reload");
-    dist.create_bucket(&bucket).await?;
-    put_object(&dist.client(0)?, &bucket, "ordinary.txt", b"ordinary bucket object".to_vec()).await?;
-    let bucket_path = format!("/iceberg/v1/buckets/{bucket}");
-
-    // Warm each node's false cache before changing the marker. Do not poll:
-    // successful toggles must notify peers before their response is returned.
-    assert_bucket_state(&dist, &bucket, false).await?;
-    for (node, method, enabled) in [(0, Method::PUT, true), (1, Method::DELETE, false), (2, Method::PUT, true)] {
-        let response = catalog_request(&dist, node, method, &bucket_path, None, StatusCode::OK).await?;
-        assert_eq!(response["enabled"], enabled);
-        assert_bucket_state(&dist, &bucket, enabled).await?;
-    }
-
-    let namespaces = format!("/iceberg/v1/{bucket}/namespaces");
-    catalog_request(&dist, 3, Method::POST, &namespaces, Some(json!({"namespace": ["lab"]})), StatusCode::OK).await?;
-    let tables = format!("{namespaces}/lab/tables");
-    let created = catalog_request(
-        &dist,
-        0,
-        Method::POST,
-        &tables,
-        Some(json!({
-            "name": "events",
-            "schema": {
-                "type": "struct",
-                "fields": [{"id": 1, "name": "id", "required": false, "type": "long"}]
-            },
-            "stage-create": false
-        })),
-        StatusCode::OK,
-    )
-    .await?;
-    let uuid = created["metadata"]["table-uuid"]
-        .as_str()
-        .ok_or("create response omitted table UUID")?;
-    assert!(!uuid::Uuid::parse_str(uuid)?.is_nil());
-    assert!(
-        created["metadata-location"]
-            .as_str()
-            .is_some_and(|location| location.starts_with(&format!("s3://{bucket}/")))
-    );
-    let table_path = format!("{tables}/events");
-    let pointer =
-        catalog_request(&dist, 3, Method::GET, &format!("{table_path}/metadata-location"), None, StatusCode::OK).await?;
-    assert_eq!(pointer["metadata-location"], created["metadata-location"]);
-    assert!(pointer["version-token"].as_str().is_some_and(|token| !token.is_empty()));
-    assert!(pointer["generation"].as_u64().is_some());
-    assert_eq!(pointer["warehouse-location"], created["metadata"]["location"]);
-    assert_table_state(&dist, &table_path, &created, &pointer).await?;
-
-    // A rejected toggle must preserve both peer protections and catalog state.
-    catalog_request(&dist, 1, Method::DELETE, &bucket_path, None, StatusCode::CONFLICT).await?;
-    assert_bucket_state(&dist, &bucket, true).await?;
-    assert_table_state(&dist, &table_path, &created, &pointer).await?;
-
-    catalog_request(&dist, 2, Method::DELETE, &table_path, None, StatusCode::NO_CONTENT).await?;
-    catalog_request(&dist, 3, Method::DELETE, &format!("{namespaces}/lab"), None, StatusCode::NO_CONTENT).await?;
-    // The cluster fixture owns all remaining catalog objects and data roots.
-    Ok(())
-}

crates/e2e_test/src/distributed/upgrade_test.rs

@@ -60,7 +60,7 @@ struct UpgradeSeed {
     iam_secret: &'static str,
 }
 
-pub(super) fn source_binary() -> TestResult<PathBuf> {
+fn source_binary() -> TestResult<PathBuf> {
     let path = std::env::var_os(SOURCE_BINARY_ENV).map(PathBuf::from).ok_or_else(|| {
         format!(
             "{SOURCE_BINARY_ENV} must point to the pinned previous release binary (the e2e-distributed workflow downloads it)"

crates/e2e_test/src/distributed/versioning_test.rs

@@ -17,14 +17,6 @@ use crate::common::init_logging;
 use aws_sdk_s3::error::ProvideErrorMetadata;
 use aws_sdk_s3::types::{BucketVersioningStatus, VersioningConfiguration};
 
-#[tokio::test]
-async fn four_node_explicit_delete_marker_batch_is_immediately_visible() -> TestResult {
-    init_logging();
-    let dist = DistCluster::start(DistLayout::FourByFour).await?;
-    let bucket = unique_bucket("explicit-marker-batch");
-    crate::delete_objects_versioning_test::assert_explicit_marker_batch_cleanup(&dist.clients()?, &bucket).await
-}
-
 #[tokio::test]
 async fn four_node_four_drive_versioning_put_list_get_delete_marker() -> TestResult {
     init_logging();

crates/e2e_test/src/fake_s3_target/mod.rs

@@ -487,43 +487,36 @@ impl JournaledHeaders {
 struct ControlState {
     scripts: HashMap<Operation, VecDeque<FaultAction>>,
     keyed_scripts: HashMap<(Operation, String), VecDeque<FaultAction>>,
-    held_get: Option<HeldObject>,
-    held_delete: Option<HeldObject>,
+    held_get: Option<HeldGetObject>,
     requests: VecDeque<RequestRecord>,
     next_sequence: u64,
 }
 
 #[derive(Clone)]
-struct HeldObject {
+struct HeldGetObject {
     bucket: String,
     key: String,
     entered: watch::Sender<usize>,
     released: watch::Receiver<bool>,
 }
 
-/// Holds every matching operation, including retries, until this guard is dropped.
-#[must_use = "dropping the guard releases the held requests"]
-pub struct ObjectGate {
+/// Holds every GET of one object, including retries, until this guard is dropped.
+#[must_use = "dropping the guard releases the held GET requests"]
+pub struct GetObjectGate {
     control: Arc<Mutex<ControlState>>,
-    operation: Operation,
     entered: watch::Receiver<usize>,
     released: watch::Sender<bool>,
 }
 
-impl ObjectGate {
+impl GetObjectGate {
     pub async fn wait_until_entered(&mut self) -> Result<(), watch::error::RecvError> {
         self.entered.wait_for(|count| *count > 0).await.map(|_| ())
     }
 }
 
-impl Drop for ObjectGate {
+impl Drop for GetObjectGate {
     fn drop(&mut self) {
-        let mut state = lock(&self.control);
-        match self.operation {
-            Operation::GetObject => state.held_get = None,
-            Operation::DeleteObject => state.held_delete = None,
-            _ => unreachable!("only GET and DELETE have object gates"),
-        }
+        lock(&self.control).held_get = None;
         self.released.send_replace(true);
     }
 }
@@ -1115,40 +1108,24 @@ impl FakeS3Target {
     }
 
     /// Hold one exact bucket/key before any GET response can reach the client.
-    /// The fixture supports one live GET gate; request and connection deadlines still apply.
-    pub fn hold_get_object(&self, bucket: &str, key: &str) -> ObjectGate {
-        self.hold_object_operation(Operation::GetObject, bucket, key)
-    }
-
-    /// Hold one exact bucket/key before DELETE changes any stored version.
-    /// The fixture supports one live DELETE gate; request deadlines still apply.
-    pub fn hold_delete_object(&self, bucket: &str, key: &str) -> ObjectGate {
-        self.hold_object_operation(Operation::DeleteObject, bucket, key)
-    }
-
-    fn hold_object_operation(&self, operation: Operation, bucket: &str, key: &str) -> ObjectGate {
+    /// The fixture supports one live gate; request and connection deadlines still apply.
+    pub fn hold_get_object(&self, bucket: &str, key: &str) -> GetObjectGate {
         assert!(
             bucket.len() <= MAX_RETAINED_IDENTIFIER_BYTES && key.len() <= MAX_RETAINED_IDENTIFIER_BYTES,
-            "held object identifiers exceed the fixture limit"
+            "held GET identifiers exceed the fixture limit"
         );
         let mut state = lock(&self.control);
-        let slot = match operation {
-            Operation::GetObject => &mut state.held_get,
-            Operation::DeleteObject => &mut state.held_delete,
-            _ => unreachable!("only GET and DELETE have object gates"),
-        };
-        assert!(slot.is_none(), "fake target already holds a {operation:?} gate");
+        assert!(state.held_get.is_none(), "fake target already holds a GET gate");
         let (entered, entered_rx) = watch::channel(0);
         let (released, released_rx) = watch::channel(false);
-        *slot = Some(HeldObject {
+        state.held_get = Some(HeldGetObject {
             bucket: bucket.to_string(),
             key: key.to_string(),
             entered,
             released: released_rx,
         });
-        ObjectGate {
+        GetObjectGate {
             control: Arc::clone(&self.control),
-            operation,
             entered: entered_rx,
             released,
         }
@@ -2818,15 +2795,6 @@ impl S3 for FakeBackend {
         apply_non_body_fault(fault.as_ref(), &self.control).await?;
         let headers = req.headers;
         let input = req.input;
-        let held_delete = lock(&self.control)
-            .held_delete
-            .as_ref()
-            .filter(|held| held.bucket == input.bucket && held.key == input.key)
-            .cloned();
-        if let Some(mut held) = held_delete {
-            held.entered.send_modify(|count| *count += 1);
-            let _ = held.released.wait_for(|released| *released).await;
-        }
         let mut state = lock(&self.store);
         let Some(versioned) = state.buckets.get(&input.bucket).map(|bucket| bucket.versioned) else {
             return Err(s3s::s3_error!(NoSuchBucket, "bucket does not exist"));
@@ -3468,68 +3436,6 @@ mod tests {
         Ok(())
     }
 
-    #[tokio::test]
-    async fn delete_object_gate_retains_exact_version_until_release() -> Result<(), BoxError> {
-        let target = FakeS3Target::start().await?;
-        let bucket = "delete-gated-target";
-        target.create_bucket(bucket);
-        for key in ["held", "unrelated"] {
-            target.put_seed_object(bucket, key, Bytes::from_static(b"payload"), &SeedMetadata::default());
-        }
-        let versions = target.stored_versions(bucket, "held");
-        let mut gate = target.hold_delete_object(bucket, "held");
-        let client = client(&target);
-        let held_client = client.clone();
-        let version = versions[0].0.clone();
-        let mut requests = tokio::task::JoinSet::new();
-        requests.spawn(async move {
-            held_client
-                .delete_object()
-                .bucket(bucket)
-                .key("held")
-                .version_id(version)
-                .send()
-                .await
-        });
-        timeout(Duration::from_secs(2), gate.wait_until_entered()).await??;
-        assert_eq!(
-            target.stored_versions(bucket, "held"),
-            versions,
-            "the gate must precede the storage mutation"
-        );
-        assert!(requests.try_join_next().is_none());
-        let held = target
-            .requests()
-            .into_iter()
-            .find(|record| record.operation == Operation::DeleteObject && record.key.as_deref() == Some("held"))
-            .expect("the held DELETE must be journaled");
-        assert_eq!(held.version_id.as_deref(), Some(versions[0].0.as_str()));
-        assert_eq!(held.prepared_response, None);
-        client
-            .delete_object()
-            .bucket(bucket)
-            .key("unrelated")
-            .version_id(&target.stored_versions(bucket, "unrelated")[0].0)
-            .send()
-            .await?;
-        assert!(target.stored_versions(bucket, "unrelated").is_empty());
-        assert_eq!(target.stored_versions(bucket, "held"), versions);
-        drop(gate);
-        timeout(Duration::from_secs(2), requests.join_next())
-            .await?
-            .expect("held DELETE task")??;
-        assert!(target.stored_versions(bucket, "held").is_empty());
-        let released = target
-            .requests()
-            .into_iter()
-            .find(|record| record.sequence == held.sequence)
-            .and_then(|record| record.prepared_response)
-            .expect("released DELETE response");
-        assert_eq!(released.status, 204);
-        assert_eq!(released.version_id.as_deref(), Some(versions[0].0.as_str()));
-        Ok(())
-    }
-
     #[tokio::test]
     async fn object_lock_target_requires_a_checksum_on_locked_puts() -> Result<(), BoxError> {
         use aws_sdk_s3::error::ProvideErrorMetadata;

crates/e2e_test/src/heal_erasure_disk_rebuild_test.rs

@@ -21,7 +21,7 @@ mod tests {
     };
     use crate::common::{
         ClusterTopology, FAST_DATA_USAGE_SCANNER_ENV, RustFSTestClusterEnvironment, RustFSTestEnvironment, admin_request,
-        init_logging, local_http_client, rustfs_binary_path,
+        init_logging, rustfs_binary_path,
     };
     use crate::storage_api::RUSTFS_META_BUCKET;
     use aws_sdk_s3::{
@@ -53,196 +53,6 @@ mod tests {
         expected_pool_metadata: Option<VersionShardCensus>,
     }
 
-    fn pool_metadata_matches_republished_manifest(actual: &VersionShardCensus, expected: &VersionShardCensus) -> bool {
-        for data_dir in [&actual.data_dir, &expected.data_dir] {
-            if data_dir
-                .as_deref()
-                .and_then(|value| uuid::Uuid::parse_str(value).ok())
-                .is_none_or(|value| value.is_nil())
-            {
-                return false;
-            }
-        }
-        // The owning CAS republishes the same canonical payload with a fresh
-        // physical identity. Every shard and layout field must still match.
-        let mut republished = actual.clone();
-        republished.data_dir = expected.data_dir.clone();
-        republished.matches_manifest(expected)
-    }
-
-    fn pool_metadata_node_health_is_ready(status: u16, payload: &serde_json::Value) -> bool {
-        (200..300).contains(&status)
-            && payload["ready"] == true
-            && payload["details"]["poolMetadata"]["ready"] == true
-            && payload["details"]["storage"]["readQuorum"] == true
-            && payload["details"]["storage"]["writeQuorum"] == true
-    }
-
-    async fn all_nodes_pool_metadata_readiness(
-        cluster: &RustFSTestClusterEnvironment,
-        deadline: Instant,
-    ) -> (bool, serde_json::Value) {
-        let http = local_http_client();
-        let mut ready = !cluster.nodes.is_empty();
-        let mut observations = Vec::with_capacity(cluster.nodes.len());
-        for (node, environment) in cluster.nodes.iter().enumerate() {
-            let response = tokio::time::timeout_at(deadline, async {
-                let response = http
-                    .get(format!("{}/health/ready", environment.url))
-                    .timeout(Duration::from_secs(3))
-                    .send()
-                    .await?;
-                let status = response.status().as_u16();
-                let payload = response.json::<serde_json::Value>().await?;
-                Ok::<_, reqwest::Error>((status, payload))
-            })
-            .await;
-            let observation = match response {
-                Ok(Ok((status, payload))) => {
-                    let node_ready = pool_metadata_node_health_is_ready(status, &payload);
-                    ready &= node_ready;
-                    serde_json::json!({"node": node, "status": status, "ready": node_ready, "payload": payload})
-                }
-                Ok(Err(error)) => {
-                    ready = false;
-                    serde_json::json!({"node": node, "error": error.to_string()})
-                }
-                Err(_) => {
-                    ready = false;
-                    serde_json::json!({"node": node, "error": "pool metadata health deadline elapsed"})
-                }
-            };
-            observations.push(observation);
-        }
-        let deadline_elapsed = Instant::now() >= deadline;
-        (
-            ready && !deadline_elapsed,
-            serde_json::json!({"deadline_elapsed": deadline_elapsed, "nodes": observations}),
-        )
-    }
-
-    fn pool_metadata_manifest_fixture() -> VersionShardCensus {
-        VersionShardCensus {
-            version_id: None,
-            has_xl_meta: true,
-            data_dir: Some(uuid::Uuid::from_u128(1).to_string()),
-            erasure_index: Some(1),
-            erasure_distribution: Some(vec![1, 2, 3, 4]),
-            data_blocks: Some(2),
-            parity_blocks: Some(2),
-            expected_part_numbers: Default::default(),
-            present_part_fingerprints: Default::default(),
-            inline_data_fingerprint: Some(crate::chaos::PartShardFingerprint {
-                size: 7,
-                sha256: sha256_hex(b"payload"),
-            }),
-        }
-    }
-
-    #[test]
-    fn pool_metadata_republication_allows_only_valid_data_dir_change() {
-        let expected = pool_metadata_manifest_fixture();
-        let mut actual = expected.clone();
-        actual.data_dir = Some(uuid::Uuid::from_u128(2).to_string());
-        assert!(pool_metadata_matches_republished_manifest(&actual, &expected));
-        assert!(
-            !actual.matches_manifest(&expected),
-            "ordinary object manifests must retain their original identity"
-        );
-        for invalid in [
-            None,
-            Some(String::new()),
-            Some("invalid".to_string()),
-            Some(uuid::Uuid::nil().to_string()),
-        ] {
-            let mut changed = actual.clone();
-            changed.data_dir = invalid.clone();
-            assert!(!pool_metadata_matches_republished_manifest(&changed, &expected));
-            let mut changed_expected = expected.clone();
-            changed_expected.data_dir = invalid;
-            assert!(!pool_metadata_matches_republished_manifest(&actual, &changed_expected));
-        }
-        let mut changed = actual.clone();
-        changed
-            .inline_data_fingerprint
-            .as_mut()
-            .expect("fixture has inline payload")
-            .sha256 = sha256_hex(b"corrupt");
-        assert!(!pool_metadata_matches_republished_manifest(&changed, &expected));
-        let mut changed = actual.clone();
-        changed.erasure_index = Some(2);
-        assert!(!pool_metadata_matches_republished_manifest(&changed, &expected));
-        let mut changed = actual.clone();
-        changed.erasure_distribution = Some(vec![2, 1, 3, 4]);
-        assert!(!pool_metadata_matches_republished_manifest(&changed, &expected));
-        let mut changed = actual.clone();
-        changed.data_blocks = Some(1);
-        assert!(!pool_metadata_matches_republished_manifest(&changed, &expected));
-        let mut changed = actual.clone();
-        changed.parity_blocks = Some(3);
-        assert!(!pool_metadata_matches_republished_manifest(&changed, &expected));
-        let mut changed = actual.clone();
-        changed.version_id = Some(uuid::Uuid::from_u128(3).to_string());
-        assert!(!pool_metadata_matches_republished_manifest(&changed, &expected));
-        let mut changed = actual;
-        changed.has_xl_meta = false;
-        assert!(!pool_metadata_matches_republished_manifest(&changed, &expected));
-    }
-
-    #[test]
-    fn pool_metadata_republication_requires_exact_complete_part_fingerprints() {
-        let mut expected = pool_metadata_manifest_fixture();
-        expected.inline_data_fingerprint = None;
-        expected.expected_part_numbers.insert(1);
-        expected.present_part_fingerprints.insert(
-            1,
-            crate::chaos::PartShardFingerprint {
-                size: 7,
-                sha256: sha256_hex(b"payload"),
-            },
-        );
-        let mut actual = expected.clone();
-        actual.data_dir = Some(uuid::Uuid::from_u128(2).to_string());
-        assert!(pool_metadata_matches_republished_manifest(&actual, &expected));
-        let mut changed = actual.clone();
-        changed.present_part_fingerprints.remove(&1);
-        assert!(!pool_metadata_matches_republished_manifest(&changed, &expected));
-        let mut changed = actual;
-        changed
-            .present_part_fingerprints
-            .get_mut(&1)
-            .expect("fixture has part 1")
-            .sha256 = sha256_hex(b"corrupt");
-        assert!(!pool_metadata_matches_republished_manifest(&changed, &expected));
-    }
-
-    #[test]
-    fn pool_metadata_node_health_requires_explicit_metadata_and_both_quorums() {
-        let expected = serde_json::json!({"ready": true, "details": {
-            "poolMetadata": {"ready": true},
-            "storage": {"readQuorum": true, "writeQuorum": true}
-        }});
-        assert!(pool_metadata_node_health_is_ready(200, &expected));
-        assert!(!pool_metadata_node_health_is_ready(503, &expected));
-        assert!(!pool_metadata_node_health_is_ready(200, &serde_json::json!({"ready": true})));
-        for path in [
-            "/ready",
-            "/details/poolMetadata/ready",
-            "/details/storage/readQuorum",
-            "/details/storage/writeQuorum",
-        ] {
-            for value in [
-                serde_json::Value::Bool(false),
-                serde_json::Value::Null,
-                serde_json::json!("true"),
-            ] {
-                let mut changed = expected.clone();
-                *changed.pointer_mut(path).expect("fixture contains required health field") = value;
-                assert!(!pool_metadata_node_health_is_ready(200, &changed), "required health field {path}");
-            }
-        }
-    }
-
     #[derive(serde::Deserialize)]
     struct EvidenceBuild {
         sha256: String,
@@ -1396,9 +1206,7 @@ mod tests {
         let interval = interval
             .filter(|interval| *interval != 0)
             .ok_or("scanner schedule has no positive interval")?;
-        // A new leader may already be sleeping before completing its first cycle.
-        let schedule_start = if cycle_end == 0 { now } else { cycle_end };
-        let next_cycle = schedule_start
+        let next_cycle = cycle_end
             .checked_add(interval)
             .ok_or("scanner schedule timestamp overflows")?;
         let budget = next_cycle
@@ -1415,11 +1223,6 @@ mod tests {
             Ok(Duration::from_secs(259)),
         );
         assert_eq!(scanner_cycle_completion_budget(100, Some(1), 110, false), Ok(Duration::from_secs(60)));
-        // A newly elected leader can advertise a sleep before its first completed cycle.
-        assert_eq!(
-            scanner_cycle_completion_budget(0, Some(289), 1_792_913_211, false),
-            Ok(Duration::from_secs(349)),
-        );
     }
 
     #[test]
@@ -1440,7 +1243,7 @@ mod tests {
         previous_cycle_end: u64,
     ) -> Result<u64, Box<dyn Error + Send + Sync>> {
         let mut deadline = Instant::now() + Duration::from_secs(60);
-        let mut accounted_schedules = HashSet::new();
+        let mut schedule_accounted = false;
         loop {
             let mut latest_cycle_end = 0;
             let mut versions_observed = false;
@@ -1487,27 +1290,15 @@ mod tests {
                     return Err("scanner cycle timestamp is in the future".into());
                 }
                 let schedule = &status["cycle_schedule"];
-                if schedule["execution_role"].as_str() == Some("leader") {
+                if !schedule_accounted && schedule["execution_role"].as_str() == Some("leader") {
                     let active = metrics["current_cycle_active"]
                         .as_bool()
                         .ok_or("scanner status is missing its active-cycle flag")?;
-                    if active || schedule["effective_interval_available"].as_bool() == Some(true) {
-                        let interval = if active {
-                            None
-                        } else {
-                            Some(
-                                schedule["effective_interval_seconds"]
-                                    .as_u64()
-                                    .ok_or("scanner schedule is missing its effective interval")?,
-                            )
-                        };
-                        // Reconsider a changed leader or retry plan, but never renew
-                        // the deadline on repeated observations of the same sleep.
-                        if accounted_schedules.insert((node_index, cycle_end, interval)) {
-                            let budget = scanner_cycle_completion_budget(cycle_end, interval, now, active)?;
-                            let scheduled_deadline = Instant::now().checked_add(budget).ok_or("scanner deadline overflows")?;
-                            deadline = deadline.max(scheduled_deadline);
-                        }
+                    if active || (cycle_end != 0 && schedule["effective_interval_available"].as_bool() == Some(true)) {
+                        let interval = schedule["effective_interval_seconds"].as_u64();
+                        let budget = scanner_cycle_completion_budget(cycle_end, interval, now, active)?;
+                        deadline = Instant::now().checked_add(budget).ok_or("scanner deadline overflows")?;
+                        schedule_accounted = true;
                     }
                 }
                 // Superseded walks complete all sets while withholding quota authority.
@@ -2422,7 +2213,6 @@ mod tests {
             .and_then(|value| value.parse::<u64>().ok())
             .unwrap_or(180);
         let heal_deadline = Instant::now() + Duration::from_secs(heal_timeout_secs);
-        let mut last_pool_metadata_readiness = serde_json::Value::Null;
         loop {
             if restart_recovery_admin_after_failure && !recovery_admin_task_restarted {
                 let task_state = timeout(
@@ -2464,23 +2254,14 @@ mod tests {
                 let outage_census = census_object_version_on_disk(&replaced_disk, bucket, &outage_key, None)?;
                 let pool_metadata_matches = match &expected_pool_metadata {
                     Some(expected) => {
-                        let actual =
-                            census_object_version_on_disk(&replaced_disk, RUSTFS_META_BUCKET, POOL_METADATA_OBJECT, None)?;
-                        pool_metadata_matches_republished_manifest(&actual, expected)
+                        census_object_version_on_disk(&replaced_disk, RUSTFS_META_BUCKET, POOL_METADATA_OBJECT, None)?
+                            .matches_manifest(expected)
                     }
                     None => true,
                 };
-                let pool_metadata_ready = if expected_pool_metadata.is_some() && pool_metadata_matches {
-                    let (ready, observation) = all_nodes_pool_metadata_readiness(&cluster, heal_deadline).await;
-                    last_pool_metadata_readiness = observation;
-                    ready
-                } else {
-                    expected_pool_metadata.is_none()
-                };
                 if matching == expected_manifests.len()
                     && (!outage_target_manifest_required || outage_census.is_complete())
                     && pool_metadata_matches
-                    && pool_metadata_ready
                 {
                     break;
                 }
@@ -2490,15 +2271,6 @@ mod tests {
                 let outage_census = census_object_version_on_disk(&replaced_disk, bucket, &outage_key, None)?;
                 let pool_metadata =
                     census_object_version_on_disk(&replaced_disk, RUSTFS_META_BUCKET, POOL_METADATA_OBJECT, None)?;
-                // This post-deadline observation is diagnostic only. It cannot
-                // make an expired recovery attempt satisfy the original budget.
-                let pool_metadata_readiness = if expected_pool_metadata.is_some() {
-                    let (_, observation) =
-                        all_nodes_pool_metadata_readiness(&cluster, Instant::now() + Duration::from_secs(3)).await;
-                    serde_json::json!({"last_eligible_check": last_pool_metadata_readiness, "timeout_check": observation})
-                } else {
-                    serde_json::Value::Null
-                };
                 let final_status = signed_admin_post(&status_url, None, &cluster.access_key, &cluster.secret_key)
                     .await
                     .unwrap_or_else(|err| format!("status request failed: {err}"));
@@ -2522,7 +2294,7 @@ mod tests {
                     Err(_) => "replacement status request exceeded 5s diagnostic budget".to_string(),
                 };
                 return Err(format!(
-                    "root heal did not recover after {interruption_kind} within {heal_timeout_secs}s: baseline={matching}/{}, outage={outage_census:?}, pool_metadata_expected={expected_pool_metadata:?}, pool_metadata={pool_metadata:?}, pool_metadata_readiness={pool_metadata_readiness}, status={final_status}, task_status={task_status}, pre_interrupt_status={pre_interrupt_status}, pre_heal_replacement={pre_heal_replacement}, pre_interrupt_replacement={pre_interrupt_replacement}, replacement_status={replacement_status}",
+                    "root heal did not recover after {interruption_kind} within {heal_timeout_secs}s: baseline={matching}/{}, outage={outage_census:?}, pool_metadata={pool_metadata:?}, status={final_status}, task_status={task_status}, pre_interrupt_status={pre_interrupt_status}, pre_heal_replacement={pre_heal_replacement}, pre_interrupt_replacement={pre_interrupt_replacement}, replacement_status={replacement_status}",
                     expected_manifests.len()
                 )
                 .into());

crates/e2e_test/src/lib.rs

@@ -45,9 +45,6 @@ pub mod on_demand_migration;
 #[cfg(test)]
 pub mod fault_proxy;
 
-#[cfg(test)]
-mod rpc_fault_proxy;
-
 // Reliability tests built on the fault-injection harness
 #[cfg(test)]
 mod reliability_disk_fault_test;
@@ -192,9 +189,6 @@ mod conditional_delete_objects_test;
 #[cfg(test)]
 mod delete_authorization_test;
 
-#[cfg(test)]
-mod table_location_authorization_test;
-
 // Regression test for signed DELETE Object?versionId requests without Content-Length.
 #[cfg(test)]
 mod delete_object_no_content_length_test;

crates/e2e_test/src/list_objects_v2_pagination_test.rs

@@ -1129,14 +1129,12 @@ mod tests {
     /// and the marker plus the cursor tag.
     ///
     /// Bug Reference: backlog#1047
-    /// Earlier releases appended a `[rustfs_cache:...]` cursor tag to the last
-    /// returned key inside the V2 continuation token. The orchestration layer
-    /// passed that raw string to `forward_past`, so any key whose byte after the
-    /// shared stem sorts below `[` (0x5B) — `.`, `/`, `-`, digits, uppercase —
-    /// was silently dropped on the next page: with keys `a`, `a.txt`, `zz` and
-    /// max_keys=1, page 2 returned `zz` and `a.txt` was never listed. The token
-    /// is now base64 of the plain key, and this test keeps guarding the
-    /// continuation boundary.
+    /// The V2 continuation token appends a `[rustfs_cache:...]` cursor tag to the
+    /// last returned key. The orchestration layer passed that raw string to
+    /// `forward_past`, so any key whose byte after the shared stem sorts below
+    /// `[` (0x5B) — `.`, `/`, `-`, digits, uppercase — was silently dropped on
+    /// the next page: with keys `a`, `a.txt`, `zz` and max_keys=1, page 2
+    /// returned `zz` and `a.txt` was never listed.
     #[tokio::test]
     async fn test_list_objects_v2_continuation_keeps_keys_after_marker_stem() {
         init_logging();

crates/e2e_test/src/multipart_copy_readiness_test.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Multipart completion validation, staging preservation, and CopyObject readiness.
+//! Harbor / Docker Distribution multipart staging to CopyObject regressions.
 
 use crate::common::{RustFSTestEnvironment, init_logging};
 use aws_sdk_s3::error::ProvideErrorMetadata;
@@ -39,132 +39,6 @@ fn list_contains_key(output: &aws_sdk_s3::operation::list_objects_v2::ListObject
         .any(|object| object.key().is_some_and(|candidate| candidate == key))
 }
 
-#[tokio::test]
-async fn multipart_complete_invalid_etag_returns_400_and_preserves_retry() -> Result<(), Box<dyn Error + Send + Sync>> {
-    init_logging();
-    let mut env = RustFSTestEnvironment::new().await?;
-    env.start_rustfs_server(vec![]).await?;
-    let client = env.create_s3_client();
-    let bucket = "multipart-invalid-etag";
-    let key = "object";
-    env.create_test_bucket(bucket).await?;
-    let original = b"original object";
-    client
-        .put_object()
-        .bucket(bucket)
-        .key(key)
-        .body(ByteStream::from_static(original))
-        .send()
-        .await?;
-    let upload = client.create_multipart_upload().bucket(bucket).key(key).send().await?;
-    let upload_id = upload.upload_id().ok_or("missing upload id")?;
-    let payload = b"completed multipart payload";
-    let mut uploaded_etag = None;
-
-    // The first case reproduces #8771's Create -> Complete sequence without UploadPart.
-    for (upload_first, part_number, etag) in [
-        (false, 1, Some("unknown-etag")),
-        (true, 1, Some("unknown-etag")),
-        (true, 1, Some("\"unknown-etag\"")),
-        (true, 1, Some("00000000000000000000000000000000")),
-        (true, 1, None),
-        (true, 2, Some("unknown-etag")),
-    ] {
-        if upload_first && uploaded_etag.is_none() {
-            let part = client
-                .upload_part()
-                .bucket(bucket)
-                .key(key)
-                .upload_id(upload_id)
-                .part_number(1)
-                .body(ByteStream::from_static(payload))
-                .send()
-                .await?;
-            uploaded_etag = Some(part.e_tag().ok_or("missing part ETag")?.to_owned());
-        }
-        let error = client
-            .complete_multipart_upload()
-            .bucket(bucket)
-            .key(key)
-            .upload_id(upload_id)
-            .multipart_upload(
-                CompletedMultipartUpload::builder()
-                    .parts(
-                        CompletedPart::builder()
-                            .part_number(part_number)
-                            .set_e_tag(etag.map(str::to_owned))
-                            .build(),
-                    )
-                    .build(),
-            )
-            .send()
-            .await
-            .expect_err("missing or mismatched parts must not complete the upload");
-        assert_eq!(error.raw_response().map(|response| response.status().as_u16()), Some(400), "{error:?}");
-        assert_eq!(
-            error.as_service_error().and_then(ProvideErrorMetadata::code),
-            Some("InvalidPart"),
-            "{error:?}"
-        );
-
-        let staged = client
-            .list_parts()
-            .bucket(bucket)
-            .key(key)
-            .upload_id(upload_id)
-            .send()
-            .await?;
-        assert_eq!(staged.parts().len(), usize::from(uploaded_etag.is_some()));
-        if let Some(etag) = uploaded_etag.as_deref() {
-            assert_eq!(staged.parts()[0].part_number(), Some(1));
-            assert_eq!(staged.parts()[0].e_tag(), Some(etag));
-        }
-        let current = client
-            .get_object()
-            .bucket(bucket)
-            .key(key)
-            .send()
-            .await?
-            .body
-            .collect()
-            .await?
-            .into_bytes();
-        assert_eq!(current.as_ref(), original, "rejected completion must preserve the original object");
-    }
-
-    let etag = uploaded_etag.ok_or("part was not uploaded")?;
-    // Accept the unquoted value, then replay with the quoted UploadPart response.
-    for etag in [etag.trim_matches('"'), etag.as_str()] {
-        client
-            .complete_multipart_upload()
-            .bucket(bucket)
-            .key(key)
-            .upload_id(upload_id)
-            .multipart_upload(
-                CompletedMultipartUpload::builder()
-                    .parts(CompletedPart::builder().part_number(1).e_tag(etag).build())
-                    .build(),
-            )
-            .send()
-            .await?;
-    }
-    let current = client
-        .get_object()
-        .bucket(bucket)
-        .key(key)
-        .send()
-        .await?
-        .body
-        .collect()
-        .await?
-        .into_bytes();
-    assert_eq!(current.as_ref(), payload, "a valid retry must publish the exact uploaded bytes");
-    client.delete_object().bucket(bucket).key(key).send().await?;
-    env.delete_test_bucket(bucket).await?;
-    env.stop_server();
-    Ok(())
-}
-
 async fn upload_one_part_mpu(
     client: &aws_sdk_s3::Client,
     bucket: &str,

crates/e2e_test/src/negative_sigv4_test.rs

@@ -230,302 +230,6 @@ fn encode_unsigned_aws_chunked_with_sha256_trailer(decoded: &[u8]) -> Vec<u8> {
     encoded
 }
 
-/// Sign the data and terminating chunks independently of the server decoder.
-fn encode_signed_aws_chunked(signer: &SigV4, headers: &SignedHeaders, decoded: &[u8], trailer: bool) -> Vec<u8> {
-    let mut previous = headers
-        .authorization
-        .rsplit_once("Signature=")
-        .expect("seed signature")
-        .1
-        .to_string();
-    let mut encoded = Vec::new();
-    for chunk in [decoded, b"".as_slice()] {
-        let string_to_sign = format!(
-            "AWS4-HMAC-SHA256-PAYLOAD\n{}\n{}\n{previous}\n{}\n{}",
-            headers.amz_date,
-            get_scope(REGION, signer.time, "s3"),
-            sha256_hex(b""),
-            sha256_hex(chunk),
-        );
-        previous = get_signature(get_signing_key(&signer.secret_key, REGION, signer.time, "s3"), &string_to_sign);
-        encoded.extend_from_slice(format!("{:x};chunk-signature={previous}\r\n", chunk.len()).as_bytes());
-        encoded.extend_from_slice(chunk);
-        encoded.extend_from_slice(b"\r\n");
-    }
-    if trailer {
-        let checksum = sha256_base64(decoded);
-        let canonical = format!("x-amz-checksum-sha256:{checksum}\n");
-        let string_to_sign = format!(
-            "AWS4-HMAC-SHA256-TRAILER\n{}\n{}\n{previous}\n{}",
-            headers.amz_date,
-            get_scope(REGION, signer.time, "s3"),
-            sha256_hex(canonical.as_bytes()),
-        );
-        let signature = get_signature(get_signing_key(&signer.secret_key, REGION, signer.time, "s3"), &string_to_sign);
-        encoded.extend_from_slice(
-            format!("x-amz-checksum-sha256:{checksum}\r\nx-amz-trailer-signature:{signature}\r\n\r\n").as_bytes(),
-        );
-    }
-    encoded
-}
-
-/// Exercise decoder failures through both storage publication boundaries.
-#[tokio::test]
-async fn aws_chunked_named_errors_reject_put_and_upload_part() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    let mut env = RustFSTestEnvironment::new().await?;
-    setup(&mut env).await?;
-    let client = env.create_s3_client();
-    let decoded = b"private-chunked-fixture-body";
-    let mut failures = Vec::new();
-    for multipart in [false, true] {
-        for (case, expected_status, expected_code) in [
-            ("signature", 403, "SignatureDoesNotMatch"),
-            ("final-signature", 403, "SignatureDoesNotMatch"),
-            ("format", 400, "IncompleteBody"),
-            ("metadata-at-limit", 400, "IncompleteBody"),
-            ("metadata-over-limit", 400, "EntityTooLarge"),
-            ("chunk-over-limit", 400, "EntityTooLarge"),
-            ("trailers-over-limit", 400, "IncompleteBody"),
-            ("too-many-trailers", 400, "IncompleteBody"),
-        ] {
-            let key = format!("chunked-{case}-{multipart}.bin");
-            let upload_id = if multipart {
-                Some(
-                    client
-                        .create_multipart_upload()
-                        .bucket(BUCKET)
-                        .key(&key)
-                        .send()
-                        .await?
-                        .upload_id()
-                        .ok_or("missing upload ID")?
-                        .to_owned(),
-                )
-            } else {
-                None
-            };
-            let query = upload_id
-                .as_ref()
-                .map(|id| format!("partNumber=1&uploadId={}", urlencoding::encode(id)))
-                .unwrap_or_default();
-            let path = format!("/{BUCKET}/{key}");
-            let target = if query.is_empty() {
-                path.clone()
-            } else {
-                format!("{path}?{query}")
-            };
-            let signer = SigV4::new(&env);
-            let unsigned = matches!(case, "trailers-over-limit" | "too-many-trailers");
-            let mode = if unsigned {
-                UNSIGNED_PAYLOAD_TRAILER
-            } else {
-                "STREAMING-AWS4-HMAC-SHA256-PAYLOAD"
-            };
-            let length = decoded.len().to_string();
-            let mut extra = vec![
-                ("content-encoding", "aws-chunked"),
-                ("x-amz-decoded-content-length", length.as_str()),
-            ];
-            if unsigned {
-                extra.push(("x-amz-trailer", "x-amz-checksum-sha256"));
-            }
-            let headers = signer.sign_with_extra_headers("PUT", &path, &query, mode, &extra);
-            let encoded = match case {
-                "signature" | "final-signature" => {
-                    let mut body = encode_signed_aws_chunked(&signer, &headers, decoded, false);
-                    let offset = if case == "signature" {
-                        body.windows(2).position(|w| w == b"\r\n").expect("chunk header") + 2
-                    } else {
-                        body.len() - 5
-                    };
-                    body[offset] = if body[offset] == b'a' { b'b' } else { b'a' };
-                    body
-                }
-                "format" => b"invalid-chunk-size\r\n".to_vec(),
-                "metadata-at-limit" | "metadata-over-limit" => {
-                    let size = if case == "metadata-at-limit" { 1024 } else { 1025 };
-                    let mut body = vec![b'z'; size - 2];
-                    body.extend_from_slice(b"\r\n");
-                    body
-                }
-                "chunk-over-limit" => format!("10000001;chunk-signature={}\r\n", "0".repeat(64)).into_bytes(),
-                "trailers-over-limit" | "too-many-trailers" => {
-                    let mut body = format!("{:x}\r\n", decoded.len()).into_bytes();
-                    body.extend_from_slice(decoded);
-                    body.extend_from_slice(b"\r\n0\r\n");
-                    if case == "trailers-over-limit" {
-                        body.extend_from_slice(format!("x-private:{}\r\n\r\n", "v".repeat(16385 - 14)).as_bytes());
-                    } else {
-                        body.extend_from_slice("x-private:v\r\n".repeat(101).as_bytes());
-                        body.extend_from_slice(b"\r\n");
-                    }
-                    body
-                }
-                _ => unreachable!("all fixtures are enumerated"),
-            };
-            let mut request = local_http_client()
-                .put(format!("{}{target}", env.url))
-                .header("authorization", &headers.authorization)
-                .header("x-amz-content-sha256", &headers.content_sha256)
-                .header("x-amz-date", &headers.amz_date);
-            for (name, value) in extra {
-                request = request.header(name, value);
-            }
-            let response = request
-                .body(encoded)
-                .timeout(std::time::Duration::from_secs(20))
-                .send()
-                .await?;
-            let status = response.status().as_u16();
-            let body = response.text().await?;
-            eprintln!("aws-chunked {case} multipart={multipart}: HTTP {status}, {body}");
-            if status != expected_status || !body.contains(&format!("<Code>{expected_code}</Code>")) {
-                failures.push(format!(
-                    "{case} multipart={multipart}: expected {expected_status} {expected_code}, got {status} {body}"
-                ));
-            }
-            for private in [
-                "private-chunked-fixture-body",
-                "chunk-signature=",
-                "AwsChunkedStreamError",
-                "x-private",
-            ] {
-                if body.contains(private) {
-                    failures.push(format!("{case}: response exposed {private}"));
-                }
-            }
-            if let Some(id) = upload_id {
-                let parts = client.list_parts().bucket(BUCKET).key(&key).upload_id(&id).send().await?;
-                assert!(parts.parts().is_empty(), "{case}: rejected UploadPart published a part");
-                client
-                    .abort_multipart_upload()
-                    .bucket(BUCKET)
-                    .key(&key)
-                    .upload_id(id)
-                    .send()
-                    .await?;
-            }
-            let absent = client
-                .get_object()
-                .bucket(BUCKET)
-                .key(&key)
-                .send()
-                .await
-                .expect_err("a rejected body must not publish an object");
-            assert_eq!(absent.as_service_error().and_then(ProvideErrorMetadata::code), Some("NoSuchKey"));
-        }
-    }
-    assert!(failures.is_empty(), "{}", failures.join("\n"));
-    Ok(())
-}
-
-#[tokio::test]
-async fn aws_chunked_valid_signed_and_trailer_boundaries_succeed() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    let mut env = RustFSTestEnvironment::new().await?;
-    setup(&mut env).await?;
-    let client = env.create_s3_client();
-    let decoded = b"valid-chunked-control";
-    for (case, multipart) in ["signed", "signed-trailer", "trailer-size-limit", "trailer-count-limit"]
-        .into_iter()
-        .flat_map(|case| [false, true].map(|multipart| (case, multipart)))
-    {
-        let key = format!("{case}-{multipart}");
-        let upload_id = if multipart {
-            Some(
-                client
-                    .create_multipart_upload()
-                    .bucket(BUCKET)
-                    .key(&key)
-                    .send()
-                    .await?
-                    .upload_id()
-                    .ok_or("missing upload ID")?
-                    .to_owned(),
-            )
-        } else {
-            None
-        };
-        let query = upload_id
-            .as_ref()
-            .map(|id| format!("partNumber=1&uploadId={}", urlencoding::encode(id)))
-            .unwrap_or_default();
-        let signer = SigV4::new(&env);
-        let path = format!("/{BUCKET}/{key}");
-        let target = if query.is_empty() {
-            path.clone()
-        } else {
-            format!("{path}?{query}")
-        };
-        let length = decoded.len().to_string();
-        let mode = match case {
-            "signed" => "STREAMING-AWS4-HMAC-SHA256-PAYLOAD",
-            "signed-trailer" => "STREAMING-AWS4-HMAC-SHA256-PAYLOAD-TRAILER",
-            _ => UNSIGNED_PAYLOAD_TRAILER,
-        };
-        let mut extra = vec![
-            ("content-encoding", "aws-chunked"),
-            ("x-amz-decoded-content-length", length.as_str()),
-        ];
-        if case != "signed" {
-            extra.push(("x-amz-trailer", "x-amz-checksum-sha256"));
-        }
-        let headers = signer.sign_with_extra_headers("PUT", &path, &query, mode, &extra);
-        let mut encoded = if case.starts_with("signed") {
-            encode_signed_aws_chunked(&signer, &headers, decoded, case == "signed-trailer")
-        } else {
-            encode_unsigned_aws_chunked_with_sha256_trailer(decoded)
-        };
-        if !case.starts_with("signed") {
-            encoded.truncate(encoded.len() - 2);
-            if case == "trailer-size-limit" {
-                let checksum_line_size = format!("x-amz-checksum-sha256:{}\r\n", sha256_base64(decoded)).len();
-                encoded.extend_from_slice(format!("x-padding:{}\r\n", "v".repeat(16384 - checksum_line_size - 14)).as_bytes());
-            } else {
-                encoded.extend_from_slice("x-padding:v\r\n".repeat(99).as_bytes());
-            }
-            encoded.extend_from_slice(b"\r\n");
-        }
-        let mut request = local_http_client()
-            .put(format!("{}{target}", env.url))
-            .header("authorization", &headers.authorization)
-            .header("x-amz-content-sha256", &headers.content_sha256)
-            .header("x-amz-date", &headers.amz_date);
-        for (name, value) in extra {
-            request = request.header(name, value);
-        }
-        let response = request
-            .body(encoded)
-            .timeout(std::time::Duration::from_secs(20))
-            .send()
-            .await?;
-        let status = response.status();
-        let etag = response
-            .headers()
-            .get("etag")
-            .and_then(|value| value.to_str().ok())
-            .map(str::to_owned);
-        let body = response.text().await?;
-        assert_eq!(status.as_u16(), 200, "{case}: {body}");
-        if let Some(id) = upload_id {
-            let part = aws_sdk_s3::types::CompletedPart::builder()
-                .part_number(1)
-                .e_tag(etag.ok_or("successful UploadPart omitted ETag")?)
-                .build();
-            client
-                .complete_multipart_upload()
-                .bucket(BUCKET)
-                .key(&key)
-                .upload_id(id)
-                .multipart_upload(aws_sdk_s3::types::CompletedMultipartUpload::builder().parts(part).build())
-                .send()
-                .await?;
-        }
-        let object = client.get_object().bucket(BUCKET).key(&key).send().await?;
-        assert_eq!(object.body.collect().await?.into_bytes().as_ref(), decoded, "{case}");
-    }
-    Ok(())
-}
-
 /// Positive control: a correctly hand-signed request must succeed. Without
 /// this, every negative assertion below could pass for the wrong reason (a
 /// broken signer that never produces a valid signature).
@@ -862,54 +566,47 @@ async fn tampered_payload_is_rejected() -> Result<(), Box<dyn std::error::Error
     let mut env = RustFSTestEnvironment::new().await?;
     setup(&mut env).await?;
 
-    use md5::{Digest, Md5};
+    let key = "tampered-payload.txt";
+    let path = format!("/{BUCKET}/{key}");
+    let claimed_body = b"the-body-i-claim-to-send";
+    let actual_body = b"the-body-i-really-send!!";
+    assert_eq!(claimed_body.len(), actual_body.len(), "keep content-length stable for the mismatch");
 
     let signer = SigV4::new(&env);
-    let client = env.create_s3_client();
-    // Empty, small-eager, zero-copy, and streaming PUTs must share the error contract.
-    for size in [0, 24, 2 * 1024 * 1024, 17 * 1024 * 1024] {
-        let actual_body = vec![b'a'; size];
-        let wrong_hash = sha256_hex(b"a different payload");
-        let content_md5 = base64_simd::STANDARD.encode_to_string(Md5::digest(&actual_body));
-        for with_md5 in [false, true] {
-            let key = format!("tampered-payload-{size}-{with_md5}.txt");
-            let path = format!("/{BUCKET}/{key}");
-            let extra = if with_md5 {
-                vec![("content-md5", content_md5.as_str())]
-            } else {
-                vec![]
-            };
-            let headers = signer.sign_with_extra_headers("PUT", &path, "", &wrong_hash, &extra);
-            let mut request = local_http_client()
-                .put(format!("{}{}", env.url, path))
-                .header("x-amz-date", &headers.amz_date)
-                .header("x-amz-content-sha256", &headers.content_sha256)
-                .header("authorization", &headers.authorization);
-            for (name, value) in extra {
-                request = request.header(name, value);
-            }
-            let response = request.body(actual_body.clone()).send().await?;
-            let status = response.status();
-            let body = response.text().await?;
-            assert_eq!(status, reqwest::StatusCode::BAD_REQUEST, "payload mismatch: {body}");
-            assert_error_code(&body, "XAmzContentSHA256Mismatch");
-            assert!(
-                body.replace("&apos;", "'")
-                    .contains("<Message>The provided 'x-amz-content-sha256' header does not match what was computed.</Message>"),
-                "wrong message: {body}"
-            );
+    // Sign over the hash of the CLAIMED body (single-chunk payload hash), then
+    // send a different body of equal length.
+    let headers = signer.sign("PUT", &path, "", &sha256_hex(claimed_body));
 
-            let absent = client
-                .get_object()
-                .bucket(BUCKET)
-                .key(&key)
-                .send()
-                .await
-                .expect_err("a tampered payload must not publish an object");
-            assert_eq!(absent.raw_response().map(|response| response.status().as_u16()), Some(404));
-            assert_eq!(absent.as_service_error().and_then(ProvideErrorMetadata::code), Some("NoSuchKey"));
+    let result = send_signed(&env, reqwest::Method::PUT, &path, &headers, Some(actual_body.to_vec())).await;
+    match result {
+        Ok(resp) => {
+            let status = resp.status();
+            let body = resp.text().await.unwrap_or_default();
+            assert!(
+                status.is_client_error(),
+                "payload mismatch must be rejected with a client error, got {status}, body:\n{body}"
+            );
+            info!(%status, "tampered payload rejected with error status");
+        }
+        // A mid-stream hash-mismatch abort surfacing as a transport error is
+        // also a valid rejection (definitely not a 200 success).
+        Err(err) => {
+            assert!(!err.is_connect(), "connection failure is not proof of payload rejection: {err}");
+            assert!(!err.is_timeout(), "request timeout is not proof of payload rejection: {err}");
+            info!(%err, "tampered payload rejected via mid-stream transport error");
         }
     }
+
+    let absent = env
+        .create_s3_client()
+        .get_object()
+        .bucket(BUCKET)
+        .key(key)
+        .send()
+        .await
+        .expect_err("a tampered payload must not publish an object");
+    assert_eq!(absent.raw_response().map(|response| response.status().as_u16()), Some(404));
+    assert_eq!(absent.as_service_error().and_then(ProvideErrorMetadata::code), Some("NoSuchKey"));
     Ok(())
 }
 
@@ -941,9 +638,9 @@ async fn tampered_upload_part_payload_is_rejected() -> Result<(), Box<dyn std::e
     assert_eq!(
         status,
         reqwest::StatusCode::BAD_REQUEST,
-        "multipart payload mismatch must be rejected as XAmzContentSHA256Mismatch, body:\n{body}"
+        "multipart payload mismatch must be rejected as BadDigest, body:\n{body}"
     );
-    assert_error_code(&body, "XAmzContentSHA256Mismatch");
+    assert_error_code(&body, "BadDigest");
 
     let parts = client
         .list_parts()

crates/e2e_test/src/quota_test.rs

@@ -19,19 +19,6 @@ use http::{Method, StatusCode};
 use tokio::time::{Duration, sleep, timeout};
 use tracing::{debug, info};
 
-/// A successful reporting response can still have unknown scanner usage.
-fn reported_quota_usage(response: &serde_json::Value) -> std::io::Result<Option<u64>> {
-    let value = response
-        .get("current_usage")
-        .ok_or_else(|| std::io::Error::new(std::io::ErrorKind::InvalidData, "quota response is missing current_usage"))?;
-    if value.is_null() {
-        return Ok(None);
-    }
-    value.as_u64().map(Some).ok_or_else(|| {
-        std::io::Error::new(std::io::ErrorKind::InvalidData, "quota current_usage is not an unsigned integer or null")
-    })
-}
-
 /// Test environment setup for quota tests
 pub struct QuotaTestEnv {
     pub env: RustFSTestEnvironment,
@@ -100,69 +87,35 @@ impl QuotaTestEnv {
         }
     }
 
-    async fn wait_for_usage_response(
-        &self,
-        method: Method,
-        path: &str,
-        body: Option<String>,
-        expected_usage: u64,
-    ) -> Result<serde_json::Value, Box<dyn std::error::Error + Send + Sync>> {
-        let convergence = async {
-            loop {
-                let (status, response) = admin_request(
-                    &self.env.url,
-                    method.clone(),
-                    path,
-                    body.clone(),
-                    &self.env.access_key,
-                    &self.env.secret_key,
-                )
-                .await?;
-                if status.is_success() {
-                    let response: serde_json::Value = serde_json::from_str(&response)?;
-                    if let Some(usage) = reported_quota_usage(&response)?
-                        && usage == expected_usage
-                    {
-                        return Ok::<_, Box<dyn std::error::Error + Send + Sync>>(response);
-                    }
-                } else if status != StatusCode::SERVICE_UNAVAILABLE {
-                    return Err(format!("quota usage request failed for {path}: {status} {response}").into());
-                }
-                sleep(Duration::from_millis(100)).await;
-            }
-        };
-        match timeout(Duration::from_secs(30), convergence).await {
-            Ok(result) => result,
-            Err(_) => Err(format!("quota usage did not converge to {expected_usage} for {path} within 30 seconds").into()),
+    pub async fn get_bucket_quota_stats(&self) -> Result<serde_json::Value, Box<dyn std::error::Error + Send + Sync>> {
+        let url = format!("{}/rustfs/admin/v3/quota-stats/{}", self.env.url, self.bucket_name);
+        let response = awscurl_get(&url, &self.env.access_key, &self.env.secret_key).await?;
+
+        if response.contains("error") {
+            Err(format!("Failed to get quota stats: {}", response).into())
+        } else {
+            Ok(serde_json::from_str(&response)?)
         }
     }
 
-    async fn wait_for_bucket_quota_stats(
-        &self,
-        bucket: &str,
-        expected_usage: u64,
-    ) -> Result<serde_json::Value, Box<dyn std::error::Error + Send + Sync>> {
-        self.wait_for_usage_response(Method::GET, &format!("/rustfs/admin/v3/quota-stats/{bucket}"), None, expected_usage)
-            .await
-    }
-
-    async fn wait_for_bucket_quota_check(
+    pub async fn check_bucket_quota(
         &self,
         operation_type: &str,
         operation_size: u64,
-        expected_usage: u64,
     ) -> Result<serde_json::Value, Box<dyn std::error::Error + Send + Sync>> {
+        let url = format!("{}/rustfs/admin/v3/quota-check/{}", self.env.url, self.bucket_name);
         let check_request = serde_json::json!({
             "operation_type": operation_type,
             "operation_size": operation_size
         });
-        self.wait_for_usage_response(
-            Method::POST,
-            &format!("/rustfs/admin/v3/quota-check/{}", self.bucket_name),
-            Some(check_request.to_string()),
-            expected_usage,
-        )
-        .await
+
+        let response = awscurl_post(&url, &check_request.to_string(), &self.env.access_key, &self.env.secret_key).await?;
+
+        if response.contains("error") {
+            Err(format!("Failed to check quota: {}", response).into())
+        } else {
+            Ok(serde_json::from_str(&response)?)
+        }
     }
 
     pub async fn upload_object(&self, key: &str, size_bytes: usize) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
@@ -192,9 +145,25 @@ impl QuotaTestEnv {
         }
     }
 
+    pub async fn get_bucket_usage(&self) -> Result<u64, Box<dyn std::error::Error + Send + Sync>> {
+        let stats = self.get_bucket_quota_stats().await?;
+        Ok(stats.get("current_usage").and_then(|v| v.as_u64()).unwrap_or(0))
+    }
+
     async fn wait_for_bucket_usage(&self, expected: u64) -> Result<u64, Box<dyn std::error::Error + Send + Sync>> {
-        let stats = self.wait_for_bucket_quota_stats(&self.bucket_name, expected).await?;
-        reported_quota_usage(&stats)?.ok_or_else(|| "converged quota usage is missing".into())
+        let convergence = async {
+            loop {
+                let usage = self.get_bucket_usage().await?;
+                if usage == expected {
+                    return Ok::<u64, Box<dyn std::error::Error + Send + Sync>>(usage);
+                }
+                sleep(Duration::from_millis(100)).await;
+            }
+        };
+        match timeout(Duration::from_secs(30), convergence).await {
+            Ok(result) => result,
+            Err(_) => Err(format!("bucket usage did not converge to {expected} bytes within 30 seconds").into()),
+        }
     }
 
     pub async fn set_bucket_quota_for(
@@ -202,6 +171,8 @@ impl QuotaTestEnv {
         bucket: &str,
         quota_bytes: u64,
     ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+        self.wait_for_quota_usage_for(bucket).await?;
+
         let quota_path = format!("/rustfs/admin/v3/quota/{bucket}");
         let quota_config = serde_json::json!({
             "quota": quota_bytes,
@@ -235,6 +206,46 @@ impl QuotaTestEnv {
         }
     }
 
+    pub async fn wait_for_quota_usage_for(&self, bucket: &str) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+        let stats_path = format!("/rustfs/admin/v3/quota-stats/{bucket}");
+        let readiness = async {
+            loop {
+                let (status, response) =
+                    admin_request(&self.env.url, Method::GET, &stats_path, None, &self.env.access_key, &self.env.secret_key)
+                        .await?;
+                if status.is_success() {
+                    return Ok::<(), Box<dyn std::error::Error + Send + Sync>>(());
+                }
+                if status != StatusCode::SERVICE_UNAVAILABLE {
+                    return Err(format!("quota usage readiness failed for {bucket}: {status} {response}").into());
+                }
+                sleep(Duration::from_secs(1)).await;
+            }
+        };
+        match timeout(Duration::from_secs(30), readiness).await {
+            Ok(result) => result,
+            Err(_) => Err(format!("quota usage did not become authoritative for {bucket} within 30 seconds").into()),
+        }
+    }
+
+    /// Get bucket quota statistics for specific bucket
+    pub async fn get_bucket_quota_stats_for(
+        &self,
+        bucket: &str,
+    ) -> Result<serde_json::Value, Box<dyn std::error::Error + Send + Sync>> {
+        debug!("Getting quota stats for bucket: {}", bucket);
+
+        let url = format!("{}/rustfs/admin/v3/quota-stats/{}", self.env.url, bucket);
+        let response = awscurl_get(&url, &self.env.access_key, &self.env.secret_key).await?;
+
+        if response.contains("error") {
+            Err(format!("Failed to get quota stats: {}", response).into())
+        } else {
+            let stats: serde_json::Value = serde_json::from_str(&response)?;
+            Ok(stats)
+        }
+    }
+
     /// Upload an object to specific bucket
     pub async fn upload_object_to_bucket(
         &self,
@@ -259,132 +270,6 @@ impl QuotaTestEnv {
     }
 }
 
-#[cfg(test)]
-mod usage_response_tests {
-    use super::*;
-    use tokio::io::{AsyncReadExt, AsyncWriteExt};
-    use tokio::net::TcpListener;
-    use tokio::task::JoinSet;
-
-    #[test]
-    fn unknown_usage_is_not_zero() {
-        assert_eq!(
-            reported_quota_usage(&serde_json::json!({"current_usage": null})).expect("valid unknown usage"),
-            None
-        );
-        assert_eq!(
-            reported_quota_usage(&serde_json::json!({"current_usage": 0})).expect("known zero usage"),
-            Some(0)
-        );
-    }
-
-    #[test]
-    fn missing_or_invalid_usage_is_not_readiness() {
-        for response in [
-            serde_json::json!({}),
-            serde_json::json!({"current_usage": -1}),
-            serde_json::json!({"current_usage": "0"}),
-            serde_json::json!({"current_usage": 1.5}),
-            serde_json::json!({"current_usage": false}),
-        ] {
-            let error = reported_quota_usage(&response).expect_err("malformed usage must fail");
-            assert_eq!(error.kind(), std::io::ErrorKind::InvalidData);
-        }
-    }
-
-    async fn mock_environment(
-        responses: Vec<(StatusCode, &'static str)>,
-    ) -> Result<(QuotaTestEnv, JoinSet<()>), Box<dyn std::error::Error + Send + Sync>> {
-        let listener = TcpListener::bind((std::net::Ipv4Addr::LOCALHOST, 0)).await?;
-        let address = listener.local_addr()?;
-        let mut tasks = JoinSet::new();
-        tasks.spawn(async move {
-            for (status, body) in responses {
-                let (mut stream, _) = listener.accept().await.expect("accept quota reporting request");
-                let mut request = Vec::new();
-                while !request.windows(4).any(|part| part == b"\r\n\r\n") {
-                    let mut buffer = [0_u8; 1024];
-                    let read = stream.read(&mut buffer).await.expect("read reporting request");
-                    assert!(read > 0 && request.len() + read <= 8192, "bounded HTTP request headers");
-                    request.extend_from_slice(&buffer[..read]);
-                }
-                let response = format!(
-                    "HTTP/1.1 {} Test\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
-                    status.as_u16(),
-                    body.len(),
-                    body
-                );
-                stream
-                    .write_all(response.as_bytes())
-                    .await
-                    .expect("write quota reporting response");
-                stream.shutdown().await.expect("close reporting response");
-            }
-        });
-        let mut env = RustFSTestEnvironment::new().await?;
-        env.url = format!("http://{address}");
-        let client = env.create_s3_client();
-        Ok((
-            QuotaTestEnv {
-                env,
-                client,
-                bucket_name: "quota-reporting-fixture".to_owned(),
-            },
-            tasks,
-        ))
-    }
-
-    #[tokio::test]
-    async fn reporting_waits_for_known_matching_usage_without_selecting_allowed()
-    -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let (env, mut tasks) = mock_environment(vec![
-            (StatusCode::SERVICE_UNAVAILABLE, "unavailable"),
-            (StatusCode::OK, r#"{"current_usage":null}"#),
-            (StatusCode::OK, r#"{"current_usage":1}"#),
-            (StatusCode::OK, r#"{"current_usage":0,"allowed":false}"#),
-        ])
-        .await?;
-        let response = env.wait_for_usage_response(Method::GET, "/reporting", None, 0).await?;
-        assert_eq!(response["current_usage"], 0);
-        assert_eq!(response["allowed"], false, "readiness must not select a desired admission outcome");
-        timeout(Duration::from_secs(1), tasks.join_next())
-            .await?
-            .expect("reporting mock task")
-            .expect("all responses consumed");
-        Ok(())
-    }
-
-    #[tokio::test]
-    async fn reporting_rejects_malformed_success_instead_of_retrying() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let (env, mut tasks) = mock_environment(vec![(StatusCode::OK, r#"{"current_usage":"unknown"}"#)]).await?;
-        let error = env
-            .wait_for_usage_response(Method::GET, "/reporting", None, 0)
-            .await
-            .expect_err("malformed usage must fail");
-        assert!(error.to_string().contains("not an unsigned integer or null"));
-        timeout(Duration::from_secs(1), tasks.join_next())
-            .await?
-            .expect("reporting mock task")
-            .expect("response consumed");
-        Ok(())
-    }
-
-    #[tokio::test]
-    async fn reporting_does_not_retry_authorization_failure() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let (env, mut tasks) = mock_environment(vec![(StatusCode::FORBIDDEN, "denied")]).await?;
-        let error = env
-            .wait_for_usage_response(Method::GET, "/reporting", None, 0)
-            .await
-            .expect_err("authorization error must fail");
-        assert!(error.to_string().contains("403"));
-        timeout(Duration::from_secs(1), tasks.join_next())
-            .await?
-            .expect("reporting mock task")
-            .expect("response consumed");
-        Ok(())
-    }
-}
-
 #[cfg(test)]
 mod integration_tests {
     use super::*;
@@ -597,7 +482,7 @@ mod integration_tests {
         env.upload_object("file2.txt", 256 * 1024).await?;
 
         // Check usage
-        let usage = env.wait_for_bucket_usage((512 + 256) * 1024).await?;
+        let usage = env.get_bucket_usage().await?;
         assert_eq!(usage, (512 + 256) * 1024);
 
         // Delete a file
@@ -632,7 +517,7 @@ mod integration_tests {
         env.upload_object("file2.txt", 512 * 1024).await?;
 
         // Get detailed quota statistics
-        let stats = env.wait_for_bucket_quota_stats(&env.bucket_name, (1024 + 512) * 1024).await?;
+        let stats = env.get_bucket_quota_stats().await?;
 
         assert_eq!(stats.get("bucket").unwrap().as_str().unwrap(), env.bucket_name);
         assert_eq!(stats.get("quota_limit").unwrap().as_u64().unwrap(), 2 * 1024 * 1024);
@@ -661,22 +546,22 @@ mod integration_tests {
         env.upload_object("existing_file.txt", 512 * 1024).await?;
 
         // Check if we can upload another 512KB (should succeed, exactly fill quota)
-        let check_result = env.wait_for_bucket_quota_check("PUT", 512 * 1024, 512 * 1024).await?;
+        let check_result = env.check_bucket_quota("PUT", 512 * 1024).await?;
         assert!(check_result.get("allowed").unwrap().as_bool().unwrap());
         assert_eq!(check_result.get("remaining_quota").unwrap().as_u64().unwrap(), 0);
 
         // Note: we haven't actually uploaded the second file yet, so current_usage is still 512KB
         // Check if we can upload 1KB (should succeed - we haven't used the full quota yet)
-        let check_result = env.wait_for_bucket_quota_check("PUT", 1024, 512 * 1024).await?;
+        let check_result = env.check_bucket_quota("PUT", 1024).await?;
         assert!(check_result.get("allowed").unwrap().as_bool().unwrap());
         assert_eq!(check_result.get("remaining_quota").unwrap().as_u64().unwrap(), 523264); // 511 * 1024
 
         // Check if we can upload 600KB (should fail - would exceed quota)
-        let check_result = env.wait_for_bucket_quota_check("PUT", 600 * 1024, 512 * 1024).await?;
+        let check_result = env.check_bucket_quota("PUT", 600 * 1024).await?;
         assert!(!check_result.get("allowed").unwrap().as_bool().unwrap());
 
         // Check delete operation (should always be allowed)
-        let check_result = env.wait_for_bucket_quota_check("DELETE", 512 * 1024, 512 * 1024).await?;
+        let check_result = env.check_bucket_quota("DELETE", 512 * 1024).await?;
         assert!(check_result.get("allowed").unwrap().as_bool().unwrap());
 
         env.cleanup_bucket().await?;
@@ -708,8 +593,8 @@ mod integration_tests {
         env.upload_object_to_bucket(&bucket2, "another_file.txt", 512 * 1024).await?;
 
         // Verify statistics are independent
-        let stats1 = env.wait_for_bucket_quota_stats(&bucket1, 1024 * 1024).await?;
-        let stats2 = env.wait_for_bucket_quota_stats(&bucket2, (1024 + 512) * 1024).await?;
+        let stats1 = env.get_bucket_quota_stats_for(&bucket1).await?;
+        let stats2 = env.get_bucket_quota_stats_for(&bucket2).await?;
 
         assert_eq!(stats1.get("current_usage").unwrap().as_u64().unwrap(), 1024 * 1024);
         assert_eq!(stats2.get("current_usage").unwrap().as_u64().unwrap(), (1024 + 512) * 1024);
@@ -770,6 +655,7 @@ mod integration_tests {
         let env = QuotaTestEnv::new().await?;
 
         env.create_bucket().await?;
+        env.wait_for_quota_usage_for(&env.bucket_name).await?;
 
         // Test 1: GET quota for bucket without quota config
         let url = format!("{}/rustfs/admin/v3/quota/{}", env.env.url, env.bucket_name);

crates/e2e_test/src/reliant/grpc_lock_server.rs

@@ -548,20 +548,6 @@ impl NodeService for MinimalLockNodeService {
         Err(Status::unimplemented("lock-only test server"))
     }
 
-    async fn rename_multipart_data(
-        &self,
-        _request: Request<rustfs_protos::proto_gen::node_service::RenameDataRequest>,
-    ) -> Result<Response<rustfs_protos::proto_gen::node_service::RenameDataResponse>, Status> {
-        Err(Status::unimplemented("lock-only test server"))
-    }
-
-    async fn recover_multipart_source(
-        &self,
-        _request: Request<rustfs_protos::proto_gen::node_service::RecoverMultipartSourceRequest>,
-    ) -> Result<Response<rustfs_protos::proto_gen::node_service::RecoverMultipartSourceResponse>, Status> {
-        Err(Status::unimplemented("lock-only test server"))
-    }
-
     async fn rename_data_at_incarnation(
         &self,
         _request: Request<rustfs_protos::proto_gen::node_service::RenameDataRequest>,
@@ -576,25 +562,6 @@ impl NodeService for MinimalLockNodeService {
         Err(Status::unimplemented("lock-only test server"))
     }
 
-    async fn rename_data_with_pool_meta_cas(
-        &self,
-        _request: Request<rustfs_protos::proto_gen::node_service::RenameDataRequest>,
-    ) -> Result<Response<rustfs_protos::proto_gen::node_service::RenameDataResponse>, Status> {
-        Err(Status::unimplemented("lock-only test server"))
-    }
-    async fn undo_pool_meta_write(
-        &self,
-        _request: Request<rustfs_protos::proto_gen::node_service::DeleteVersionRequest>,
-    ) -> Result<Response<rustfs_protos::proto_gen::node_service::DeleteVersionResponse>, Status> {
-        Err(Status::unimplemented("lock-only test server"))
-    }
-    async fn pool_meta_native_recovery(
-        &self,
-        _request: Request<rustfs_protos::proto_gen::node_service::PoolMetaNativeRecoveryRequest>,
-    ) -> Result<Response<rustfs_protos::proto_gen::node_service::PoolMetaNativeRecoveryResponse>, Status> {
-        Err(Status::unimplemented("lock-only test server"))
-    }
-
     async fn make_volumes(
         &self,
         _request: Request<rustfs_protos::proto_gen::node_service::MakeVolumesRequest>,

crates/e2e_test/src/replication_extension_test.rs

@@ -10085,9 +10085,10 @@ async fn build_scanner_compensation_pair(
 /// P1-20: objects that already exist when a rule with
 /// ExistingObjectReplication=Enabled arrives are compensated by the scanner's
 /// existing-object resync pass, whatever wrote them — plain PUT, CopyObject,
-/// or Snowball auto-extract. That includes a null-version object written
-/// before the bucket became versioned (rustfs/rustfs#8747): it is compensated
-/// like any other existing object and lands as the target's null version.
+/// or Snowball auto-extract. The pinned exception is a null-version object
+/// (written before the bucket became versioned): the scanner heal gate skips
+/// nil-version objects entirely (`scanner_folder.rs` heal_replication), so it
+/// must NEVER be compensated.
 #[tokio::test]
 async fn test_scanner_compensates_existing_objects_across_write_paths() -> TestResult {
     init_logging();
@@ -10097,54 +10098,14 @@ async fn test_scanner_compensates_existing_objects_across_write_paths() -> TestR
     let source_client = source_env.create_s3_client();
     let target_client = target_env.create_s3_client();
 
-    // Null-version cell: PUT before versioning; the object keeps the null
-    // version forever.
+    // Null-version cell: PUT before versioning; the object keeps the nil
+    // version id forever.
     let null_key = "pre-versioning-null.txt";
-    let null_payload = "null version payload";
     source_client
         .put_object()
         .bucket(source_bucket)
         .key(null_key)
-        .body(ByteStream::from_static(null_payload.as_bytes()))
-        .send()
-        .await?;
-
-    // Multipart null-version cell: a one-part upload already carries a
-    // multipart ETag, so its replica travels the target's multipart path,
-    // whose completion must keep the null version too.
-    let multipart_null_key = "pre-versioning-null-multipart.txt";
-    let multipart_null_payload = "multipart null version payload";
-    let upload = source_client
-        .create_multipart_upload()
-        .bucket(source_bucket)
-        .key(multipart_null_key)
-        .send()
-        .await?;
-    let upload_id = upload.upload_id().ok_or("multipart upload id missing")?;
-    let part = source_client
-        .upload_part()
-        .bucket(source_bucket)
-        .key(multipart_null_key)
-        .upload_id(upload_id)
-        .part_number(1)
-        .body(ByteStream::from_static(multipart_null_payload.as_bytes()))
-        .send()
-        .await?;
-    source_client
-        .complete_multipart_upload()
-        .bucket(source_bucket)
-        .key(multipart_null_key)
-        .upload_id(upload_id)
-        .multipart_upload(
-            CompletedMultipartUpload::builder()
-                .parts(
-                    CompletedPart::builder()
-                        .part_number(1)
-                        .set_e_tag(part.e_tag().map(str::to_string))
-                        .build(),
-                )
-                .build(),
-        )
+        .body(ByteStream::from_static(b"null version payload"))
         .send()
         .await?;
 
@@ -10232,22 +10193,9 @@ async fn test_scanner_compensates_existing_objects_across_write_paths() -> TestR
     wait_for_replicated_object(&target_client, target_bucket, copy_key, plain_payload).await?;
     wait_for_replicated_object(&target_client, target_bucket, member_key, std::str::from_utf8(member_payload)?).await?;
 
-    // The null versions converge too, and keep their identity whichever path
-    // carried them: each replica is the target's null version, not a freshly
-    // minted one.
-    for (key, payload) in [(null_key, null_payload), (multipart_null_key, multipart_null_payload)] {
-        wait_for_replicated_object(&target_client, target_bucket, key, payload).await?;
-        let null_replica = target_client
-            .get_object()
-            .bucket(target_bucket)
-            .key(key)
-            .version_id("null")
-            .send()
-            .await?;
-        assert_eq!(null_replica.version_id(), Some("null"), "{key} must replicate as the null version");
-        let null_replica_body = null_replica.body.collect().await?.into_bytes();
-        assert_eq!(null_replica_body.as_ref(), payload.as_bytes());
-    }
+    // Null-version contract: with every sibling compensated (scanner proven
+    // live), the nil-version object must stay absent across further cycles.
+    assert_replication_key_absent(&target_client, target_bucket, null_key, Duration::from_secs(6)).await?;
 
     Ok(())
 }

crates/e2e_test/src/security_boundary_test.rs

@@ -245,11 +245,11 @@ async fn test_concurrent_object_operations() -> Result<(), Box<dyn Error + Send
     Ok(())
 }
 
-/// Loopback and metadata endpoints must be rejected as remote tier backends (SSRF)
+/// Internal/private endpoints must be rejected as remote tier backends (SSRF)
 /// before RustFS opens a connection to them.
 ///
 /// This issues a real admin AddTier call (`PUT /rustfs/admin/v3/tier`) for each
-/// restricted endpoint and requires the exact validation response. A
+/// internal/private endpoint and requires the exact validation response. A
 /// loopback listener additionally proves the literal loopback case is rejected
 /// without an outbound connection; a generic connectivity failure is not
 /// sufficient evidence of SSRF protection.
@@ -267,9 +267,6 @@ async fn test_tiering_url_validation() -> Result<(), Box<dyn Error + Send + Sync
         ("http://localhost:8080", false),
         ("http://169.254.169.254", false), // cloud instance metadata endpoint
         ("http://[::1]:8080", false),
-        ("http://[fd00:ec2::254]", false),
-        ("http://[fd00:ec2::23]", false),
-        ("http://[fd20:ce::254]", false),
     ];
 
     for (endpoint, checks_connection_attempt) in internal_endpoints {

crates/e2e_test/src/storage_api.rs

@@ -15,11 +15,7 @@
 #[cfg(test)]
 pub(crate) use rustfs_ecstore::api::bucket::bucket_target_sys::BucketTargetSys;
 #[cfg(test)]
-pub(crate) const OBJECT_LOCK_TRACE_FILTER: &str = "info,rustfs_ecstore::object_lock_diag=trace";
-#[cfg(test)]
-pub(crate) use rustfs_ecstore::api::disk::{
-    DiskOption, Endpoint, RUSTFS_META_BUCKET, RUSTFS_META_MULTIPART_BUCKET, VolumeInfo, WalkDirOptions, new_disk,
-};
+pub(crate) use rustfs_ecstore::api::disk::{Endpoint, RUSTFS_META_BUCKET, VolumeInfo, WalkDirOptions};
 pub(crate) use rustfs_ecstore::api::rpc::{AuthenticatedChannel, TonicInterceptor, node_service_time_out_client_no_auth};
 #[cfg(test)]
 pub(crate) use rustfs_ecstore::api::rpc::{
@@ -56,27 +52,3 @@ pub(crate) mod internode_rpc_signature {
 pub(crate) mod replication_extension {
     pub(crate) use super::BucketTargetSys;
 }
-
-#[cfg(test)]
-pub(crate) mod upgrade_compatibility {
-    pub(crate) use super::{DiskOption, Endpoint, RUSTFS_META_MULTIPART_BUCKET, new_disk};
-}
-
-#[cfg(test)]
-pub(crate) mod multipart_rpc_delay {
-    pub(crate) use super::RUSTFS_META_MULTIPART_BUCKET;
-}
-
-#[cfg(test)]
-pub(crate) mod multipart_fence_acceptance {
-    pub(crate) use super::RUSTFS_META_MULTIPART_BUCKET;
-}
-
-#[cfg(test)]
-pub(crate) mod multipart_source_rpc {
-    pub(crate) use rustfs_ecstore::api::disk::{
-        MULTIPART_SOURCE_PROTOCOL_VERSION, MultipartAbortCertificate, MultipartAbortProof, MultipartAbortProofKind,
-        MultipartAbortRound, MultipartSourceOperation, MultipartSourcePhase, MultipartSourceRequest, MultipartSourceSnapshot,
-        PublicationIdentity, SourceGeneration, SourceGeometry, SourceLineage,
-    };
-}

crates/e2e_test/src/table_location_authorization_test.rs

@@ -1,417 +0,0 @@
-// 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 crate::common::{
-    AdminTransport, RustFSTestEnvironment, admin_add_canned_policy_via, admin_attach_user_policy_via, admin_create_user,
-    init_logging, signed_request,
-};
-use aws_sdk_s3::primitives::ByteStream;
-use http::{Method, StatusCode};
-use serde_json::{Value, json};
-use uuid::Uuid;
-
-type TestResult<T = ()> = Result<T, Box<dyn std::error::Error + Send + Sync>>;
-
-async fn set_policy(env: &RustFSTestEnvironment, user: &str, policy: Value) -> TestResult {
-    admin_add_canned_policy_via(
-        AdminTransport::Signed,
-        &env.url,
-        &env.access_key,
-        &env.secret_key,
-        user,
-        &policy.to_string(),
-    )
-    .await?;
-    admin_attach_user_policy_via(AdminTransport::Signed, &env.url, &env.access_key, &env.secret_key, user, user).await
-}
-
-async fn catalog_request(
-    env: &RustFSTestEnvironment,
-    credentials: &(String, String),
-    method: Method,
-    path: &str,
-    body: Option<Value>,
-    expected: StatusCode,
-) -> TestResult<Value> {
-    let response = signed_request(
-        method.clone(),
-        &format!("{}{path}", env.url),
-        &credentials.0,
-        &credentials.1,
-        body.map(|value| serde_json::to_vec(&value)).transpose()?,
-        Some("application/json"),
-    )
-    .await?;
-    let status = response.status();
-    let text = response.text().await?;
-    assert_eq!(status, expected, "{method} {path}: {text}");
-    if text.is_empty() || !status.is_success() {
-        Ok(Value::Null)
-    } else {
-        Ok(serde_json::from_str(&text)?)
-    }
-}
-
-async fn get_object(
-    env: &RustFSTestEnvironment,
-    credentials: &(String, String),
-    bucket: &str,
-    key: &str,
-    expected: StatusCode,
-) -> TestResult {
-    let response = signed_request(
-        Method::GET,
-        &format!("{}/{bucket}/{key}", env.url),
-        &credentials.0,
-        &credentials.1,
-        None,
-        None,
-    )
-    .await?;
-    assert_eq!(response.status(), expected, "GET {bucket}/{key}");
-    if expected == StatusCode::OK {
-        assert_eq!(response.bytes().await?.as_ref(), b"original object");
-    }
-    Ok(())
-}
-
-fn create_table(name: &str) -> Value {
-    json!({
-        "name": name,
-        "schema": {
-            "type": "struct",
-            "fields": [{"id": 1, "name": "id", "required": false, "type": "long"}]
-        },
-        "stage-create": false
-    })
-}
-
-fn staged_commit(metadata: &Value, location: &str) -> Value {
-    json!({
-        "requirements": [{"type": "assert-create"}],
-        "updates": [
-            {"action": "assign-uuid", "uuid": metadata["table-uuid"]},
-            {"action": "upgrade-format-version", "format-version": metadata["format-version"]},
-            {"action": "add-schema", "schema": metadata["schemas"][0]},
-            {"action": "set-current-schema", "schema-id": -1},
-            {"action": "add-spec", "spec": metadata["partition-specs"][0]},
-            {"action": "set-default-spec", "spec-id": -1},
-            {"action": "add-sort-order", "sort-order": metadata["sort-orders"][0]},
-            {"action": "set-default-sort-order", "sort-order-id": -1},
-            {"action": "set-location", "location": location}
-        ]
-    })
-}
-
-async fn location_claim_preserves_other_users_objects_after_drop_and_restart(backing: &str) -> TestResult {
-    init_logging();
-    let mut env = RustFSTestEnvironment::new().await?;
-    let server_env = [("RUSTFS_TABLE_CATALOG_BACKING", backing)];
-    env.start_rustfs_server_without_cleanup_with_env(&[("RUSTFS_TABLE_CATALOG_BACKING", "object")])
-        .await?;
-    env.wait_for_server_ready().await?;
-    let root = (env.access_key.clone(), env.secret_key.clone());
-    let creator = (format!("creator-{}", Uuid::new_v4().simple()), Uuid::new_v4().simple().to_string());
-    let reader = (format!("reader-{}", Uuid::new_v4().simple()), Uuid::new_v4().simple().to_string());
-    let bucket = "table-location-authorization";
-    let root_s3 = env.create_s3_client();
-    root_s3.create_bucket().bucket(bucket).send().await?;
-    for key in ["shared/known.txt", "shared2/known.txt", "authorized/known.txt"] {
-        root_s3
-            .put_object()
-            .bucket(bucket)
-            .key(key)
-            .body(ByteStream::from_static(b"original object"))
-            .send()
-            .await?;
-    }
-    let catalog = format!("/iceberg/v1/{bucket}/namespaces/lab/tables");
-    catalog_request(&env, &root, Method::PUT, &format!("/iceberg/v1/buckets/{bucket}"), None, StatusCode::OK).await?;
-    catalog_request(
-        &env,
-        &root,
-        Method::POST,
-        &format!("/iceberg/v1/{bucket}/namespaces"),
-        Some(json!({"namespace": ["lab"]})),
-        StatusCode::OK,
-    )
-    .await?;
-    if backing == "durable-strong" {
-        catalog_request(
-            &env,
-            &root,
-            Method::POST,
-            &format!("/iceberg/v1/{bucket}/catalog/warehouse-index/backfill"),
-            None,
-            StatusCode::NO_CONTENT,
-        )
-        .await?;
-        let preflight = catalog_request(
-            &env,
-            &root,
-            Method::GET,
-            &format!("/iceberg/v1/{bucket}/catalog/migration"),
-            None,
-            StatusCode::OK,
-        )
-        .await?;
-        assert_eq!(preflight["blockers"], json!([]), "{preflight}");
-        let migration = catalog_request(
-            &env,
-            &root,
-            Method::POST,
-            &format!("/iceberg/v1/{bucket}/catalog/migration"),
-            None,
-            StatusCode::OK,
-        )
-        .await?;
-        assert_eq!(migration["ready_to_enable_durable_strong"], json!(true), "{migration}");
-        env.restart_server_preserving_data(vec![], &server_env).await?;
-        env.wait_for_server_ready().await?;
-    }
-    admin_create_user(&env, &creator.0, &creator.1).await?;
-    admin_create_user(&env, &reader.0, &reader.1).await?;
-    let create_statement = json!({
-        "Effect": "Allow",
-        "Action": "admin:CreateTable",
-        "Resource": format!("arn:aws:s3:::{bucket}/namespaces/lab")
-    });
-    set_policy(
-        &env,
-        &creator.0,
-        json!({"Version": "2012-10-17", "Statement": [create_statement.clone()]}),
-    )
-    .await?;
-    set_policy(
-        &env,
-        &reader.0,
-        json!({"Version": "2012-10-17", "Statement": [{
-            "Effect": "Allow", "Action": "s3:GetObject", "Resource": format!("arn:aws:s3:::{bucket}/*")
-        }]}),
-    )
-    .await?;
-    for key in ["shared/known.txt", "shared2/known.txt"] {
-        get_object(&env, &reader, bucket, key, StatusCode::OK).await?;
-        get_object(&env, &creator, bucket, key, StatusCode::FORBIDDEN).await?;
-    }
-    for (method, path) in [
-        (Method::PUT, format!("/{bucket}/shared/new.txt")),
-        (Method::GET, format!("/{bucket}?list-type=2")),
-    ] {
-        let response = signed_request(method, &format!("{}{path}", env.url), &creator.0, &creator.1, None, None).await?;
-        assert_eq!(response.status(), StatusCode::FORBIDDEN);
-    }
-    // Both direct and staged requests must reject a caller-selected foreign prefix.
-    for staged in [false, true] {
-        for location in [format!("s3://{bucket}/shared"), format!("s3://{bucket}/shared/")] {
-            let mut request = create_table("claim");
-            request["location"] = json!(location);
-            request["stage-create"] = json!(staged);
-            catalog_request(&env, &creator, Method::POST, &catalog, Some(request), StatusCode::FORBIDDEN).await?;
-        }
-    }
-    catalog_request(&env, &root, Method::GET, &format!("{catalog}/claim"), None, StatusCode::NOT_FOUND).await?;
-
-    // Server-assigned locations still need only CreateTable, and retain protection after drop.
-    let created = catalog_request(&env, &creator, Method::POST, &catalog, Some(create_table("managed")), StatusCode::OK).await?;
-    let location = created["metadata"]["location"].as_str().ok_or("missing table location")?;
-    let managed_key = format!(
-        "{}/known.txt",
-        location
-            .strip_prefix(&format!("s3://{bucket}/"))
-            .ok_or("table location has wrong bucket")?
-    );
-    root_s3
-        .put_object()
-        .bucket(bucket)
-        .key(&managed_key)
-        .body(ByteStream::from_static(b"original object"))
-        .send()
-        .await?;
-    get_object(&env, &reader, bucket, &managed_key, StatusCode::FORBIDDEN).await?;
-    catalog_request(&env, &root, Method::DELETE, &format!("{catalog}/managed"), None, StatusCode::NO_CONTENT).await?;
-    env.restart_server_preserving_data(vec![], &server_env).await?;
-    env.wait_for_server_ready().await?;
-    for table in ["claim", "managed"] {
-        catalog_request(&env, &root, Method::GET, &format!("{catalog}/{table}"), None, StatusCode::NOT_FOUND).await?;
-    }
-    for key in ["shared/known.txt", "shared2/known.txt", "authorized/known.txt"] {
-        get_object(&env, &reader, bucket, key, StatusCode::OK).await?;
-    }
-    get_object(&env, &reader, bucket, &managed_key, StatusCode::FORBIDDEN).await?;
-    get_object(&env, &root, bucket, &managed_key, StatusCode::OK).await?;
-
-    // Explicit adoption is scoped to a physical prefix and does not grant S3 access.
-    set_policy(
-        &env,
-        &creator.0,
-        json!({"Version": "2012-10-17", "Statement": [
-            create_statement.clone(),
-            {"Effect": "Allow", "Action": "admin:ClaimTableLocation", "Resource": format!("arn:aws:s3:::{bucket}/authorized")}
-        ]}),
-    )
-    .await?;
-    let mut request = create_table("authorized");
-    request["location"] = json!(format!("s3://{bucket}/shared"));
-    catalog_request(&env, &creator, Method::POST, &catalog, Some(request.clone()), StatusCode::FORBIDDEN).await?;
-    request["location"] = json!(format!("s3://{bucket}/authorized"));
-    let adopted = catalog_request(&env, &creator, Method::POST, &catalog, Some(request), StatusCode::OK).await?;
-    get_object(&env, &creator, bucket, "authorized/known.txt", StatusCode::FORBIDDEN).await?;
-    get_object(&env, &reader, bucket, "authorized/known.txt", StatusCode::FORBIDDEN).await?;
-    // Existing updates retain their permissions; relocation and re-registration
-    // require a prefix grant even when the caller can access every S3 object.
-    set_policy(
-        &env,
-        &creator.0,
-        json!({"Version": "2012-10-17", "Statement": [
-            create_statement,
-            {"Effect": "Allow", "Action": "admin:RegisterTable", "Resource": [
-                format!("arn:aws:s3:::{bucket}/namespaces/lab"),
-                format!("arn:aws:s3:::{bucket}/namespaces/lab/tables/*")
-            ]},
-            {"Effect": "Allow", "Action": "admin:CommitTable", "Resource": format!("arn:aws:s3:::{bucket}/namespaces/lab/tables/*")},
-            {"Effect": "Allow", "Action": "admin:SetTableMetadataLocation", "Resource": format!("arn:aws:s3:::{bucket}/namespaces/lab/tables/authorized")},
-            {"Effect": "Allow", "Action": ["s3:GetObject", "s3:PutObject"], "Resource": format!("arn:aws:s3:::{bucket}/*")}
-        ]}),
-    )
-    .await?;
-    let requirements = json!([{"type": "assert-table-uuid", "uuid": adopted["metadata"]["table-uuid"]}]);
-    let committed = catalog_request(
-        &env,
-        &creator,
-        Method::POST,
-        &format!("{catalog}/authorized"),
-        Some(json!({
-            "requirements": requirements,
-            "updates": [{"action": "set-properties", "updates": {"test.location-authorization": "retained"}}]
-        })),
-        StatusCode::OK,
-    )
-    .await?;
-    catalog_request(
-        &env,
-        &creator,
-        Method::POST,
-        &format!("{catalog}/authorized"),
-        Some(json!({
-            "requirements": requirements,
-            "updates": [{"action": "set-location", "location": format!("s3://{bucket}/shared")}]
-        })),
-        StatusCode::FORBIDDEN,
-    )
-    .await?;
-    let current = catalog_request(&env, &root, Method::GET, &format!("{catalog}/authorized"), None, StatusCode::OK).await?;
-    assert_eq!(current["metadata"]["location"], json!(format!("s3://{bucket}/authorized")));
-    assert_eq!(current["metadata-location"], committed["metadata-location"]);
-    catalog_request(
-        &env,
-        &root,
-        Method::DELETE,
-        &format!("{catalog}/authorized"),
-        None,
-        StatusCode::NO_CONTENT,
-    )
-    .await?;
-    catalog_request(
-        &env,
-        &creator,
-        Method::POST,
-        &format!("/iceberg/v1/{bucket}/namespaces/lab/register"),
-        Some(json!({"name": "authorized", "metadata-location": committed["metadata-location"]})),
-        StatusCode::FORBIDDEN,
-    )
-    .await?;
-    catalog_request(
-        &env,
-        &creator,
-        Method::POST,
-        &format!("{catalog}/authorized/catalog/import"),
-        Some(json!({"metadata-location": committed["metadata-location"]})),
-        StatusCode::FORBIDDEN,
-    )
-    .await?;
-    if backing == "object" {
-        catalog_request(
-            &env,
-            &creator,
-            Method::POST,
-            &format!("{catalog}/authorized/catalog/external/sync"),
-            Some(json!({
-                "catalog": "polaris",
-                "external-namespace": "lab",
-                "external-table": "authorized",
-                "metadata-location": committed["metadata-location"]
-            })),
-            StatusCode::FORBIDDEN,
-        )
-        .await?;
-    }
-
-    // Staged metadata is client-controlled and must be authorized at publication.
-    let mut request = create_table("staged");
-    request["stage-create"] = json!(true);
-    let staged = catalog_request(&env, &creator, Method::POST, &catalog, Some(request), StatusCode::OK).await?;
-    catalog_request(
-        &env,
-        &creator,
-        Method::POST,
-        &format!("{catalog}/staged"),
-        Some(staged_commit(&staged["metadata"], &format!("s3://{bucket}/shared"))),
-        StatusCode::FORBIDDEN,
-    )
-    .await?;
-    catalog_request(&env, &root, Method::GET, &format!("{catalog}/staged"), None, StatusCode::NOT_FOUND).await?;
-    set_policy(
-        &env,
-        &creator.0,
-        json!({"Version": "2012-10-17", "Statement": [
-            {"Effect": "Allow", "Action": "admin:CreateTable", "Resource": format!("arn:aws:s3:::{bucket}/namespaces/lab")},
-            {"Effect": "Allow", "Action": "admin:CommitTable", "Resource": format!("arn:aws:s3:::{bucket}/namespaces/lab/tables/staged")},
-            {"Effect": "Allow", "Action": "admin:ClaimTableLocation", "Resource": format!("arn:aws:s3:::{bucket}/stage-owned")},
-            {"Effect": "Allow", "Action": ["s3:GetObject", "s3:PutObject"], "Resource": format!("arn:aws:s3:::{bucket}/*")}
-        ]}),
-    )
-    .await?;
-    catalog_request(
-        &env,
-        &creator,
-        Method::POST,
-        &format!("{catalog}/staged"),
-        Some(staged_commit(&staged["metadata"], &format!("s3://{bucket}/stage-owned"))),
-        StatusCode::OK,
-    )
-    .await?;
-    catalog_request(&env, &root, Method::DELETE, &format!("{catalog}/staged"), None, StatusCode::NO_CONTENT).await?;
-    env.restart_server_preserving_data(vec![], &server_env).await?;
-    env.wait_for_server_ready().await?;
-    for table in ["authorized", "staged"] {
-        catalog_request(&env, &root, Method::GET, &format!("{catalog}/{table}"), None, StatusCode::NOT_FOUND).await?;
-    }
-    get_object(&env, &reader, bucket, "authorized/known.txt", StatusCode::FORBIDDEN).await?;
-    get_object(&env, &root, bucket, "authorized/known.txt", StatusCode::OK).await?;
-    for key in ["shared/known.txt", "shared2/known.txt"] {
-        get_object(&env, &reader, bucket, key, StatusCode::OK).await?;
-    }
-    Ok(())
-}
-
-#[tokio::test]
-async fn object_catalog_location_claim_preserves_objects_after_drop_and_restart() -> TestResult {
-    location_claim_preserves_other_users_objects_after_drop_and_restart("object").await
-}
-
-#[tokio::test]
-async fn durable_strong_catalog_location_claim_preserves_objects_after_drop_and_restart() -> TestResult {
-    location_claim_preserves_other_users_objects_after_drop_and_restart("durable-strong").await
-}