Merge pull request #212 from Yelp/u/emanelsabban/handling-added-events

Handling Added events
Yelp · Jan 25, 2024 · 80d4980 · 80d4980
2 parents 0f0cbe6 + c040670
commit 80d4980
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        make_target: [test, tox_integration, tox_docs]
+        make_target: [test, tox_docs]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        make_target: [test, tox_integration, tox_docs]
+        make_target: [test, tox_docs]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2

diff --git a/task_processing/plugins/kubernetes/kubernetes_pod_executor.py b/task_processing/plugins/kubernetes/kubernetes_pod_executor.py
@@ -205,12 +205,13 @@ def __update_modified_pod(self, pod: V1Pod, event: Optional[PodEvent]) -> None:
         """Called during reconciliation and normal event handling"""
         pod_name = pod.metadata.name
         task_metadata = self.task_metadata[pod_name]
+        event_type = event["type"] if event else "null"
 
         raw_event = event["raw_object"] if event else None
 
         if pod.status.phase not in SUPPORTED_POD_MODIFIED_EVENT_PHASES:
             logger.debug(
-                f"Got a MODIFIED event for {pod_name} for unhandled phase: "
+                f"Got a {event_type} event for {pod_name} for unhandled phase: "
                 f"{pod.status.phase} - ignoring."
             )
             return
@@ -319,7 +320,7 @@ def __update_modified_pod(self, pod: V1Pod, event: Optional[PodEvent]) -> None:
             and task_metadata.task_state is not KubernetesTaskState.TASK_LOST
         ):
             logger.info(
-                f"Got a MODIFIED event for {pod_name} with unknown phase, host likely "
+                f"Got a {event_type} event for {pod_name} with unknown phase, host likely "
                 "unexpectedly died"
             )
             self.task_metadata = self.task_metadata.set(
@@ -357,7 +358,7 @@ def __update_modified_pod(self, pod: V1Pod, event: Optional[PodEvent]) -> None:
             )
         else:
             logger.info(
-                f"Ignoring MODIFIED event for {pod_name} as it did not result "
+                f"Ignoring {event_type} event for {pod_name} as it did not result "
                 "in a state transition",
             )
 
@@ -388,7 +389,7 @@ def _process_pod_event(self, event: PodEvent) -> None:
             elif event["type"] == "DELETED":
                 self.__handle_deleted_pod_event(event)
 
-            elif event["type"] == "MODIFIED":
+            elif event["type"] in {"MODIFIED", "ADDED"}:
                 self.__handle_modified_pod_event(event)
 
             else: