mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-27 15:37:02 +00:00
@@ -18,8 +18,8 @@ use crate::heal::{
|
|||||||
storage::HealStorageAPI,
|
storage::HealStorageAPI,
|
||||||
task::{HealOptions, HealPriority, HealRequest, HealTask, HealTaskStatus, HealType},
|
task::{HealOptions, HealPriority, HealRequest, HealTask, HealTaskStatus, HealType},
|
||||||
};
|
};
|
||||||
use rustfs_ecstore::disk::error::DiskError;
|
|
||||||
use rustfs_ecstore::disk::DiskAPI;
|
use rustfs_ecstore::disk::DiskAPI;
|
||||||
|
use rustfs_ecstore::disk::error::DiskError;
|
||||||
use rustfs_ecstore::global::GLOBAL_LOCAL_DISK_MAP;
|
use rustfs_ecstore::global::GLOBAL_LOCAL_DISK_MAP;
|
||||||
use std::{
|
use std::{
|
||||||
collections::{HashMap, VecDeque},
|
collections::{HashMap, VecDeque},
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
use crate::error::{Error, Result};
|
use crate::error::{Error, Result};
|
||||||
use rustfs_ecstore::disk::{DiskAPI, DiskStore, BUCKET_META_PREFIX, RUSTFS_META_BUCKET};
|
use rustfs_ecstore::disk::{BUCKET_META_PREFIX, DiskAPI, DiskStore, RUSTFS_META_BUCKET};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
@@ -618,7 +618,7 @@ mod tests {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_get_resumable_tasks_integration() {
|
async fn test_get_resumable_tasks_integration() {
|
||||||
use rustfs_ecstore::disk::{endpoint::Endpoint, new_disk, DiskOption};
|
use rustfs_ecstore::disk::{DiskOption, endpoint::Endpoint, new_disk};
|
||||||
use tempfile::TempDir;
|
use tempfile::TempDir;
|
||||||
|
|
||||||
// Create a temporary directory for testing
|
// Create a temporary directory for testing
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ use crate::error::{Error, Result};
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use rustfs_common::heal_channel::{HealOpts, HealScanMode};
|
use rustfs_common::heal_channel::{HealOpts, HealScanMode};
|
||||||
use rustfs_ecstore::{
|
use rustfs_ecstore::{
|
||||||
disk::{endpoint::Endpoint, DiskStore},
|
disk::{DiskStore, endpoint::Endpoint},
|
||||||
store::ECStore,
|
store::ECStore,
|
||||||
store_api::{BucketInfo, ObjectIO, StorageAPI},
|
store_api::{BucketInfo, ObjectIO, StorageAPI},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ pub mod heal;
|
|||||||
pub mod scanner;
|
pub mod scanner;
|
||||||
|
|
||||||
pub use error::{Error, Result};
|
pub use error::{Error, Result};
|
||||||
pub use heal::{channel::HealChannelProcessor, HealManager, HealOptions, HealPriority, HealRequest, HealType};
|
pub use heal::{HealManager, HealOptions, HealPriority, HealRequest, HealType, channel::HealChannelProcessor};
|
||||||
pub use scanner::Scanner;
|
pub use scanner::Scanner;
|
||||||
|
|
||||||
// Global cancellation token for AHM services (scanner and other background tasks)
|
// Global cancellation token for AHM services (scanner and other background tasks)
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ use ecstore::{
|
|||||||
disk::{DiskAPI, DiskStore, WalkDirOptions},
|
disk::{DiskAPI, DiskStore, WalkDirOptions},
|
||||||
set_disk::SetDisks,
|
set_disk::SetDisks,
|
||||||
};
|
};
|
||||||
use rustfs_ecstore::{self as ecstore, data_usage::store_data_usage_in_backend, StorageAPI};
|
use rustfs_ecstore::{self as ecstore, StorageAPI, data_usage::store_data_usage_in_backend};
|
||||||
use rustfs_filemeta::MetacacheReader;
|
use rustfs_filemeta::MetacacheReader;
|
||||||
use tokio::sync::{Mutex, RwLock};
|
use tokio::sync::{Mutex, RwLock};
|
||||||
use tokio_util::sync::CancellationToken;
|
use tokio_util::sync::CancellationToken;
|
||||||
@@ -31,12 +31,13 @@ use tracing::{debug, error, info, warn};
|
|||||||
use super::metrics::{BucketMetrics, DiskMetrics, MetricsCollector, ScannerMetrics};
|
use super::metrics::{BucketMetrics, DiskMetrics, MetricsCollector, ScannerMetrics};
|
||||||
use crate::heal::HealManager;
|
use crate::heal::HealManager;
|
||||||
use crate::{
|
use crate::{
|
||||||
|
HealRequest,
|
||||||
error::{Error, Result},
|
error::{Error, Result},
|
||||||
get_ahm_services_cancel_token, HealRequest,
|
get_ahm_services_cancel_token,
|
||||||
};
|
};
|
||||||
use rustfs_common::{
|
use rustfs_common::{
|
||||||
data_usage::DataUsageInfo,
|
data_usage::DataUsageInfo,
|
||||||
metrics::{globalMetrics, Metric, Metrics},
|
metrics::{Metric, Metrics, globalMetrics},
|
||||||
};
|
};
|
||||||
|
|
||||||
use rustfs_ecstore::disk::RUSTFS_META_BUCKET;
|
use rustfs_ecstore::disk::RUSTFS_META_BUCKET;
|
||||||
@@ -1393,8 +1394,8 @@ mod tests {
|
|||||||
use rustfs_ecstore::endpoints::{EndpointServerPools, Endpoints, PoolEndpoints};
|
use rustfs_ecstore::endpoints::{EndpointServerPools, Endpoints, PoolEndpoints};
|
||||||
use rustfs_ecstore::store::ECStore;
|
use rustfs_ecstore::store::ECStore;
|
||||||
use rustfs_ecstore::{
|
use rustfs_ecstore::{
|
||||||
store_api::{MakeBucketOptions, ObjectIO, PutObjReader},
|
|
||||||
StorageAPI,
|
StorageAPI,
|
||||||
|
store_api::{MakeBucketOptions, ObjectIO, PutObjReader},
|
||||||
};
|
};
|
||||||
use serial_test::serial;
|
use serial_test::serial;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
|
|||||||
Reference in New Issue
Block a user