Skip to content

Remove global from celery provider #58869

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 2 commits into from
Dec 3, 2025
Merged

Remove global from celery provider #58869

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
78cdb93
Remove global from celery provider
jscheffl Nov 30, 2025
e326e6d
Remove global from celery provider, add caching
jscheffl Nov 30, 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
23 changes: 12 additions & 11 deletions 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 @@ -31,6 +31,7 @@
import traceback
from collections.abc import Collection, Mapping, MutableMapping, Sequence
from concurrent.futures import ProcessPoolExecutor
from functools import cache
from typing import TYPE_CHECKING, Any

from celery import Celery, Task, states as celery_states
Expand Down Expand Up @@ -84,24 +85,24 @@
# Make it constant for unit test.
CELERY_FETCH_ERR_MSG_HEADER = "Error fetching Celery task state"

celery_configuration = None

@cache
def get_celery_configuration() -> dict[str, Any]:
"""Get the Celery configuration dictionary."""
if conf.has_option("celery", "celery_config_options"):
return conf.getimport("celery", "celery_config_options")

@providers_configuration_loaded
def _get_celery_app() -> Celery:
"""Init providers before importing the configuration, so the _SECRET and _CMD options work."""
global celery_configuration
from airflow.providers.celery.executors.default_celery import DEFAULT_CELERY_CONFIG

if conf.has_option("celery", "celery_config_options"):
celery_configuration = conf.getimport("celery", "celery_config_options")
else:
from airflow.providers.celery.executors.default_celery import DEFAULT_CELERY_CONFIG
return DEFAULT_CELERY_CONFIG

celery_configuration = DEFAULT_CELERY_CONFIG

@providers_configuration_loaded
def _get_celery_app() -> Celery:
"""Init providers before importing the configuration, so the _SECRET and _CMD options work."""
celery_app_name = conf.get("celery", "CELERY_APP_NAME")

return Celery(celery_app_name, config_source=celery_configuration)
return Celery(celery_app_name, config_source=get_celery_configuration())


app = _get_celery_app()
Expand Down
4 changes: 2 additions & 2 deletions providers/celery/tests/integration/celery/test_celery_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def _prepare_app(broker_url=None, execute=None):
execute_name = "execute_command"
execute = execute or celery_executor_utils.execute_command.__wrapped__

test_config = dict(celery_executor_utils.celery_configuration)
test_config = dict(celery_executor_utils.get_celery_configuration())
test_config.update({"broker_url": broker_url})
test_app = Celery(broker_url, config_source=test_config)
test_execute = test_app.task(execute)
Expand Down Expand Up @@ -168,7 +168,7 @@ def fake_execute_workload(command):
run_id="abc",
try_number=0,
priority_weight=1,
queue=celery_executor_utils.celery_configuration["task_default_queue"],
queue=celery_executor_utils.get_celery_configuration()["task_default_queue"],
executor_config=executor_config,
)
keys = [
Expand Down
2 changes: 1 addition & 1 deletion providers/celery/tests/unit/celery/executors/test_celery_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def _prepare_app(broker_url=None, execute=None):
execute_name = "execute_command"
execute = execute or celery_executor_utils.execute_command.__wrapped__

test_config = dict(celery_executor_utils.celery_configuration)
test_config = dict(celery_executor_utils.get_celery_configuration())
test_config.update({"broker_url": broker_url})
test_app = Celery(broker_url, config_source=test_config)
test_execute = test_app.task(execute)
Expand Down