assemblyline-core 4.7.5.dev13__tar.gz → 4.7.5.dev15__tar.gz

{assemblyline_core-4.7.5.dev13 → assemblyline_core-4.7.5.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.5.dev13
+Version: 4.7.5.dev15
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.7.5.dev15/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.7.5.dev15

{assemblyline_core-4.7.5.dev13 → assemblyline_core-4.7.5.dev15}/assemblyline_core/expiry/run_expiry.py

@@ -27,7 +27,8 @@ if TYPE_CHECKING:
     from assemblyline.datastore.collection import ESCollection
 
 
-def file_delete_worker(logger, filestore_urls, file_batch, archive_filestore_urls=None) -> list[tuple[str, bool]]:
+def file_delete_worker(logger, filestore_urls, file_batch: list[tuple[str, bool]],
+                       archive_filestore_urls=None) -> list[tuple[str, bool]]:
     try:
         filestore = FileStore(*filestore_urls)
         if archive_filestore_urls and filestore_urls != archive_filestore_urls:
@@ -35,37 +36,43 @@ def file_delete_worker(logger, filestore_urls, file_batch, archive_filestore_url
         else:
             archivestore = filestore
 
-        def filestore_delete(item: tuple[str, bool]) -> tuple[Optional[str], Optional[bool]]:
-            sha256, from_archive = item
-            if from_archive:
-                archivestore.delete(sha256)
-                if not archivestore.exists(sha256):
-                    return sha256, True
-            else:
-                filestore.delete(sha256)
-                if not filestore.exists(sha256):
-                    return sha256, False
-            return None, None
-
-        return _file_delete_worker(logger, filestore_delete, file_batch)
+        return _file_delete_worker(logger, filestore, archivestore, file_batch)
 
     except Exception as error:
         logger.exception("Error in filestore worker: " + str(error))
     return []
 
 
-ActionSignature = Callable[[tuple[str, bool]], tuple[Optional[str], Optional[bool]]]
+def _confirm_delete(store, from_archive, sha256: str) -> tuple[Optional[str], Optional[bool]]:
+    if not store.exists(sha256):
+        return sha256, from_archive
+    return None, None
 
 
-def _file_delete_worker(logger, delete_action: ActionSignature, file_batch) -> list[tuple[str, bool]]:
+def _file_delete_worker(logger, filestore, archivestore, file_batch: list[tuple[str, bool]]) -> list[tuple[str, bool]]:
     finished_files: list[tuple[str, bool]] = []
     try:
-        futures = []
+        archive_files = [sha256 for sha256, from_archive in file_batch if from_archive]
+        hot_files = [sha256 for sha256, from_archive in file_batch if not from_archive]
+
+        with ThreadPoolExecutor(16) as pool:
+            # Delete the two batches in parallel if needed
+            futures = [
+                pool.submit(filestore.delete_batch, hot_files),
+                pool.submit(archivestore.delete_batch, archive_files),
+            ]
 
-        with ThreadPoolExecutor(8) as pool:
-            for filename in file_batch:
-                futures.append(pool.submit(delete_action, filename))
+            for future in as_completed(futures):
+                try:
+                    future.result()
+                except Exception as error:
+                    logger.exception("Error in filestore worker: " + str(error))
 
+            # It is CRITICALLY IMPORTANT that we don't delete the file records
+            # for files that do exists, confirm that we have actually deleted files
+            # before we procede with removing the datastore records
+            futures = [pool.submit(_confirm_delete, filestore, False, filename) for filename in hot_files]
+            futures.extend(pool.submit(_confirm_delete, archivestore, True, filename) for filename in archive_files)
             for future in as_completed(futures):
                 try:
                     erased_name, from_archive = future.result()

{assemblyline_core-4.7.5.dev13 → assemblyline_core-4.7.5.dev15}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline-core
-Version: 4.7.5.dev13
+Version: 4.7.5.dev15
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.7.5.dev13/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.7.5.dev13