Skip to content

Fix scheduler crash during 3.0 to 3.1 migration when retry_delay is None #56202

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
merged 5 commits into from
Sep 30, 2025
Merged

Fix scheduler crash during 3.0 to 3.1 migration when retry_delay is None #56202

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3176369
Kaxil's suggestions
dheerajturaga Sep 29, 2025
c044539
make default a float because some tests are complaining
dheerajturaga Sep 29, 2025
10c47c9
Fix test
kaxil Sep 29, 2025
f69f1ed
fixup! Fix test
kaxil Sep 30, 2025
ce352b8
fixup! fixup! Fix test
kaxil Sep 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
2 changes: 1 addition & 1 deletion airflow-core/src/airflow/serialization/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
"pool": { "type": "string", "default": "default_pool" },
"pool_slots": { "type": "number", "default": 1 },
"execution_timeout": { "$ref": "#/definitions/timedelta" },
"retry_delay": { "$ref": "#/definitions/timedelta" },
"retry_delay": { "$ref": "#/definitions/timedelta", "default": 300 },
"retry_exponential_backoff": { "type": "boolean", "default": false },
"max_retry_delay": { "$ref": "#/definitions/timedelta" },
"params": { "$ref": "#/definitions/params" },
Expand Down
2 changes: 1 addition & 1 deletion airflow-core/src/airflow/serialization/serialized_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,7 @@ class SerializedBaseOperator(DAGNode, BaseSerialization):

resources: dict[str, Any] | None = None
retries: int = 0
retry_delay: datetime.timedelta
retry_delay: datetime.timedelta = datetime.timedelta(seconds=300)
retry_exponential_backoff: bool = False
run_as_user: str | None = None

Expand Down
3 changes: 3 additions & 0 deletions scripts/in_container/run_schema_defaults_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

import json
import sys
from datetime import timedelta
from pathlib import Path
from typing import Any

Expand Down Expand Up @@ -80,6 +81,8 @@ def get_server_side_operator_defaults() -> dict[str, Any]:
if isinstance(default_value, (set, tuple)):
# Convert to list since schema.json is pure JSON
default_value = list(default_value)
elif isinstance(default_value, timedelta):
default_value = default_value.total_seconds()
server_defaults[field_name] = default_value

return server_defaults
Expand Down
Loading