From dc5ce7d0afeb8d1b8114b9fb7a2074f272886fab Mon Sep 17 00:00:00 2001
From: GatewayJ <835269233@qq.com>
Date: Sat, 18 Apr 2026 19:13:35 +0800
Subject: [PATCH] test(scanner): avoid flaky noncurrent version counting
 (#2589)

Co-authored-by: GatewayJ <8352692332qq.com>
---
 .../tests/lifecycle_integration_test.rs       | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/crates/scanner/tests/lifecycle_integration_test.rs b/crates/scanner/tests/lifecycle_integration_test.rs
index 1bdbea61f..d7770ac46 100644
--- a/crates/scanner/tests/lifecycle_integration_test.rs
+++ b/crates/scanner/tests/lifecycle_integration_test.rs
@@ -24,7 +24,8 @@ use rustfs_ecstore::{
     pools::path2_bucket_object_with_base_path,
     store::ECStore,
     store_api::{
-        BucketOperations, MakeBucketOptions, MultipartOperations, ObjectIO, ObjectOperations, ObjectOptions, PutObjReader,
+        BucketOperations, ListOperations, MakeBucketOptions, MultipartOperations, ObjectIO, ObjectOperations, ObjectOptions,
+        PutObjReader,
     },
     tier::{
         tier_config::{TierConfig, TierMinIO, TierType},
@@ -487,36 +488,36 @@ async fn free_version_count(disk_path: &Path, bucket: &str, object: &str) -> usi
         .len()
 }
 
-async fn object_version_count(disk_path: &Path, bucket: &str, object: &str) -> usize {
-    let mut endpoint = Endpoint::try_from(disk_path.to_str().unwrap()).unwrap();
-    endpoint.set_pool_index(0);
-    endpoint.set_set_index(0);
-    endpoint.set_disk_index(0);
-    let disk = new_disk(
-        &endpoint,
-        &DiskOption {
-            cleanup: false,
-            health_check: false,
-        },
-    )
-    .await
-    .expect("failed to open local disk");
-    let data = disk
-        .read_metadata(bucket, &path_join_buf(&[object, STORAGE_FORMAT_FILE]))
-        .await
-        .expect("failed to read object metadata");
-    let meta = FileMeta::load(&data).expect("failed to load file metadata");
-    meta.get_file_info_versions(bucket, object, false)
-        .expect("failed to decode file info versions")
-        .versions
-        .len()
+async fn object_version_count(ecstore: &Arc<ECStore>, bucket: &str, object: &str) -> usize {
+    let mut marker = None;
+    let mut version_marker = None;
+    let mut count = 0;
+
+    loop {
+        let Ok(page) = ecstore
+            .clone()
+            .list_object_versions(bucket, object, marker.clone(), version_marker.clone(), None, 1000)
+            .await
+        else {
+            return 0;
+        };
+
+        count += page.objects.iter().filter(|version| version.name == object).count();
+
+        if !page.is_truncated {
+            return count;
+        }
+
+        marker = page.next_marker;
+        version_marker = page.next_version_idmarker;
+    }
 }
 
-async fn wait_for_version_count(disk_path: &Path, bucket: &str, object: &str, expected: usize, timeout: Duration) -> bool {
+async fn wait_for_version_count(ecstore: &Arc<ECStore>, bucket: &str, object: &str, expected: usize, timeout: Duration) -> bool {
     let deadline = tokio::time::Instant::now() + timeout;
 
     loop {
-        if object_version_count(disk_path, bucket, object).await == expected {
+        if object_version_count(ecstore, bucket, object).await == expected {
             return true;
         }
 
@@ -1313,7 +1314,7 @@ mod serial_tests {
             .await
             .expect("failed to upload v2");
 
-        assert_eq!(object_version_count(&disk_paths[0], bucket_name.as_str(), object_name).await, 2);
+        assert_eq!(object_version_count(&ecstore, bucket_name.as_str(), object_name).await, 2);
 
         let lifecycle_xml = r#"<?xml version="1.0" encoding="UTF-8"?>
 <LifecycleConfiguration>
@@ -1337,7 +1338,7 @@ mod serial_tests {
         scan_object_with_lifecycle(&disk_paths[0], bucket_name.as_str(), object_name).await;
 
         assert!(
-            wait_for_version_count(&disk_paths[0], bucket_name.as_str(), object_name, 1, Duration::from_secs(3)).await,
+            wait_for_version_count(&ecstore, bucket_name.as_str(), object_name, 1, Duration::from_secs(3)).await,
             "scanner should delete zero-day noncurrent versions after enqueueing expiry"
         );
     }
@@ -1345,7 +1346,7 @@ mod serial_tests {
     #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
     #[serial]
     async fn test_put_object_immediately_enqueues_zero_day_noncurrent_expiry() {
-        let (disk_paths, ecstore) = setup_isolated_test_env(true).await;
+        let (_disk_paths, ecstore) = setup_isolated_test_env(true).await;
 
         let bucket_name = format!("test-put-zero-day-noncurrent-{}", &Uuid::new_v4().simple().to_string()[..8]);
         let object_name = "test/object.txt";
@@ -1397,7 +1398,7 @@ mod serial_tests {
             .expect("failed to upload v2");
 
         assert!(
-            wait_for_version_count(&disk_paths[0], bucket_name.as_str(), object_name, 1, Duration::from_secs(2)).await,
+            wait_for_version_count(&ecstore, bucket_name.as_str(), object_name, 1, Duration::from_secs(2)).await,
             "put_object should enqueue zero-day noncurrent expiry without waiting for scanner"
         );
     }