[pbs-devel] [RFC PATCH proxmox-backup 1/3] verify: rename variables

[Dominik Csapak <d.csapak@proxmox.com>]

give them a better name by moving the cloning into a block just before
the closure, since there is no naming conflict.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
this patch is just there so one can better see the changes in 2/3

 src/backup/verify.rs | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/backup/verify.rs b/src/backup/verify.rs
index 3d2cba8ac..ba4ca4d2f 100644
--- a/src/backup/verify.rs
+++ b/src/backup/verify.rs
@@ -109,20 +109,18 @@ fn verify_index_chunks(
     let mut read_bytes = 0;
     let mut decoded_bytes = 0;
 
-    let datastore2 = Arc::clone(&verify_worker.datastore);
-    let corrupt_chunks2 = Arc::clone(&verify_worker.corrupt_chunks);
-    let verified_chunks2 = Arc::clone(&verify_worker.verified_chunks);
-    let errors2 = Arc::clone(&errors);
-
-    let decoder_pool = ParallelHandler::new(
-        "verify chunk decoder",
-        4,
+    let decoder_pool = ParallelHandler::new("verify chunk decoder", 4, {
+        let datastore = Arc::clone(&verify_worker.datastore);
+        let corrupt_chunks = Arc::clone(&verify_worker.corrupt_chunks);
+        let verified_chunks = Arc::clone(&verify_worker.verified_chunks);
+        let errors = Arc::clone(&errors);
+
         move |(chunk, digest, size): (DataBlob, [u8; 32], u64)| {
             let chunk_crypt_mode = match chunk.crypt_mode() {
                 Err(err) => {
-                    corrupt_chunks2.lock().unwrap().insert(digest);
+                    corrupt_chunks.lock().unwrap().insert(digest);
                     info!("can't verify chunk, unknown CryptMode - {err}");
-                    errors2.fetch_add(1, Ordering::SeqCst);
+                    errors.fetch_add(1, Ordering::SeqCst);
                     return Ok(());
                 }
                 Ok(mode) => mode,
@@ -132,21 +130,21 @@ fn verify_index_chunks(
                 info!(
                     "chunk CryptMode {chunk_crypt_mode:?} does not match index CryptMode {crypt_mode:?}"
                 );
-                errors2.fetch_add(1, Ordering::SeqCst);
+                errors.fetch_add(1, Ordering::SeqCst);
             }
 
             if let Err(err) = chunk.verify_unencrypted(size as usize, &digest) {
-                corrupt_chunks2.lock().unwrap().insert(digest);
+                corrupt_chunks.lock().unwrap().insert(digest);
                 info!("{err}");
-                errors2.fetch_add(1, Ordering::SeqCst);
-                rename_corrupted_chunk(datastore2.clone(), &digest);
+                errors.fetch_add(1, Ordering::SeqCst);
+                rename_corrupted_chunk(datastore.clone(), &digest);
             } else {
-                verified_chunks2.lock().unwrap().insert(digest);
+                verified_chunks.lock().unwrap().insert(digest);
             }
 
             Ok(())
-        },
-    );
+        }
+    });
 
     let skip_chunk = |digest: &[u8; 32]| -> bool {
         if verify_worker
-- 
2.39.5



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