]> git.ipfire.org Git - pbs.git/commitdiff
jobs: Consume all uploads when importing files
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 9 Mar 2023 14:56:36 +0000 (14:56 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 9 Mar 2023 14:56:36 +0000 (14:56 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/buildservice/jobs.py
src/hub/jobs.py

index 3ab3e7bd8762f515c29dae1436c9dcdcdab95bab..a4091130ee3f0ef4498e4e5dbb790e4858b71d28 100644 (file)
@@ -194,6 +194,11 @@ class Job(base.DataObject):
                # Update the cache
                self.packages = packages
 
+               # Consume all packages
+               await asyncio.gather(
+                       *(upload.delete() for upload in uploads),
+               )
+
        @property
        def size(self):
                return sum((p.size for p in self.packages))
@@ -497,6 +502,9 @@ class Job(base.DataObject):
                self._set_attribute("log_size", upload.size)
                self._set_attribute("log_digest_blake2s", digest)
 
+               # Consume the upload object
+               await upload.delete()
+
        async def _delete_log(self):
                """
                        Called to delete the log file
index 50e250e76f83e51f836a96f7927b03b9389177ea..865d77ca00658697b24410dd6ac45325be4413dc 100644 (file)
@@ -101,6 +101,3 @@ class FinishedHandler(BaseHandler):
                        # Mark the job as finished
                        await job.finished(success=success,
                                logfile=logfile, packages=packages)
-
-                       # Delete the logfile
-                       await logfile.delete()