gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-09-06 03:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(heal): preserve automatic replacement recovery status (#7018)

Browse Source 
* fix(heal): preserve automatic replacement recovery status

* fix(heal): admit unformatted replacement targets

* fix(heal): preserve replacement heal set scope

* fix(heal): attach scoped replacement targets

* fix(heal): preserve replacement heal set scope

* fix(ecstore): keep startup helper test-only

---------

Co-authored-by: houseme <housemecn@gmail.com>
This commit is contained in:
Henry Guo
2026-09-02 01:21:43 +08:00
committed by GitHub
parent 397dbcf102
commit 7dcfdb3320
15 changed files with 584 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/storage/rpc/node_service.rs
+23
View File
@@ -230,6 +230,11 @@ fn validate_admin_heal_control_start(request: &rustfs_heal_contracts::heal_chann
if request.source != rustfs_heal_contracts::heal_channel::HealRequestSource::Admin {
return Err(Status::permission_denied("heal control start source must be admin"));
}
if !request.heal_endpoints.is_empty() {
return Err(Status::invalid_argument(
"admin heal control start cannot contain automatic replacement endpoints",
));
}
if request.pool_index.is_some() != request.set_index.is_some() {
return Err(Status::invalid_argument("heal control start requires both pool and set"));
}
@@ -2532,6 +2537,7 @@ mod tests {
make_heal_control_server, make_heal_control_server_with_cache, make_server, make_server_for_context,
make_tier_mutation_control_server_for_context, previous_scanner_activity_response, remove_heal_control_replay,
scanner_activity_response_v7, start_decommission_failure_response, stop_rebalance_response,
validate_admin_heal_control_start,
};
use crate::storage::rpc::node_service::heal::heal_topology_fingerprint;
use crate::storage::storage_api::rpc_consumer::node_service::{DiskError, HealBucketInfo};
@@ -2766,6 +2772,23 @@ mod tests {
assert!(!cache.contains_key("request-1"), "expired idle entries must be purged before admission");
}
#[test]
fn heal_control_admin_start_rejects_automatic_replacement_endpoints() {
let mut request = rustfs_heal_contracts::heal_channel::create_heal_request(
String::new(),
None,
false,
Some(rustfs_heal_contracts::heal_channel::HealChannelPriority::High),
);
request.source = rustfs_heal_contracts::heal_channel::HealRequestSource::Admin;
request.recursive = Some(true);
request.heal_endpoints = vec!["/mnt/replacement".to_string()];
let err = validate_admin_heal_control_start(&request)
.expect_err("admin heal-control must not accept automatic replacement targets");
assert_eq!(err.code(), tonic::Code::InvalidArgument);
}
#[tokio::test]
async fn heal_control_executor_preserves_canonical_token_and_drops_query_results() {
let manager = Arc::new(HealManager::new(Arc::new(HealControlMockStorage), None));