') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Fix scheduler crash during 3.0 to 3.1 migration when retry_delay is None by dheerajturaga · Pull Request #56202 · apache/airflow · GitHub
Skip to content

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

Merged
kaxil merged 5 commits into
apache:mainfrom
dheerajturaga:bugfix/scheduler-crash-3_0-to-3_1
Sep 30, 2025
Merged

Fix scheduler crash during 3.0 to 3.1 migration when retry_delay is None#56202
kaxil merged 5 commits into
apache:mainfrom
dheerajturaga:bugfix/scheduler-crash-3_0-to-3_1

Conversation

@dheerajturaga

@dheerajturagadheerajturaga commented Sep 29, 2025•
edited
Loading

Copy link
Copy Markdown
Member

During migration from Airflow 3.0 to 3.1, some task instances may have
retry_delay set to None due to serialization/deserialization changes or
database migration issues. This causes the scheduler to crash with:

TypeError: unsupported operand type(s) for +: 'datetime.datetime' and 'NoneType'

The error occurs in TaskInstance.next_retry_datetime() when attempting to
add a None retry_delay to end_date.

Related: Airflow 3.0 to 3.1 migration compatibility

 File "/home/airflow/.local/lib/python3.12/site-packages/airflow/models/taskinstance.py", line 991, in next_retry_datetime
return self.end_date + delay
~~~~~~~~~~~~~~^~~~~~~ TypeError: unsupported operand type(s) for +: 'datetime.datetime' and 'NoneType'

@ashb

ashb commented Sep 29, 2025

Copy link
Copy Markdown
Member

cc @kaxil

@ashbashb added the affected_version:3.1 Issues Reported for 3.1 label Sep 29, 2025
@ashb
ashb requested a review from kaxilSeptember 29, 2025 12:49
@kaxil

kaxil commented Sep 29, 2025

Copy link
Copy Markdown
Member

@dheerajturaga Could you post steps to reproduce it, please?

kaxil
kaxil reviewed Sep 29, 2025
View reviewed changes
Comment threadairflow-core/src/airflow/models/taskinstance.py Outdated
@kaxilkaxil added this to the Airflow 3.1.1 milestone Sep 29, 2025
kaxil
kaxil reviewed Sep 29, 2025
View reviewed changes
Comment threadairflow-core/src/airflow/serialization/serialized_objects.py Outdated
@dheerajturaga
dheerajturagaforce-pushed the bugfix/scheduler-crash-3_0-to-3_1 branch from 11533cb to 3176369CompareSeptember 29, 2025 16:08
kaxil
kaxil reviewed Sep 29, 2025
View reviewed changes
Comment threadairflow-core/src/airflow/serialization/schema.json Outdated
@kaxil
kaxil merged commit 1f976d0 into apache:mainSep 30, 2025
108 checks passed
@dheerajturaga

dheerajturaga commented Sep 30, 2025

Copy link
Copy Markdown
MemberAuthor

@kaxil , Thanks for fixing the tests!

github-actionsBot pushed a commit that referenced this pull request Sep 30, 2025
@dheerajturaga@kaxilYour friendly bot
[v3-1-test] Fix scheduler crash during 3.0 to 3.1 migration when retr…
17407a2
…y_delay is None (#56202)
* Kaxil's suggestions
* make default a float because some tests are complaining
* Fix test
* fixup! Fix test
* fixup! fixup! Fix test
---------
(cherry picked from commit 1f976d0)
Co-authored-by: Dheeraj Turaga <dheerajturaga@gmail.com>
Co-authored-by: Kaxil Naik <kaxilnaik@gmail.com>
@github-actions

github-actionsBot commented Sep 30, 2025

Copy link
Copy Markdown
Contributor

Backport successfully created: v3-1-test

StatusBranchResult
✅v3-1-testPR Link

@dheerajturaga
dheerajturaga deleted the bugfix/scheduler-crash-3_0-to-3_1 branch September 30, 2025 02:33
github-actionsBot pushed a commit to aws-mwaa/upstream-to-airflow that referenced this pull request Sep 30, 2025
@dheerajturaga@kaxilYour friendly bot
[v3-1-test] Fix scheduler crash during 3.0 to 3.1 migration when retr…
5f6f25c
…y_delay is None (apache#56202)
* Kaxil's suggestions
* make default a float because some tests are complaining
* Fix test
* fixup! Fix test
* fixup! fixup! Fix test
---------
(cherry picked from commit 1f976d0)
Co-authored-by: Dheeraj Turaga <dheerajturaga@gmail.com>
Co-authored-by: Kaxil Naik <kaxilnaik@gmail.com>
kaxil added a commit that referenced this pull request Oct 1, 2025
@github-actions@dheerajturaga@kaxil
[v3-1-test] Fix scheduler crash during 3.0 to 3.1 migration when retr…
82b0f0b
…y_delay is None (#56202) (#56236)
---------
(cherry picked from commit 1f976d0)
Co-authored-by: Dheeraj Turaga <dheerajturaga@gmail.com>
Co-authored-by: Kaxil Naik <kaxilnaik@gmail.com>
dabla pushed a commit to dabla/airflow that referenced this pull request Oct 12, 2025
@dheerajturaga@kaxil@dabla
Fix scheduler crash during 3.0 to 3.1 migration when retry_delay is N…
d062dc3
…one (apache#56202)
* Kaxil's suggestions
* make default a float because some tests are complaining
* Fix test
* fixup! Fix test
* fixup! fixup! Fix test
---------
Co-authored-by: Kaxil Naik <kaxilnaik@gmail.com>
@potiukpotiuk mentioned this pull request Nov 8, 2025
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kaxilkaxilkaxil approved these changes
@XD-DENGXD-DENGAwaiting requested review from XD-DENG
@ashbashbAwaiting requested review from ashbashb is a code owner
@bolkedebruinbolkedebruinAwaiting requested review from bolkedebruinbolkedebruin is a code owner
@potiukpotiukAwaiting requested review from potiukpotiuk is a code owner
@gopidesupavangopidesupavanAwaiting requested review from gopidesupavangopidesupavan is a code owner

Assignees

No one assigned

Labels

affected_version:3.1Issues Reported for 3.1

Projects

None yet

Milestone

Airflow 3.1.1

Development

Successfully merging this pull request may close these issues.

3 participants

@dheerajturaga@ashb@kaxil