Attempt to recover job uid label if missing

galaxyproject · Sep 29, 2020 · 27d0052 · 27d0052
1 parent a2ec7b6
commit 27d0052
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/galaxy/jobs/runners/kubernetes.py b/lib/galaxy/jobs/runners/kubernetes.py
@@ -136,9 +136,15 @@ def queue_job(self, job_wrapper):
         job.create()
         job_id = getattr(job.labels, JOB_ID_LABEL, False)
         if not job_id:
-            job_wrapper.fail("Unexpected value from job runner", exception=True)
-            log.exception("%s not assigned by k8s to job on invocation: %s" % (JOB_ID_LABEL, job.obj))
-            return
+            # Recover uid label because it wasn't set
+            job.labels[JOB_ID_LABEL] = job.metadata.uid
+            job.update()
+            job_id = getattr(job.labels, JOB_ID_LABEL, False)
+            if not job_id:
+                job_wrapper.fail("Unexpected value from job runner", exception=True)
+                log.exception("%s not assigned by k8s to job on invocation: %s" % (JOB_ID_LABEL, job.obj))
+                return
+
         # define job attributes in the AsyncronousJobState for follow-up
         ajs.job_id = job_id
         # store runner information for tracking if Galaxy restarts