fix: backup progress should not add block failed to upload to success…

…ful count Longhorn 9791 Signed-off-by: Derek Su <[email protected]>
longhorn · Nov 12, 2024 · b405e8f · b405e8f
1 parent b5b0e72
commit b405e8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/backupbackingimage/backupbackingimage.go b/backupbackingimage/backupbackingimage.go
@@ -264,7 +264,8 @@ func backupMapping(bsDriver backupstore.BackupStoreDriver,
 		return err
 	}
 
-	return bsDriver.Write(blkFile, rs)
+	err = bsDriver.Write(blkFile, rs)
+	return err
 }
 
 // isBlockBeingProcessed check if the block is being processed by other goroutine and prevent redundant work

diff --git a/deltablock.go b/deltablock.go
@@ -425,7 +425,8 @@ func backupBlock(bsDriver BackupStoreDriver, config *DeltaBackupConfig,
 		return errors.Wrapf(err, "failed to get transfer data size during saving blocks")
 	}
 
-	if err := bsDriver.Write(blkFile, rs); err != nil {
+	err = bsDriver.Write(blkFile, rs)
+	if err != nil {
 		return errors.Wrapf(err, "failed to write data during saving blocks")
 	}