Handle buildcomponent's job being None (quay#465)

kleesc · web-flow · commit 173c7a1910ad · 2020-06-30T16:12:51.000-04:00
diff --git a/buildman/component/buildcomponent.py b/buildman/component/buildcomponent.py
@@ -451,12 +451,14 @@ def _build_status_failure(self, exception=None):
         Calls self._build_finished with ERROR _without_ logging the failed build.
         This allows to handle Redis failures.
         """
-        build_id = self._current_job.repo_build.uuid
+        if self._current_job is not None:
+            build_id = self._current_job.repo_build.uuid
+
+            # The build's phase should still be updated even without logging to avoid getting into
+            # a weird state where it was complete but wasn't updated from "building" because of
+            # Redis going down.
+            build_model.update_phase_then_close(build_id, BUILD_PHASE.INTERNAL_ERROR)
 
-        # The build's phase should still be updated even without logging to avoid getting into
-        # a weird state where it was complete but wasn't updated from "building" because of
-        # Redis going down.
-        build_model.update_phase_then_close(build_id, BUILD_PHASE.INTERNAL_ERROR)
         yield From(self._build_finished(BuildJobResult.ERROR))
 
     @trollius.coroutine
diff --git a/buildman/server.py b/buildman/server.py
@@ -177,6 +177,10 @@ def _job_heartbeat(self, build_job):
 
     @trollius.coroutine
     def _job_complete(self, build_job, job_status, executor_name=None, update_phase=False):
+        if build_job is None:
+            logger.warning("[BUILD INCOMPLETE: job complete] Build component job is None",)
+            raise Return()
+
         if update_phase:
             try:
                 status_handler = StatusHandler(self._build_logs, build_job.repo_build.uuid)
