mirror of
https://github.com/rustfs/rustfs.git
synced 2026-07-27 16:48:58 +00:00
houseme
e44bece00d
Follow-up hardening for the audit control plane. The ABBA deadlock (backlog#961), dispatch failure propagation (backlog#962), and credential header redaction (backlog#963) already landed on main; this change addresses the remaining audit-side findings. - backlog#970: reload/commit now shuts down existing replay workers and closes old targets *before* activating the replacement set, so old and new workers never drain the same store concurrently and re-deliver entries. Extracted a state-neutral `shutdown_runtime_targets` helper (registry-then-cancellers lock order preserved). - backlog#978: `start()` claims the `Starting` transition atomically under the state lock, closing the check-then-act race that could double-activate; `dispatch()` no longer returns Ok while paused, it surfaces an explicit `AuditError::Paused` so the audit trail is not silently corrupted. - backlog#984 (audit part): `dispatch_audit_log` performs a single state read and interprets not-running/paused as a deliberate skip while surfacing real delivery failures; `dispatch_batch` records the same observability signals as single dispatch; documented the unordered cross-target fan-out. Adds unit tests: paused dispatch returns Err, concurrent start does not hang or double-activate, commit closes old targets before installing new, and dispatch/dispatch_batch delivery-outcome coverage (all-fail -> Err, partial -> Ok, all-success -> Ok). Relates to rustfs/backlog#970 Relates to rustfs/backlog#978 Relates to rustfs/backlog#984 Co-authored-by: heihutu <heihutu@gmail.com>
59 lines
1.8 KiB
Rust
59 lines
1.8 KiB
Rust
// Copyright 2024 RustFS Team
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use thiserror::Error;
|
|
|
|
/// Result type for audit operations
|
|
pub type AuditResult<T> = Result<T, AuditError>;
|
|
|
|
/// Errors that can occur during audit operations
|
|
#[derive(Error, Debug)]
|
|
pub enum AuditError {
|
|
#[error("Configuration error: {0}")]
|
|
Configuration(String, #[source] Option<Box<dyn std::error::Error + Send + Sync>>),
|
|
|
|
#[error("config not loaded")]
|
|
ConfigNotLoaded,
|
|
|
|
#[error("Target error: {0}")]
|
|
Target(#[from] rustfs_targets::TargetError),
|
|
|
|
#[error("System not initialized: {0}")]
|
|
NotInitialized(String),
|
|
|
|
#[error("System already initialized")]
|
|
AlreadyInitialized,
|
|
|
|
#[error("Audit system is paused; entry was not accepted")]
|
|
Paused,
|
|
|
|
#[error("Storage not available: {0}")]
|
|
StorageNotAvailable(String),
|
|
|
|
#[error("Failed to save configuration: {0}")]
|
|
SaveConfig(#[source] Box<dyn std::error::Error + Send + Sync>),
|
|
|
|
#[error("Failed to load configuration: {0}")]
|
|
LoadConfig(#[source] Box<dyn std::error::Error + Send + Sync>),
|
|
|
|
#[error("Serialization error: {0}")]
|
|
Serialization(#[from] serde_json::Error),
|
|
|
|
#[error("I/O error: {0}")]
|
|
Io(#[from] std::io::Error),
|
|
|
|
#[error("Join error: {0}")]
|
|
Join(#[from] tokio::task::JoinError),
|
|
}
|