Fix lock (#510)

* Refactor: reimplement lock

Signed-off-by: junxiang Mu <1948535941@qq.com>

* Fix: fix test case failed

Signed-off-by: junxiang Mu <1948535941@qq.com>

* Improve: lock pref

Signed-off-by: junxiang Mu <1948535941@qq.com>

* fix(lock): Fix resource cleanup issue when batch lock acquisition fails
Ensure that the locks already acquired are properly released when batch lock acquisition fails to avoid memory leaks
Improve the lock protection mechanism to prevent double release issues
Add complete Apache license declarations to all files

Signed-off-by: junxiang Mu <1948535941@qq.com>

---------

Signed-off-by: junxiang Mu <1948535941@qq.com>

crates/ahm/src/heal/erasure_healer.rs

@@ -248,11 +248,32 @@ impl ErasureSetHealer {
                 .set_current_item(Some(bucket.to_string()), Some(object.clone()))
                 .await?;
 
+            // Check if object still exists before attempting heal
+            let object_exists = match self.storage.object_exists(bucket, object).await {
+                Ok(exists) => exists,
+                Err(e) => {
+                    warn!("Failed to check existence of {}/{}: {}, skipping", bucket, object, e);
+                    *current_object_index = obj_idx + 1;
+                    continue;
+                }
+            };
+
+            if !object_exists {
+                info!(
+                    "Object {}/{} no longer exists, skipping heal (likely deleted intentionally)",
+                    bucket, object
+                );
+                checkpoint_manager.add_processed_object(object.clone()).await?;
+                *successful_objects += 1; // Treat as successful - object is gone as intended
+                *current_object_index = obj_idx + 1;
+                continue;
+            }
+
             // heal object
             let heal_opts = HealOpts {
                 scan_mode: HealScanMode::Normal,
                 remove: true,
-                recreate: true,
+                recreate: true, // Keep recreate enabled for legitimate heal scenarios
                 ..Default::default()
             };
 

crates/ahm/src/heal/storage.rs

@@ -394,10 +394,19 @@ impl HealStorageAPI for ECStoreHealStorage {
     async fn object_exists(&self, bucket: &str, object: &str) -> Result<bool> {
         debug!("Checking object exists: {}/{}", bucket, object);
 
-        match self.get_object_meta(bucket, object).await {
-            Ok(Some(_)) => Ok(true),
-            Ok(None) => Ok(false),
-            Err(_) => Ok(false),
+        // Use get_object_info for efficient existence check without heavy heal operations
+        match self.ecstore.get_object_info(bucket, object, &Default::default()).await {
+            Ok(_) => Ok(true), // Object exists
+            Err(e) => {
+                // Map ObjectNotFound to false, other errors to false as well for safety
+                if matches!(e, rustfs_ecstore::error::StorageError::ObjectNotFound(_, _)) {
+                    debug!("Object not found: {}/{}", bucket, object);
+                    Ok(false)
+                } else {
+                    debug!("Error checking object existence {}/{}: {}", bucket, object, e);
+                    Ok(false) // Treat errors as non-existence to be safe
+                }
+            }
         }
     }
 

crates/ahm/src/heal/task.rs

@@ -339,6 +339,20 @@ impl HealTask {
         match self.storage.heal_object(bucket, object, version_id, &heal_opts).await {
             Ok((result, error)) => {
                 if let Some(e) = error {
+                    // Check if this is a "File not found" error during delete operations
+                    let error_msg = format!("{}", e);
+                    if error_msg.contains("File not found") || error_msg.contains("not found") {
+                        info!(
+                            "Object {}/{} not found during heal - likely deleted intentionally, treating as successful",
+                            bucket, object
+                        );
+                        {
+                            let mut progress = self.progress.write().await;
+                            progress.update_progress(3, 3, 0, 0);
+                        }
+                        return Ok(());
+                    }
+
                     error!("Heal operation failed: {}/{} - {}", bucket, object, e);
 
                     // If heal failed and remove_corrupted is enabled, delete the corrupted object
@@ -380,6 +394,20 @@ impl HealTask {
                 Ok(())
             }
             Err(e) => {
+                // Check if this is a "File not found" error during delete operations
+                let error_msg = format!("{}", e);
+                if error_msg.contains("File not found") || error_msg.contains("not found") {
+                    info!(
+                        "Object {}/{} not found during heal - likely deleted intentionally, treating as successful",
+                        bucket, object
+                    );
+                    {
+                        let mut progress = self.progress.write().await;
+                        progress.update_progress(3, 3, 0, 0);
+                    }
+                    return Ok(());
+                }
+
                 error!("Heal operation failed: {}/{} - {}", bucket, object, e);
 
                 // If heal failed and remove_corrupted is enabled, delete the corrupted object