Skip to content

Fix Redis import race condition in Celery executor #61362

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
shahar1 merged 2 commits into from
Feb 10, 2026
+17 −0
Merged

Fix Redis import race condition in Celery executor #61362

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd094d7
Fix Redis import race condition in Celery executor
avolant Feb 2, 2026
4b0df79
tests(celery): Remove tests
avolant Feb 4, 2026
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
17 changes: 17 additions & 0 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 @@ -340,6 +340,16 @@ def send_task_to_executor(
# Get the task from the app
task_to_run = celery_app.tasks["execute_command"]
args = [args] # type: ignore[list-item]

# Pre-import redis.client to avoid SIGALRM interrupting module initialization.
# If timeout fires during import, redis module gets partially cached in sys.modules
# without the 'client' submodule bound, causing AttributeError on subsequent access.
# See: https://github.com/apache/airflow/issues/41359
try:
import redis.client # noqa: F401
except ImportError:
pass # Redis not installed or not using Redis backend

try:
with timeout(seconds=OPERATION_TIMEOUT):
result = task_to_run.apply_async(args=args, queue=queue)
Expand All @@ -363,6 +373,13 @@ def fetch_celery_task_state(async_result: AsyncResult) -> tuple[str, str | Excep
:return: a tuple of the Celery task key and the Celery state and the celery info
of the task
"""
# Pre-import redis.client to avoid SIGALRM interrupting module initialization.
# See: https://github.com/apache/airflow/issues/41359
try:
import redis.client # noqa: F401
except ImportError:
pass # Redis not installed or not using Redis backend

try:
with timeout(seconds=OPERATION_TIMEOUT):
# Accessing state property of celery task will make actual network request
Expand Down