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

fix(ecstore): repair rebalance test imports

Browse Source
This commit is contained in:
overtrue
2026-08-22 08:25:01 +08:00
parent 7b12d621a7
commit 89e910df3a
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/bucket/lifecycle/bucket_lifecycle_ops.rs
+1 -1
View File
@@ -5014,7 +5014,7 @@ async fn apply_expiry_on_transitioned_object_with_lock_lost_signal(
api: Arc<ECStore>, api: Arc<ECStore>,
oi: &ObjectInfo, oi: &ObjectInfo,
lc_event: &lifecycle::Event, lc_event: &lifecycle::Event,
src: &LcEventSrc, _src: &LcEventSrc,
bucket_incarnation_id: Uuid, bucket_incarnation_id: Uuid,
lock_lost_signal: Option<Arc<rustfs_lock::distributed_lock::LockLostSignal>>, lock_lost_signal: Option<Arc<rustfs_lock::distributed_lock::LockLostSignal>>,
) -> bool { ) -> bool {
crates/ecstore/src/services/rebalance/entry.rs
+2 -3
View File
@@ -791,7 +791,6 @@ pub mod test_util {
use super::super::{RebalStatus, RebalanceInfo, RebalanceMeta, RebalanceStats}; use super::super::{RebalStatus, RebalanceInfo, RebalanceMeta, RebalanceStats};
use super::*; use super::*;
use crate::storage_api_contracts::bucket::{BucketOperations as _, MakeBucketOptions}; use crate::storage_api_contracts::bucket::{BucketOperations as _, MakeBucketOptions};
use crate::storage_api_contracts::object::ObjectOperations as _;
use rustfs_filemeta::FileMeta; use rustfs_filemeta::FileMeta;
pub struct PausedRebalanceEntryTestFixture { pub struct PausedRebalanceEntryTestFixture {
@@ -936,7 +935,6 @@ pub mod test_util {
mod tests { mod tests {
use super::*; use super::*;
use crate::bucket::lifecycle::lifecycle::TRANSITION_COMPLETE; use crate::bucket::lifecycle::lifecycle::TRANSITION_COMPLETE;
use crate::client::api_s3_datatypes::CompletePart;
use crate::object_api::PutObjReader; use crate::object_api::PutObjReader;
use crate::services::rebalance::{RebalStatus, RebalanceInfo, RebalanceMeta, RebalanceStats}; use crate::services::rebalance::{RebalStatus, RebalanceInfo, RebalanceMeta, RebalanceStats};
use crate::set_disk::{ use crate::set_disk::{
@@ -944,9 +942,10 @@ mod tests {
TieredMetadataCommitBarrier, TieredMetadataCommitBarrier,
}; };
use crate::storage_api_contracts::multipart::MultipartOperations as _; use crate::storage_api_contracts::multipart::MultipartOperations as _;
use crate::storage_api_contracts::object::ObjectOperations as _; use crate::storage_api_contracts::object::ObjectIO as _;
use http::HeaderMap; use http::HeaderMap;
use rustfs_filemeta::{FileInfo, FileMeta, ObjectPartInfo, TransitionVersionState}; use rustfs_filemeta::{FileInfo, FileMeta, ObjectPartInfo, TransitionVersionState};
use rustfs_storage_api::CompletePart;
use s3s::dto::{BucketLifecycleConfiguration, ExpirationStatus, LifecycleExpiration, LifecycleRule}; use s3s::dto::{BucketLifecycleConfiguration, ExpirationStatus, LifecycleExpiration, LifecycleRule};
use std::time::Duration as StdDuration; use std::time::Duration as StdDuration;
use time::OffsetDateTime; use time::OffsetDateTime;
crates/ecstore/src/services/rebalance/mod.rs
+1
View File
@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
use crate::disk::DiskAPI;
use crate::error::{Error, Result}; use crate::error::{Error, Result};
use crate::object_api::{GetObjectReader, ObjectInfo, ObjectOptions, PutObjReader}; use crate::object_api::{GetObjectReader, ObjectInfo, ObjectOptions, PutObjReader};
use tokio::time::Duration; use tokio::time::Duration;
crates/ecstore/src/services/rebalance/rebalance_unit_tests.rs
-1
View File
@@ -68,7 +68,6 @@ use rustfs_filemeta::{FileInfo, MetaCacheEntry};
use rustfs_rio::Index; use rustfs_rio::Index;
use s3s::dto::ReplicationConfiguration; use s3s::dto::ReplicationConfiguration;
use serde::Serialize; use serde::Serialize;
use std::future::Future;
use std::io::Cursor; use std::io::Cursor;
use std::sync::Arc; use std::sync::Arc;
use std::sync::Mutex; use std::sync::Mutex;