gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-31 17:28:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ecstore): satisfy decommission clippy checks

Browse Source
This commit is contained in:
overtrue
2026-08-22 18:55:44 +08:00
parent 3be1511214
commit 241271c256
1 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/core/pools.rs
+49 -53
View File
@@ -3233,7 +3233,7 @@ impl ECStore {
) -> Result<()> { ) -> Result<()> {
let index_cancelers = self.reserve_decommission_routines(&rx, indices.as_slice()).await?; let index_cancelers = self.reserve_decommission_routines(&rx, indices.as_slice()).await?;
if !index_cancelers.is_empty() { if !index_cancelers.is_empty() {
let _ = spawn_decommission_index_cancelers(store, rx, index_cancelers); std::mem::drop(spawn_decommission_index_cancelers(store, rx, index_cancelers));
} }
Ok(()) Ok(())
@@ -3255,7 +3255,7 @@ impl ECStore {
return Ok(()); return Ok(());
} }
let _ = spawn_decommission_index_cancelers(self.clone(), rx, index_cancelers); std::mem::drop(spawn_decommission_index_cancelers(self.clone(), rx, index_cancelers));
Ok(()) Ok(())
} }
@@ -3280,7 +3280,7 @@ impl ECStore {
let index_cancelers = self let index_cancelers = self
.start_decommission_with_routines(indices, &rx, local_indices.as_slice()) .start_decommission_with_routines(indices, &rx, local_indices.as_slice())
.await?; .await?;
let _ = spawn_decommission_index_cancelers(store, rx, index_cancelers); std::mem::drop(spawn_decommission_index_cancelers(store, rx, index_cancelers));
Ok(()) Ok(())
} }
@@ -4292,38 +4292,36 @@ impl ECStore {
if let Some(canceler) = terminal_canceler.as_ref() { if let Some(canceler) = terminal_canceler.as_ref() {
self.release_decommission_canceler_slot(idx, canceler).await; self.release_decommission_canceler_slot(idx, canceler).await;
} }
if should_reload_pool_meta { if should_reload_pool_meta && let Some(notification_sys) = runtime_sources::notification_sys() {
if let Some(notification_sys) = runtime_sources::notification_sys() { let stage = format!("decommission_failed for pool {idx}");
let stage = format!("decommission_failed for pool {idx}"); if let Some(err) = observe_decommission_terminal_reload_result(
if let Some(err) = observe_decommission_terminal_reload_result( resolve_decommission_pool_meta_reload_result(notification_sys.reload_pool_meta().await, stage.as_str()),
resolve_decommission_pool_meta_reload_result(notification_sys.reload_pool_meta().await, stage.as_str()), stage.as_str(),
stage.as_str(), ) {
) { if let Err(record_err) = self
if let Err(record_err) = self .record_decommission_terminal_reload_failure(idx, stage.as_str(), err.clone())
.record_decommission_terminal_reload_failure(idx, stage.as_str(), err.clone()) .await
.await {
{
warn!(
event = EVENT_DECOMMISSION_STATE,
component = LOG_COMPONENT_ECSTORE,
subsystem = LOG_SUBSYSTEM_POOLS,
pool_index = idx,
state = "terminal_reload_record_failed",
error = %record_err,
original_error = %err,
"Decommission terminal reload failure record failed"
);
}
warn!( warn!(
event = EVENT_DECOMMISSION_STATE, event = EVENT_DECOMMISSION_STATE,
component = LOG_COMPONENT_ECSTORE, component = LOG_COMPONENT_ECSTORE,
subsystem = LOG_SUBSYSTEM_POOLS, subsystem = LOG_SUBSYSTEM_POOLS,
pool_index = idx, pool_index = idx,
state = "terminal_reload_failed", state = "terminal_reload_record_failed",
error = %err, error = %record_err,
"Decommission terminal state saved but pool meta reload failed" original_error = %err,
"Decommission terminal reload failure record failed"
); );
} }
warn!(
event = EVENT_DECOMMISSION_STATE,
component = LOG_COMPONENT_ECSTORE,
subsystem = LOG_SUBSYSTEM_POOLS,
pool_index = idx,
state = "terminal_reload_failed",
error = %err,
"Decommission terminal state saved but pool meta reload failed"
);
} }
} }
@@ -4380,38 +4378,36 @@ impl ECStore {
if let Some(canceler) = terminal_canceler.as_ref() { if let Some(canceler) = terminal_canceler.as_ref() {
self.release_decommission_canceler_slot(idx, canceler).await; self.release_decommission_canceler_slot(idx, canceler).await;
} }
if should_reload_pool_meta { if should_reload_pool_meta && let Some(notification_sys) = runtime_sources::notification_sys() {
if let Some(notification_sys) = runtime_sources::notification_sys() { let stage = format!("complete_decommission for pool {idx}");
let stage = format!("complete_decommission for pool {idx}"); if let Some(err) = observe_decommission_terminal_reload_result(
if let Some(err) = observe_decommission_terminal_reload_result( resolve_decommission_pool_meta_reload_result(notification_sys.reload_pool_meta().await, stage.as_str()),
resolve_decommission_pool_meta_reload_result(notification_sys.reload_pool_meta().await, stage.as_str()), stage.as_str(),
stage.as_str(), ) {
) { if let Err(record_err) = self
if let Err(record_err) = self .record_decommission_terminal_reload_failure(idx, stage.as_str(), err.clone())
.record_decommission_terminal_reload_failure(idx, stage.as_str(), err.clone()) .await
.await {
{
warn!(
event = EVENT_DECOMMISSION_STATE,
component = LOG_COMPONENT_ECSTORE,
subsystem = LOG_SUBSYSTEM_POOLS,
pool_index = idx,
state = "terminal_reload_record_failed",
error = %record_err,
original_error = %err,
"Decommission terminal reload failure record failed"
);
}
warn!( warn!(
event = EVENT_DECOMMISSION_STATE, event = EVENT_DECOMMISSION_STATE,
component = LOG_COMPONENT_ECSTORE, component = LOG_COMPONENT_ECSTORE,
subsystem = LOG_SUBSYSTEM_POOLS, subsystem = LOG_SUBSYSTEM_POOLS,
pool_index = idx, pool_index = idx,
state = "terminal_reload_failed", state = "terminal_reload_record_failed",
error = %err, error = %record_err,
"Decommission terminal state saved but pool meta reload failed" original_error = %err,
"Decommission terminal reload failure record failed"
); );
} }
warn!(
event = EVENT_DECOMMISSION_STATE,
component = LOG_COMPONENT_ECSTORE,
subsystem = LOG_SUBSYSTEM_POOLS,
pool_index = idx,
state = "terminal_reload_failed",
error = %err,
"Decommission terminal state saved but pool meta reload failed"
);
} }
} }