fix: mark chunks as completed when no failures on retry

maidsafe · Dec 5, 2023 · 9e3b05a · 9e3b05a
1 parent 8c9d676
commit 9e3b05a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/sn_cli/src/subcommands/files/chunk_manager.rs b/sn_cli/src/subcommands/files/chunk_manager.rs
@@ -445,11 +445,6 @@ impl ChunkManager {
             .ok()?;
         Some(XorName(decoded_xorname))
     }
-
-    #[allow(dead_code)]
-    fn hex_encode_xorname(xorname: XorName) -> String {
-        hex::encode(xorname)
-    }
 }
 
 #[cfg(test)]

diff --git a/sn_cli/src/subcommands/files/mod.rs b/sn_cli/src/subcommands/files/mod.rs
@@ -166,7 +166,15 @@ async fn upload_files(
     if chunk_manager.is_chunks_empty() {
         // make sure we don't have any failed chunks in those
         let chunks = chunk_manager.already_put_chunks(&files_path)?;
-        let failed_chunks = client.verify_uploaded_chunks(chunks, batch_size).await?;
+        let failed_chunks = client.verify_uploaded_chunks(&chunks, batch_size).await?;
+
+        // mark the non-failed ones as completed
+        chunk_manager.mark_completed(
+            chunks
+                .into_iter()
+                .filter(|c| !failed_chunks.contains(c))
+                .map(|(xor, _)| xor),
+        );
 
         // if none are failed, we can return early
         if failed_chunks.is_empty() {

diff --git a/sn_client/src/api.rs b/sn_client/src/api.rs
@@ -685,7 +685,7 @@ impl Client {
     /// Returns a vec of any chunks that could not be verified
     pub async fn verify_uploaded_chunks(
         &self,
-        chunks_paths: Vec<(XorName, PathBuf)>,
+        chunks_paths: &[(XorName, PathBuf)],
         batch_size: usize,
     ) -> Result<Vec<(XorName, PathBuf)>> {
         let mut failed_chunks = Vec::new();

diff --git a/sn_client/src/file_apis.rs b/sn_client/src/file_apis.rs
@@ -277,7 +277,7 @@ impl Files {
 
         let mut failed_chunks = self
             .client
-            .verify_uploaded_chunks(chunks, BATCH_SIZE)
+            .verify_uploaded_chunks(&chunks, BATCH_SIZE)
             .await?;
         warn!("Failed chunks: {:?}", failed_chunks.len());
 
@@ -319,7 +319,7 @@ impl Files {
 
             failed_chunks = self
                 .client
-                .verify_uploaded_chunks(failed_chunks, BATCH_SIZE)
+                .verify_uploaded_chunks(&failed_chunks, BATCH_SIZE)
                 .await?;
         }