fix(service): set job timeouts correctly (#3651)

Panaetius · web-flow · commit db0f8cf87d8f · 2023-11-08T16:34:43.000+01:00
diff --git a/renku/ui/service/controllers/datasets_add_file.py b/renku/ui/service/controllers/datasets_add_file.py
@@ -80,6 +80,8 @@ def prepare_paths(self):
                         _file["file_url"],
                         job_timeout=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),
                         result_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),
+                        ttl=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),
+                        failure_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),
                     )
                     enqueued_paths.append(_file["file_url"])
 
diff --git a/renku/ui/service/controllers/datasets_import.py b/renku/ui/service/controllers/datasets_import.py
@@ -65,6 +65,8 @@ def renku_op(self):
                 tag=self.ctx.get("tag", None),
                 job_timeout=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),
                 result_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),
+                ttl=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),
+                failure_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),
                 commit_message=self.ctx["commit_message"],
                 data_directory=self.ctx.get("data_directory"),
             )

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,8 @@ def prepare_paths(self):`
`80`	`80`	`_file["file_url"],`
`81`	`81`	`job_timeout=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),`
`82`	`82`	`result_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),`
	`83`	`+ ttl=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),`
	`84`	`+ failure_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),`
`83`	`85`	`)`
`84`	`86`	`enqueued_paths.append(_file["file_url"])`
`85`	`87`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ def renku_op(self):`
`65`	`65`	`tag=self.ctx.get("tag", None),`
`66`	`66`	`job_timeout=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),`
`67`	`67`	`result_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),`
	`68`	`+ ttl=int(os.getenv("WORKER_DATASET_JOBS_TIMEOUT", 1800)),`
	`69`	`+ failure_ttl=int(os.getenv("WORKER_DATASET_JOBS_RESULT_TTL", 500)),`
`68`	`70`	`commit_message=self.ctx["commit_message"],`
`69`	`71`	`data_directory=self.ctx.get("data_directory"),`
`70`	`72`	`)`