From 4990b2921e33e2755f2ff67233960fde4a862e44 Mon Sep 17 00:00:00 2001 From: Beni Ben Zikry Date: Tue, 28 Jul 2020 01:21:21 +0300 Subject: [PATCH] fix static checks --- airflow/providers/cncf/kubernetes/hooks/kubernetes.py | 3 ++- .../cncf/kubernetes/sensors/spark_kubernetes.py | 9 +++------ .../cncf/kubernetes/sensors/test_spark_kubernetes.py | 4 +--- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/airflow/providers/cncf/kubernetes/hooks/kubernetes.py b/airflow/providers/cncf/kubernetes/hooks/kubernetes.py index a3d22f6b6c680..7d8e22471fd20 100644 --- a/airflow/providers/cncf/kubernetes/hooks/kubernetes.py +++ b/airflow/providers/cncf/kubernetes/hooks/kubernetes.py @@ -109,7 +109,7 @@ def create_custom_resource_definition( def get_pod_log_stream( self, pod_name: str, - container: Optional[str] = "base", + container: Optional[str] = "", namespace: Optional[str] = None, ) -> Tuple[watch.Watch, Generator[str, None, None]]: """ @@ -130,6 +130,7 @@ def get_pod_log_stream( watcher.stream( api.read_namespaced_pod_log, name=pod_name, + container=container, namespace=namespace if namespace else self.get_namespace(), ), ) diff --git a/airflow/providers/cncf/kubernetes/sensors/spark_kubernetes.py b/airflow/providers/cncf/kubernetes/sensors/spark_kubernetes.py index bd6cdc41ad870..9c03f06daa134 100644 --- a/airflow/providers/cncf/kubernetes/sensors/spark_kubernetes.py +++ b/airflow/providers/cncf/kubernetes/sensors/spark_kubernetes.py @@ -82,12 +82,9 @@ def _log_driver(self, application_state: str): self.log.warning( "Could not read logs for pod %s. It may have been disposed.\n" "Make sure timeToLiveSeconds is set on your SparkApplication spec.\n" - "underlying exception: %s" % (driver_pod_name, e) - ) - except Exception as e: - self.log.warning( - "Unexpected error while reading logs for pod %s. error: %s" - % (driver_pod_name, e) + "underlying exception: %s", + driver_pod_name, + e, ) def poke(self, context: Dict): diff --git a/tests/providers/cncf/kubernetes/sensors/test_spark_kubernetes.py b/tests/providers/cncf/kubernetes/sensors/test_spark_kubernetes.py index ed8be221b7204..424f195ca619c 100644 --- a/tests/providers/cncf/kubernetes/sensors/test_spark_kubernetes.py +++ b/tests/providers/cncf/kubernetes/sensors/test_spark_kubernetes.py @@ -26,9 +26,7 @@ from airflow import DAG from airflow.exceptions import AirflowException from airflow.models import Connection -from airflow.providers.cncf.kubernetes.sensors.spark_kubernetes import ( - SparkKubernetesSensor, -) +from airflow.providers.cncf.kubernetes.sensors.spark_kubernetes import SparkKubernetesSensor from airflow.utils import db, timezone TEST_COMPLETED_APPLICATION = {