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

Merge remote-tracking branch 'origin/cxymds/fix-1358-fleet-version-gate' into cxymds/fix-1358-gcs-exact-generation

Browse Source
This commit is contained in:
马登山
2026-07-29 09:29:40 +08:00
parent a0efd8a447 bbb479aec0
commit 49f07aff39
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/set_disk/ops/object.rs
+15 -3
View File
@@ -7260,7 +7260,9 @@ mod transition_source_identity_matrix_tests {
let object = format!("identity-{index}.bin"); let object = format!("identity-{index}.bin");
let payload = vec![u8::try_from(index + 1).expect("matrix index should fit u8"); 1024 * 1024]; let payload = vec![u8::try_from(index + 1).expect("matrix index should fit u8"); 1024 * 1024];
let mut reader = PutObjReader::from_vec(payload); let mut reader = PutObjReader::from_vec(payload);
let source_version_id = Uuid::new_v4();
let source_opts = ObjectOptions { let source_opts = ObjectOptions {
version_id: Some(source_version_id.to_string()),
versioned: true, versioned: true,
..Default::default() ..Default::default()
}; };
@@ -7272,8 +7274,13 @@ mod transition_source_identity_matrix_tests {
.get_object_fileinfo(bucket, &object, &source_opts, true, false) .get_object_fileinfo(bucket, &object, &source_opts, true, false)
.await .await
.expect("source metadata should resolve"); .expect("source metadata should resolve");
assert!(source.versioned); assert_eq!(source.version_id, Some(source_version_id));
assert!(source.version_id.is_some()); assert_eq!(
transition_source_identity(bucket, &object, &source, &source_opts, &get_raw_etag(&source.metadata))
.expect("persisted versioned source identity should build")
.version_mode,
TransitionSourceVersionMode::Versioned
);
let opts = ObjectOptions { let opts = ObjectOptions {
no_lock: true, no_lock: true,
versioned: true, versioned: true,
@@ -7316,8 +7323,13 @@ mod transition_source_identity_matrix_tests {
.await .await
.expect("single-field metadata drift should be written"); .expect("single-field metadata drift should be written");
} }
let persisted_opts = ObjectOptions {
version_id: changed.version_id.map(|version_id| version_id.to_string()),
versioned: true,
..Default::default()
};
let (persisted, _, _) = set_disks let (persisted, _, _) = set_disks
.get_object_fileinfo(bucket, &object, &source_opts, true, false) .get_object_fileinfo(bucket, &object, &persisted_opts, true, false)
.await .await
.expect("drifted source metadata should resolve"); .expect("drifted source metadata should resolve");
put_barrier.release(); put_barrier.release();