Skip to content

Prevent legacy hybrid executors to be running in Airflow 3 - 2nd attempt #51760

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

Merged
jscheffl merged 1 commit into from
Jun 15, 2025
Merged

Prevent legacy hybrid executors to be running in Airflow 3 - 2nd attempt #51760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions providers/celery/src/airflow/providers/celery/executors/celery_kubernetes_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,18 @@ class CeleryKubernetesExecutor(BaseExecutor):
def kubernetes_queue(self) -> str:
return conf.get("celery_kubernetes_executor", "kubernetes_queue")

def __init__(self, celery_executor: CeleryExecutor, kubernetes_executor: KubernetesExecutor):
def __init__(
self,
celery_executor: CeleryExecutor | None = None,
kubernetes_executor: KubernetesExecutor | None = None,
):
if AIRFLOW_V_3_0_PLUS or not kubernetes_executor or not celery_executor:
raise RuntimeError(
f"{self.__class__.__name__} does not support Airflow 3.0+. See "
"https://airflow.apache.org/docs/apache-airflow/stable/core-concepts/executor/index.html#using-multiple-executors-concurrently"
" how to use multiple executors concurrently."
)

super().__init__()
self._job_id: int | str | None = None
self.celery_executor = celery_executor
Expand Down Expand Up @@ -130,13 +141,6 @@ def job_id(self, value: int | str | None) -> None:

def start(self) -> None:
"""Start celery and kubernetes executor."""
if AIRFLOW_V_3_0_PLUS:
raise RuntimeError(
f"{self.__class__.__name__} does not support Airflow 3.0+. See "
"https://airflow.apache.org/docs/apache-airflow/stable/core-concepts/executor/index.html#using-multiple-executors-concurrently"
" how to use multiple executors concurrently."
)

self.celery_executor.start()
self.kubernetes_executor.start()

Expand Down
20 changes: 12 additions & 8 deletions ...f/kubernetes/src/airflow/providers/cncf/kubernetes/executors/local_kubernetes_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,18 @@ class LocalKubernetesExecutor(BaseExecutor):

KUBERNETES_QUEUE = conf.get("local_kubernetes_executor", "kubernetes_queue")

def __init__(self, local_executor: LocalExecutor, kubernetes_executor: KubernetesExecutor):
def __init__(
self,
local_executor: LocalExecutor | None = None,
kubernetes_executor: KubernetesExecutor | None = None,
):
if AIRFLOW_V_3_0_PLUS or not local_executor or not kubernetes_executor:
raise RuntimeError(
f"{self.__class__.__name__} does not support Airflow 3.0+. See "
"https://airflow.apache.org/docs/apache-airflow/stable/core-concepts/executor/index.html#using-multiple-executors-concurrently"
" how to use multiple executors concurrently."
)

super().__init__()
self._job_id: int | str | None = None
self.local_executor = local_executor
Expand Down Expand Up @@ -120,13 +131,6 @@ def job_id(self, value: int | str | None) -> None:

def start(self) -> None:
"""Start local and kubernetes executor."""
if AIRFLOW_V_3_0_PLUS:
raise RuntimeError(
f"{self.__class__.__name__} does not support Airflow 3.0+. See "
"https://airflow.apache.org/docs/apache-airflow/stable/core-concepts/executor/index.html#using-multiple-executors-concurrently"
" how to use multiple executors concurrently."
)

self.log.info("Starting local and Kubernetes Executor")
self.local_executor.start()
self.kubernetes_executor.start()
Expand Down