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

Fix/objectdelete (#917)

Browse Source 
* fix getobject content length resp

* fix delete object

---------

Co-authored-by: houseme <housemecn@gmail.com>
This commit is contained in:
weisd
2025-11-24 16:35:51 +08:00
committed by GitHub
parent 44bdebe6e9
commit fce4e64da4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/filemeta/src/filemeta.rs
+3 -3
View File
@@ -615,7 +615,7 @@ impl FileMeta {
} }
} }
let mut update_version = fi.mark_deleted; let mut update_version = false;
if fi.version_purge_status().is_empty() if fi.version_purge_status().is_empty()
&& (fi.delete_marker_replication_status() == ReplicationStatusType::Replica && (fi.delete_marker_replication_status() == ReplicationStatusType::Replica
|| fi.delete_marker_replication_status() == ReplicationStatusType::Empty) || fi.delete_marker_replication_status() == ReplicationStatusType::Empty)
@@ -1708,7 +1708,7 @@ impl MetaObject {
} }
pub fn into_fileinfo(&self, volume: &str, path: &str, all_parts: bool) -> FileInfo { pub fn into_fileinfo(&self, volume: &str, path: &str, all_parts: bool) -> FileInfo {
// let version_id = self.version_id.filter(|&vid| !vid.is_nil()); let version_id = self.version_id.filter(|&vid| !vid.is_nil());
let parts = if all_parts { let parts = if all_parts {
let mut parts = vec![ObjectPartInfo::default(); self.part_numbers.len()]; let mut parts = vec![ObjectPartInfo::default(); self.part_numbers.len()];
@@ -1812,7 +1812,7 @@ impl MetaObject {
.unwrap_or_default(); .unwrap_or_default();
FileInfo { FileInfo {
version_id: self.version_id, version_id,
erasure, erasure,
data_dir: self.data_dir, data_dir: self.data_dir,
mod_time: self.mod_time, mod_time: self.mod_time,
rustfs/src/storage/ecfs.rs
+2 -2
View File
@@ -1733,10 +1733,10 @@ impl S3 for FS {
} }
} }
let mut content_length = info.size; let mut content_length = info.get_actual_size().map_err(ApiError::from)?;
let content_range = if let Some(rs) = &rs { let content_range = if let Some(rs) = &rs {
let total_size = info.get_actual_size().map_err(ApiError::from)?; let total_size = content_length;
let (start, length) = rs.get_offset_length(total_size).map_err(ApiError::from)?; let (start, length) = rs.get_offset_length(total_size).map_err(ApiError::from)?;
content_length = length; content_length = length;
Some(format!("bytes {}-{}/{}", start, start as i64 + length - 1, total_size)) Some(format!("bytes {}-{}/{}", start, start as i64 + length - 1, total_size))