This is an automated email from the ASF dual-hosted git repository.
ferruzzi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new bcb489c8880 add more debugging logs when emr_eks system tests fail
(#64817)
bcb489c8880 is described below
commit bcb489c8880698e9849251eb4489f6139f44da3b
Author: D. Ferruzzi <[email protected]>
AuthorDate: Thu Apr 9 16:25:11 2026 -0700
add more debugging logs when emr_eks system tests fail (#64817)
* add more debugging logs when emr_eks system tests fail
---
.../tests/system/amazon/aws/example_emr_eks.py | 6 ++++
.../amazon/tests/system/amazon/aws/utils/k8s.py | 38 ++++++++++++++++++----
2 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/providers/amazon/tests/system/amazon/aws/example_emr_eks.py
b/providers/amazon/tests/system/amazon/aws/example_emr_eks.py
index 2a672bc4657..1b61b017c04 100644
--- a/providers/amazon/tests/system/amazon/aws/example_emr_eks.py
+++ b/providers/amazon/tests/system/amazon/aws/example_emr_eks.py
@@ -50,6 +50,7 @@ except ImportError:
from airflow.utils.trigger_rule import TriggerRule # type:
ignore[no-redef,attr-defined]
from system.amazon.aws.utils import ENV_ID_KEY, SystemTestContextBuilder
+from system.amazon.aws.utils.k8s import get_describe_pod_operator
DAG_ID = "example_emr_eks"
@@ -292,6 +293,10 @@ with DAG(
)
# [END howto_sensor_emr_container]
+ # Describe pods only on failure to help diagnose EMR on EKS job issues.
+ describe_pod = get_describe_pod_operator(cluster_name=eks_cluster_name,
namespace=eks_namespace)
+ describe_pod.trigger_rule = TriggerRule.ONE_FAILED
+
delete_eks_cluster = EksDeleteClusterOperator(
task_id="delete_eks_cluster",
cluster_name=eks_cluster_name,
@@ -330,6 +335,7 @@ with DAG(
create_emr_eks_cluster,
job_starter,
job_waiter,
+ describe_pod,
# TEST TEARDOWN
delete_iam_oidc_identity_provider(eks_cluster_name),
delete_virtual_cluster(str(create_emr_eks_cluster.output)),
diff --git a/providers/amazon/tests/system/amazon/aws/utils/k8s.py
b/providers/amazon/tests/system/amazon/aws/utils/k8s.py
index 6954d0f5d01..8aa8e38ce3e 100644
--- a/providers/amazon/tests/system/amazon/aws/utils/k8s.py
+++ b/providers/amazon/tests/system/amazon/aws/utils/k8s.py
@@ -16,6 +16,8 @@
# under the License.
from __future__ import annotations
+from airflow.utils.helpers import exactly_one
+
try:
from airflow.providers.standard.operators.bash import BashOperator
except ImportError:
@@ -23,8 +25,34 @@ except ImportError:
from airflow.operators.bash import BashOperator # type: ignore[no-redef]
-def get_describe_pod_operator(cluster_name: str, pod_name: str) ->
BashOperator:
- """Returns an operator that'll print the output of a `k describe pod` in
the airflow logs."""
+def get_describe_pod_operator(
+ cluster_name: str,
+ *,
+ pod_name: str | None = None,
+ namespace: str | None = None,
+) -> BashOperator:
+ """Return an operator that prints ``kubectl describe pod(s)`` output in
the Airflow logs.
+
+ Exactly one of *pod_name* or *namespace* must be provided.
+
+ :param cluster_name: Name of the EKS cluster
+ :param pod_name: Describe a single pod by name
+ :param namespace: List and describe *all* pods in the given namespace
+ """
+ if not exactly_one(pod_name, namespace):
+ raise ValueError("Exactly one of 'pod_name' or 'namespace' must be
provided.")
+
+ if pod_name:
+ kubectl_commands = f"""
+ echo "***** pod description *****";
+ kubectl describe pod {pod_name};"""
+ else:
+ kubectl_commands = f"""
+ echo "***** pods in namespace {namespace} *****";
+ kubectl get pods -n {namespace} -o wide;
+ echo "***** pod descriptions *****";
+ kubectl describe pods -n {namespace};"""
+
return BashOperator(
task_id="describe_pod",
bash_command=f"""
@@ -32,8 +60,6 @@ def get_describe_pod_operator(cluster_name: str, pod_name:
str) -> BashOperator:
install_kubectl.sh;
# configure kubectl to hit the right cluster
aws eks update-kubeconfig --name {cluster_name};
- # once all this setup is done, actually describe the pod
- echo "vvv pod description below vvv";
- kubectl describe pod {pod_name};
- echo "^^^ pod description above ^^^" """,
+ {kubectl_commands}
+ """,
)
