Skip to content

Scheduler should not crash when executor_config is provided with CE #47375

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
eladkal merged 2 commits into from
Mar 5, 2025
Merged

Scheduler should not crash when executor_config is provided with CE #47375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f29d7d8
Scheduler should not crash when executor_config is provided with CE
amoghrajesh Mar 5, 2025
1284f3c
removing bad test
amoghrajesh Mar 5, 2025
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
2 changes: 1 addition & 1 deletion providers/celery/src/airflow/providers/celery/executors/celery_executor_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ def send_task_to_executor(
if AIRFLOW_V_3_0_PLUS:
if TYPE_CHECKING:
assert isinstance(args, workloads.BaseWorkload)
args = (args.model_dump_json(),)
args = (args.model_dump_json(exclude={"ti": {"executor_config"}}),)
try:
with timeout(seconds=OPERATION_TIMEOUT):
result = task_to_run.apply_async(args=args, queue=queue)
Expand Down
34 changes: 33 additions & 1 deletion tests/integration/executors/test_celery_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
from celery.backends.database import DatabaseBackend
from celery.contrib.testing.worker import start_worker
from kombu.asynchronous import set_event_loop
from kubernetes.client import models as k8s

from airflow.configuration import conf
from airflow.exceptions import AirflowException, AirflowTaskTimeout
Expand Down Expand Up @@ -137,7 +138,37 @@ def _change_state(self, key: TaskInstanceKey, state: TaskInstanceState, info=Non

@pytest.mark.flaky(reruns=3)
@pytest.mark.parametrize("broker_url", _prepare_test_bodies())
def test_celery_integration(self, broker_url):
@pytest.mark.parametrize(
"executor_config",
[
pytest.param({}, id="no_executor_config"),
pytest.param(
{
"pod_override": k8s.V1Pod(
spec=k8s.V1PodSpec(
containers=[
k8s.V1Container(
name="base",
resources=k8s.V1ResourceRequirements(
requests={
"cpu": "100m",
"memory": "384Mi",
},
limits={
"cpu": 1,
"memory": "500Mi",
},
),
)
]
)
)
},
id="pod_override_executor_config",
),
],
)
def test_celery_integration(self, broker_url, executor_config):
from airflow.providers.celery.executors import celery_executor, celery_executor_utils

def fake_execute_workload(command):
Expand All @@ -157,6 +188,7 @@ def fake_execute_workload(command):
try_number=0,
priority_weight=1,
queue=celery_executor_utils.celery_configuration["task_default_queue"],
executor_config=executor_config,
)
keys = [
TaskInstanceKey("id", "success", "abc", 0, -1),
Expand Down