refactor(storage): route maintenance inventory reads (#3337)

crates/ecstore/src/rebalance.rs

@@ -28,6 +28,7 @@ use crate::store_api::{GetObjectReader, HTTPRangeSpec, ObjectIO, ObjectInfo, Obj
 use http::HeaderMap;
 use rand::RngExt as _;
 use rustfs_filemeta::{FileInfo, MetaCacheEntries, MetaCacheEntry, MetadataResolutionParams};
+use rustfs_storage_api::StorageAdminApi;
 use rustfs_utils::path::encode_dir_object;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
@@ -732,7 +733,7 @@ impl ECStore {
     #[tracing::instrument(skip(self))]
     pub async fn init_rebalance_meta(&self, bucktes: Vec<String>) -> Result<String> {
         info!("init_rebalance_meta: start rebalance");
-        let si = self.storage_info().await;
+        let si = StorageAdminApi::storage_info(self).await;
 
         let mut disk_stats = vec![DiskStat::default(); self.pools.len()];
 

crates/heal/Cargo.toml

@@ -29,6 +29,7 @@ categories = ["web-programming", "development-tools", "filesystem"]
 [dependencies]
 rustfs-config = { workspace = true }
 rustfs-ecstore = { workspace = true }
+rustfs-storage-api = { workspace = true }
 rustfs-common = { workspace = true }
 rustfs-madmin = { workspace = true }
 rustfs-utils = { workspace = true }

crates/heal/src/heal/storage.rs

@@ -19,11 +19,10 @@ use rustfs_ecstore::{
     disk::{DiskStore, endpoint::Endpoint},
     error::StorageError,
     store::ECStore,
-    store_api::{
-        BucketInfo, BucketOperations, HealOperations, ListOperations, ObjectIO, ObjectOperations, ObjectOptions, StorageAPI,
-    },
+    store_api::{BucketInfo, BucketOperations, HealOperations, ListOperations, ObjectIO, ObjectOperations, ObjectOptions},
 };
 use rustfs_madmin::heal_commands::HealResultItem;
+use rustfs_storage_api::{DiskSetSelector, StorageAdminApi};
 use std::sync::Arc;
 use tracing::{debug, error, info, warn};
 
@@ -619,9 +618,7 @@ impl HealStorageAPI for ECStoreHealStorage {
         let (pool_idx, set_idx) = crate::heal::utils::parse_set_disk_id(set_disk_id)?;
 
         // Get the first available disk from the set
-        let disks = self
-            .ecstore
-            .get_disks(pool_idx, set_idx)
+        let disks = StorageAdminApi::disk_set_inventory(self.ecstore.as_ref(), DiskSetSelector::new(pool_idx, set_idx))
             .await
             .map_err(|e| Error::TaskExecutionFailed {
                 message: format!("Failed to get disks for pool {pool_idx} set {set_idx}: {e}"),

crates/scanner/Cargo.toml

@@ -46,6 +46,7 @@ rmp-serde = { workspace = true }
 rustfs-filemeta = { workspace = true }
 tokio-util = { workspace = true }
 rustfs-ecstore = { workspace = true }
+rustfs-storage-api = { workspace = true }
 http = { workspace = true }
 rand = { workspace = true }
 s3s = { workspace = true }

crates/scanner/src/scanner_io.rs

@@ -44,6 +44,7 @@ use rustfs_ecstore::set_disk::SetDisks;
 use rustfs_ecstore::store_api::{BucketInfo, BucketOperations, BucketOptions, ObjectInfo};
 use rustfs_ecstore::{StorageAPI, error::Result, store::ECStore};
 use rustfs_filemeta::FileMeta;
+use rustfs_storage_api::{DiskSetSelector, StorageAdminApi};
 use rustfs_utils::path::path_join_buf;
 use s3s::dto::{BucketLifecycleConfiguration, ReplicationConfiguration};
 use std::collections::{HashMap, HashSet};
@@ -1082,7 +1083,7 @@ impl ScannerIODisk for Disk {
             return Err(StorageError::other("Disk location not available".to_string()));
         };
 
-        let disks_result = ecstore.get_disks(pool_idx, set_idx).await?;
+        let disks_result = StorageAdminApi::disk_set_inventory(ecstore.as_ref(), DiskSetSelector::new(pool_idx, set_idx)).await?;
 
         let Some(disk_idx) = disk_location.disk_idx else {
             error!("Disk index not available");