Merge remote-tracking branch 'origin/main' into cxymds/fix-1358-opaque-transition-metadata

crates/ecstore/src/set_disk/ops/object.rs

@@ -7240,6 +7240,9 @@ mod transition_source_identity_matrix_tests {
                     changed.metadata.insert("etag".to_string(), format!("changed-{index}"));
                 }
             }
+            // Replace the object version list so VersionId drift removes the
+            // accepted source version instead of appending a second version.
+            changed.fresh = true;
             for disk in &disk_stores {
                 disk.write_metadata("", bucket, &object, changed.clone())
                     .await

crates/ecstore/src/set_disk/read.rs

@@ -2016,11 +2016,15 @@ mod metadata_cache_tests {
         fi.size = 1;
         fi.erasure.index = 1;
         fi.metadata.insert("etag".to_string(), "etag-1".to_string());
+        fi.add_object_part(1, "part-etag".to_string(), 1, fi.mod_time, 1, None, None);
         fi
     }
 
     #[tokio::test]
     async fn get_object_with_fileinfo_rejects_positive_size_without_parts() {
+        let mut fi = valid_test_fileinfo("object");
+        fi.parts.clear();
+
         let mut output = Vec::new();
         let err = SetDisks::get_object_with_fileinfo(
             "bucket",
@@ -2028,7 +2032,7 @@ mod metadata_cache_tests {
             0,
             1,
             &mut output,
-            valid_test_fileinfo("object"),
+            fi,
             Vec::new(),
             &[],
             0,
@@ -2119,12 +2123,6 @@ mod metadata_cache_tests {
 
         let mut invalid_erasure = valid_test_fileinfo(object);
         invalid_erasure.erasure.block_size = 0;
-        invalid_erasure.parts.push(ObjectPartInfo {
-            number: 1,
-            size: 1,
-            actual_size: 1,
-            ..Default::default()
-        });
         let err = SetDisks::get_object_with_fileinfo(
             bucket,
             object,
@@ -2159,6 +2157,7 @@ mod metadata_cache_tests {
         let object = "empty";
         let mut fi = valid_test_fileinfo(object);
         fi.size = 0;
+        fi.parts.clear();
 
         let mut output = Vec::new();
         SetDisks::get_object_with_fileinfo(
@@ -2191,12 +2190,6 @@ mod metadata_cache_tests {
         let mut fi = valid_test_fileinfo(object);
         fi.erasure.block_size = 1;
         fi.erasure.distribution = vec![1, 2, 3, 4];
-        fi.parts.push(ObjectPartInfo {
-            number: 1,
-            size: 1,
-            actual_size: 1,
-            ..Default::default()
-        });
 
         let mut output = Vec::new();
         let err = SetDisks::get_object_with_fileinfo(