Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refresh properties on KubernetesPodOperator on token expiration also when logging #39789

Merged
merged 3 commits into from
May 30, 2024
Merged

Refresh properties on KubernetesPodOperator on token expiration also when logging #39789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
971e4d8
Refresh KubernetesPodOperator properties when credentials expire also…
May 23, 2024
eb21149
Linting
May 23, 2024
a825540
Rename function
May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions airflow/providers/cncf/kubernetes/operators/pod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,16 +612,7 @@ def execute_sync(self, context: Context):
mode=ExecutionMode.SYNC,
)

if self.get_logs:
self.pod_manager.fetch_requested_container_logs(
pod=self.pod,
containers=self.container_logs,
follow_logs=True,
)
if not self.get_logs or (
self.container_logs is not True and self.base_container_name not in self.container_logs
):
self.await_container_completion(pod=self.pod, container_name=self.base_container_name)
self.await_pod_completion(pod=self.pod)
if self.callbacks:
self.callbacks.on_pod_completion(
pod=self.find_pod(self.pod.metadata.namespace, context=context),
Expand Down Expand Up @@ -654,9 +645,18 @@ def execute_sync(self, context: Context):
retry=tenacity.retry_if_exception(lambda exc: check_exception_is_kubernetes_api_unauthorized(exc)),
reraise=True,
)
def await_container_completion(self, pod: k8s.V1Pod, container_name: str):
def await_pod_completion(self, pod: k8s.V1Pod):
try:
self.pod_manager.await_container_completion(pod=pod, container_name=container_name)
if self.get_logs:
self.pod_manager.fetch_requested_container_logs(
pod=pod,
containers=self.container_logs,
follow_logs=True,
)
if not self.get_logs or (
self.container_logs is not True and self.base_container_name not in self.container_logs
):
self.pod_manager.await_container_completion(pod=pod, container_name=self.base_container_name)
except kubernetes.client.exceptions.ApiException as exc:
if exc.status and str(exc.status) == "401":
self.log.warning(
Expand Down
34 changes: 20 additions & 14 deletions tests/providers/cncf/kubernetes/operators/test_pod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1621,29 +1621,35 @@ def test_execute_async_callbacks(self):
"pod": remote_pod_mock,
}

@pytest.mark.parametrize("get_logs", [True, False])
@patch(f"{POD_MANAGER_CLASS}.fetch_requested_container_logs")
@patch(f"{POD_MANAGER_CLASS}.await_container_completion")
def test_await_container_completion_refreshes_properties_on_exception(
self, mock_await_container_completion
self, mock_await_container_completion, fetch_requested_container_logs, get_logs
):
container_name = "base"
k = KubernetesPodOperator(
task_id="task",
)
k = KubernetesPodOperator(task_id="task", get_logs=get_logs)
pod = self.run_pod(k)
client, hook, pod_manager = k.client, k.hook, k.pod_manager

# no exception doesn't update properties
k.await_container_completion(pod, container_name=container_name)
k.await_pod_completion(pod)
assert client == k.client
assert hook == k.hook
assert pod_manager == k.pod_manager

# exception refreshes properties
mock_await_container_completion.side_effect = [ApiException(status=401), mock.DEFAULT]
k.await_container_completion(pod, container_name=container_name)
mock_await_container_completion.assert_has_calls(
[mock.call(pod=pod, container_name=container_name)] * 3
)
fetch_requested_container_logs.side_effect = [ApiException(status=401), mock.DEFAULT]
k.await_pod_completion(pod)

if get_logs:
fetch_requested_container_logs.assert_has_calls(
[mock.call(pod=pod, containers=k.container_logs, follow_logs=True)] * 3
)
else:
mock_await_container_completion.assert_has_calls(
[mock.call(pod=pod, container_name=k.base_container_name)] * 3
)
assert client != k.client
assert hook != k.hook
assert pod_manager != k.pod_manager
Expand All @@ -1662,20 +1668,20 @@ def test_await_container_completion_refreshes_properties_on_exception(
def test_await_container_completion_retries_on_specific_exception(
self, mock_await_container_completion, side_effect, exception_type, expect_exc
):
container_name = "base"
k = KubernetesPodOperator(
task_id="task",
get_logs=False,
)
pod = self.run_pod(k)
mock_await_container_completion.side_effect = side_effect
if expect_exc:
k.await_container_completion(pod, container_name=container_name)
k.await_pod_completion(pod)
else:
with pytest.raises(exception_type):
k.await_container_completion(pod, container_name=container_name)
k.await_pod_completion(pod)
expected_call_count = min(len(side_effect), 3) # retry max 3 times
mock_await_container_completion.assert_has_calls(
[mock.call(pod=pod, container_name=container_name)] * expected_call_count
[mock.call(pod=pod, container_name=k.base_container_name)] * expected_call_count
)


Expand Down