[pbs-devel] [PATCH proxmox-backup v2 4/4] datastore: refactor common delete list logic into closure

[Christian Ebner <c.ebner@proxmox.com>]

Reduce code duplication by defining a dedicated closure to update
the delete list age and push file lock guarded chunk object keys to
it.

No functional changes intended.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
Changes since version 1:
- not present

 pbs-datastore/src/datastore.rs | 36 +++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index d88785c6d..077b199e6 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -1691,6 +1691,19 @@ impl DataStore {
                 delete_list.clear();
                 Ok(())
             };
+
+            let add_to_delete_list =
+                |delete_list: &mut Vec<(S3ObjectKey, BackupLockGuard)>,
+                 delete_list_age: &mut i64,
+                 key: S3ObjectKey,
+                 _chunk_guard: BackupLockGuard| {
+                    // set age based on first insertion
+                    if delete_list.is_empty() {
+                        *delete_list_age = epoch_i64();
+                    }
+                    delete_list.push((key, _chunk_guard));
+                };
+
             loop {
                 for content in list_bucket_result.contents {
                     let (chunk_path, digest, bad) =
@@ -1745,12 +1758,12 @@ impl DataStore {
                                             std::fs::remove_file(chunk_path)?;
                                         }
                                     }
-
-                                    // set age based on first insertion
-                                    if delete_list.is_empty() {
-                                        delete_list_age = epoch_i64();
-                                    }
-                                    delete_list.push((content.key, _chunk_guard));
+                                    add_to_delete_list(
+                                        &mut delete_list,
+                                        &mut delete_list_age,
+                                        content.key,
+                                        _chunk_guard,
+                                    );
                                     Ok(())
                                 },
                             )?;
@@ -1758,11 +1771,12 @@ impl DataStore {
                     } else {
                         gc_status.removed_chunks += 1;
                         gc_status.removed_bytes += content.size;
-                        // set age based on first insertion
-                        if delete_list.is_empty() {
-                            delete_list_age = epoch_i64();
-                        }
-                        delete_list.push((content.key, _chunk_guard));
+                        add_to_delete_list(
+                            &mut delete_list,
+                            &mut delete_list_age,
+                            content.key,
+                            _chunk_guard,
+                        );
                     }
 
                     chunk_count += 1;
-- 
2.47.3



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel