From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 9 Mar 2023 14:56:36 +0000 (+0000)
Subject: jobs: Consume all uploads when importing files
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ad2d75b88f436633cf8bed09eacf3cdf10e5f01;p=pbs.git

jobs: Consume all uploads when importing files

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index 3ab3e7bd..a4091130 100644
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -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
diff --git a/src/hub/jobs.py b/src/hub/jobs.py
index 50e250e7..865d77ca 100644
--- a/src/hub/jobs.py
+++ b/src/hub/jobs.py
@@ -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()