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

Fix/main (#505)

Browse Source 
* fix error

* fix

* fix cargo
This commit is contained in:
likewu
2025-06-23 18:51:31 +08:00
committed by GitHub
parent 833f9c908f
commit 46c50b1bb1
9 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ecstore/src/bucket/lifecycle/bucket_lifecycle_ops.rs
+1 -1
View File
@@ -804,7 +804,7 @@ impl LifecycleOps for ObjectInfo {
user_tags: self.user_tags.clone(),
version_id: self.version_id.expect("err").to_string(),
mod_time: self.mod_time,
size: self.size,
size: self.size as usize,
is_latest: self.is_latest,
num_versions: self.num_versions,
delete_marker: self.delete_marker,
ecstore/src/bucket/object_lock/objectlock_sys.rs
+2 -2
View File
@@ -36,7 +36,7 @@ pub fn enforce_retention_for_deletion(obj_info: &ObjectInfo) -> bool {
return false;
}
let lhold = objectlock::get_object_legalhold_meta(obj_info.user_defined.clone().expect("err"));
let lhold = objectlock::get_object_legalhold_meta(obj_info.user_defined.clone());
match lhold.status {
Some(st) if st.as_str() == ObjectLockLegalHoldStatus::ON => {
return true;
@@ -44,7 +44,7 @@ pub fn enforce_retention_for_deletion(obj_info: &ObjectInfo) -> bool {
_ => (),
}
let ret = objectlock::get_object_retention_meta(obj_info.user_defined.clone().expect("err"));
let ret = objectlock::get_object_retention_meta(obj_info.user_defined.clone());
match ret.mode {
Some(r) if (r.as_str() == ObjectLockRetentionMode::COMPLIANCE || r.as_str() == ObjectLockRetentionMode::GOVERNANCE) => {
let t = objectlock::utc_now_ntp();
ecstore/src/client/object_api_utils.rs
+2 -2
View File
@@ -55,8 +55,8 @@ fn part_number_to_rangespec(oi: ObjectInfo, part_number: usize) -> Option<HTTPRa
}
Some(HTTPRangeSpec {
start: start as usize,
end: Some(end as usize),
start: start,
end: end,
is_suffix_length: false,
})
}
ecstore/src/set_disk.rs
+24 -26
View File
@@ -3048,33 +3048,33 @@ impl SetDisks {
let task = if !skip_background_task {
Some(tokio::spawn(async move {
let last_save = Some(SystemTime::now());
let mut need_loop = true;
while need_loop {
select! {
_ = ticker.tick() => {
if !cache.info.last_update.eq(&last_save) {
let _ = cache.save(DATA_USAGE_CACHE_NAME).await;
let _ = updates.send(cache.clone()).await;
}
}
result = buckets_results_rx.recv() => {
match result {
Some(result) => {
cache.replace(&result.name, &result.parent, result.entry);
cache.info.last_update = Some(SystemTime::now());
},
None => {
need_loop = false;
cache.info.next_cycle = want_cycle;
cache.info.last_update = Some(SystemTime::now());
let last_save = Some(SystemTime::now());
let mut need_loop = true;
while need_loop {
select! {
_ = ticker.tick() => {
if !cache.info.last_update.eq(&last_save) {
let _ = cache.save(DATA_USAGE_CACHE_NAME).await;
let _ = updates.send(cache.clone()).await;
}
}
result = buckets_results_rx.recv() => {
match result {
Some(result) => {
cache.replace(&result.name, &result.parent, result.entry);
cache.info.last_update = Some(SystemTime::now());
},
None => {
need_loop = false;
cache.info.next_cycle = want_cycle;
cache.info.last_update = Some(SystemTime::now());
let _ = cache.save(DATA_USAGE_CACHE_NAME).await;
let _ = updates.send(cache.clone()).await;
}
}
}
}
}
}
}))
} else {
None
@@ -3183,7 +3183,7 @@ impl SetDisks {
info!("ns_scanner start");
let _ = join_all(futures).await;
if let Some(task) = task {
let _ = task.await;
let _ = task.await;
}
info!("ns_scanner completed");
Ok(())
@@ -3721,9 +3721,7 @@ impl SetDisks {
let mut oi = obj_info.clone();
oi.metadata_only = true;
if let Some(user_defined) = &mut oi.user_defined {
user_defined.remove(X_AMZ_RESTORE.as_str());
}
oi.user_defined.remove(X_AMZ_RESTORE.as_str());
let version_id = oi.version_id.clone().map(|v| v.to_string());
let obj = self
@@ -4044,7 +4042,7 @@ impl ObjectIO for SetDisks {
if opts.data_movement {
fi.set_data_moved();
}
}
}
let (online_disks, _, op_old_dir) = Self::rename_data(