Remove known bad blobs from do-not-use list when deleting them

grote · Nov 8, 2024 · ae77ebe · ae77ebe
1 parent 69765c7
commit ae77ebe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Pruner.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Pruner.kt
@@ -23,6 +23,7 @@ internal class Pruner(
     private val crypto: Crypto,
     private val backendManager: BackendManager,
     private val snapshotManager: SnapshotManager,
+    private val blobCache: BlobCache,
 ) {
 
     private val log = KotlinLogging.logger {}
@@ -77,11 +78,17 @@ internal class Pruner(
                 blob.id.hexFromProto()
             }
         }.toSet()
-        blobHandles.forEach { blobHandle ->
-            if (blobHandle.name !in usedBlobIds) {
-                log.info { "Removing blob ${blobHandle.name}" }
-                backendManager.backend.remove(blobHandle)
+        val removedBlobs = mutableSetOf<String>()
+        try {
+            blobHandles.forEach { blobHandle ->
+                if (blobHandle.name !in usedBlobIds) {
+                    log.info { "Removing blob ${blobHandle.name}" }
+                    backendManager.backend.remove(blobHandle)
+                    removedBlobs.add(blobHandle.name)
+                }
             }
+        } finally {
+            if (removedBlobs.isNotEmpty()) blobCache.onBlobsRemoved(removedBlobs)
         }
     }
 

diff --git a/app/src/test/java/com/stevesoltys/seedvault/repo/PrunerTest.kt b/app/src/test/java/com/stevesoltys/seedvault/repo/PrunerTest.kt
@@ -33,9 +33,10 @@ internal class PrunerTest : TransportTest() {
 
     private val backendManager: BackendManager = mockk()
     private val snapshotManager: SnapshotManager = mockk()
+    private val blobCache: BlobCache = mockk()
     private val backend: Backend = mockk()
 
-    private val pruner = Pruner(crypto, backendManager, snapshotManager)
+    private val pruner = Pruner(crypto, backendManager, snapshotManager, blobCache)
     private val folder = TopLevelFolder(repoId)
 
     private val snapshotHandle1 =
@@ -84,6 +85,7 @@ internal class PrunerTest : TransportTest() {
         blobIds.forEach {
             coEvery { backend.remove(AppBackupFileType.Blob(repoId, it)) } just Runs
         }
+        every { blobCache.onBlobsRemoved(blobIds.toSet()) } just Runs
 
         pruner.removeOldSnapshotsAndPruneUnusedBlobs()
     }
@@ -143,12 +145,14 @@ internal class PrunerTest : TransportTest() {
         // now extra blobs will get removed
         coEvery { backend.remove(AppBackupFileType.Blob(repoId, blob1)) } just Runs
         coEvery { backend.remove(AppBackupFileType.Blob(repoId, blob2)) } just Runs
+        every { blobCache.onBlobsRemoved(setOf(blob1, blob2)) } just Runs
 
         pruner.removeOldSnapshotsAndPruneUnusedBlobs()
 
         coVerify {
             backend.remove(AppBackupFileType.Blob(repoId, blob1))
             backend.remove(AppBackupFileType.Blob(repoId, blob2))
+            blobCache.onBlobsRemoved(setOf(blob1, blob2))
         }
     }