SQLA2: avoid unnecessary locking when working with TIs - #59686

Merged
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update
Dec 22, 2025
Merged

SQLA2: avoid unnecessary locking when working with TIs#59686
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update

Conversation

@Dev-iL

Copy link
Copy Markdown
Collaborator

Related: #59218

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using with_for_update=True tells it to use the locked version.

All changes are backward-compatible with SQLAlchemy 1.4:

  • The with_for_update=True parameter exists in 1.4 and works correctly
  • Passing a string to TaskReschedule constructor works in both versions
  • Skipping fail_fast in edge cases doesn't affect normal operation

These changes fix the test_ti_update_state_reschedule_mysql_limit test which would otherwise time out:
image


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
@boring-cyborgboring-cyborgBot added the area:API Airflow's REST/HTTP API label Dec 21, 2025
@Dev-iL

Copy link
Copy Markdown
CollaboratorAuthor

Does anyone think this PR requires additional tags so more tests run?
cc: @potiuk@vincbeck

@potiuk

Copy link
Copy Markdown
Member

Nice

@potiuk
potiuk merged commit eb6844f into apache:mainDec 22, 2025
126 checks passed
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Jan 2, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
stegololz pushed a commit to stegololz/airflow that referenced this pull request Jan 9, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
jhgoebbert pushed a commit to jhgoebbert/airflow_Owen-CH-Leung that referenced this pull request Feb 8, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Mar 4, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Comment on lines -551 to -553
ti = session.get(TI, ti_id_str)
if ti is not None:
_handle_fail_fast_for_dag(ti=ti, dag_id=dag_id, session=session, dag_bag=dag_bag)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dev-iL Why was this silently dropped?

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly because it was not covered by tests and therefore unneeded

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not covered by test isn't a good reason to drop things

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So was this an intentional change or unintentional?

@Dev-iLDev-iLMay 21, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks unintentional 6mo later, but perhaps it was resolving some flakiness or inconsistency between sqla versions, or deemed unnecessary in light of the other changes.

The lack of coverage is not the motivation for the removal, but rather the reason it "succeeded".

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re the "silently" part - the PR description does say that

Skipping fail_fast in edge cases doesn't affect normal operation

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fail_fast is a feature that stopped working for reschedule cases.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skipping fail_fast in edge cases doesn't affect normal operation

That's completely wrong. Normal operation isn't things just working. fail_fast is a feature not an edge case!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will create a PR to restore that.

@Dev-iL
Dev-iL deleted the 2512/ti_with_for_update branch May 21, 2026 18:10
kaxil added a commit that referenced this pull request May 22, 2026
…mit (#67353)
PR #59686 dropped the _handle_fail_fast_for_dag call in the MySQL-TIMESTAMP-limit
branch of the reschedule path based on an incorrect SQLA2 deadlock concern. As a
result, DAGs with fail_fast=True silently fail to stop sibling tasks when a
reschedule date exceeds 2038-01-19 on MySQL.
The actual deadlock that motivated #59686 came from a different path (FOR UPDATE
expanding to the lazy-joined dag_run row), fixed in #67246 by scoping the lock
with with_for_update={"of": TI}. With that scope in place, the fail-fast call is
safe and matches the file's two existing fail-fast sites.
Also drops a second misleading comment in the same function claiming session.get
was avoided to "avoid SQLA2 lock contention issues" -- the code itself is fine;
the rationale was wrong.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:APIAirflow's REST/HTTP API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Dev-iL@potiuk@kaxil
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

SQLA2: avoid unnecessary locking when working with TIs - #59686

Merged
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update
Dec 22, 2025
Merged

SQLA2: avoid unnecessary locking when working with TIs#59686
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update

Conversation

@Dev-iL

Copy link
Copy Markdown
Collaborator

Related: #59218

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using with_for_update=True tells it to use the locked version.

All changes are backward-compatible with SQLAlchemy 1.4:

  • The with_for_update=True parameter exists in 1.4 and works correctly
  • Passing a string to TaskReschedule constructor works in both versions
  • Skipping fail_fast in edge cases doesn't affect normal operation

These changes fix the test_ti_update_state_reschedule_mysql_limit test which would otherwise time out:
image


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
@boring-cyborgboring-cyborgBot added the area:API Airflow's REST/HTTP API label Dec 21, 2025
@Dev-iL

Copy link
Copy Markdown
CollaboratorAuthor

Does anyone think this PR requires additional tags so more tests run?
cc: @potiuk@vincbeck

@potiuk

Copy link
Copy Markdown
Member

Nice

@potiuk
potiuk merged commit eb6844f into apache:mainDec 22, 2025
126 checks passed
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Jan 2, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
stegololz pushed a commit to stegololz/airflow that referenced this pull request Jan 9, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
jhgoebbert pushed a commit to jhgoebbert/airflow_Owen-CH-Leung that referenced this pull request Feb 8, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Mar 4, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Comment on lines -551 to -553
ti = session.get(TI, ti_id_str)
if ti is not None:
_handle_fail_fast_for_dag(ti=ti, dag_id=dag_id, session=session, dag_bag=dag_bag)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dev-iL Why was this silently dropped?

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly because it was not covered by tests and therefore unneeded

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not covered by test isn't a good reason to drop things

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So was this an intentional change or unintentional?

@Dev-iLDev-iLMay 21, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks unintentional 6mo later, but perhaps it was resolving some flakiness or inconsistency between sqla versions, or deemed unnecessary in light of the other changes.

The lack of coverage is not the motivation for the removal, but rather the reason it "succeeded".

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re the "silently" part - the PR description does say that

Skipping fail_fast in edge cases doesn't affect normal operation

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fail_fast is a feature that stopped working for reschedule cases.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skipping fail_fast in edge cases doesn't affect normal operation

That's completely wrong. Normal operation isn't things just working. fail_fast is a feature not an edge case!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will create a PR to restore that.

@Dev-iL
Dev-iL deleted the 2512/ti_with_for_update branch May 21, 2026 18:10
kaxil added a commit that referenced this pull request May 22, 2026
…mit (#67353)
PR #59686 dropped the _handle_fail_fast_for_dag call in the MySQL-TIMESTAMP-limit
branch of the reschedule path based on an incorrect SQLA2 deadlock concern. As a
result, DAGs with fail_fast=True silently fail to stop sibling tasks when a
reschedule date exceeds 2038-01-19 on MySQL.
The actual deadlock that motivated #59686 came from a different path (FOR UPDATE
expanding to the lazy-joined dag_run row), fixed in #67246 by scoping the lock
with with_for_update={"of": TI}. With that scope in place, the fail-fast call is
safe and matches the file's two existing fail-fast sites.
Also drops a second misleading comment in the same function claiming session.get
was avoided to "avoid SQLA2 lock contention issues" -- the code itself is fine;
the rationale was wrong.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:APIAirflow's REST/HTTP API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Dev-iL@potiuk@kaxil
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

SQLA2: avoid unnecessary locking when working with TIs - #59686

Merged
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update
Dec 22, 2025
Merged

SQLA2: avoid unnecessary locking when working with TIs#59686
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update

Conversation

@Dev-iL

Copy link
Copy Markdown
Collaborator

Related: #59218

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using with_for_update=True tells it to use the locked version.

All changes are backward-compatible with SQLAlchemy 1.4:

  • The with_for_update=True parameter exists in 1.4 and works correctly
  • Passing a string to TaskReschedule constructor works in both versions
  • Skipping fail_fast in edge cases doesn't affect normal operation

These changes fix the test_ti_update_state_reschedule_mysql_limit test which would otherwise time out:
image


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
@boring-cyborgboring-cyborgBot added the area:API Airflow's REST/HTTP API label Dec 21, 2025
@Dev-iL

Copy link
Copy Markdown
CollaboratorAuthor

Does anyone think this PR requires additional tags so more tests run?
cc: @potiuk@vincbeck

@potiuk

Copy link
Copy Markdown
Member

Nice

@potiuk
potiuk merged commit eb6844f into apache:mainDec 22, 2025
126 checks passed
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Jan 2, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
stegololz pushed a commit to stegololz/airflow that referenced this pull request Jan 9, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
jhgoebbert pushed a commit to jhgoebbert/airflow_Owen-CH-Leung that referenced this pull request Feb 8, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Mar 4, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Comment on lines -551 to -553
ti = session.get(TI, ti_id_str)
if ti is not None:
_handle_fail_fast_for_dag(ti=ti, dag_id=dag_id, session=session, dag_bag=dag_bag)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dev-iL Why was this silently dropped?

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly because it was not covered by tests and therefore unneeded

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not covered by test isn't a good reason to drop things

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So was this an intentional change or unintentional?

@Dev-iLDev-iLMay 21, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks unintentional 6mo later, but perhaps it was resolving some flakiness or inconsistency between sqla versions, or deemed unnecessary in light of the other changes.

The lack of coverage is not the motivation for the removal, but rather the reason it "succeeded".

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re the "silently" part - the PR description does say that

Skipping fail_fast in edge cases doesn't affect normal operation

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fail_fast is a feature that stopped working for reschedule cases.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skipping fail_fast in edge cases doesn't affect normal operation

That's completely wrong. Normal operation isn't things just working. fail_fast is a feature not an edge case!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will create a PR to restore that.

@Dev-iL
Dev-iL deleted the 2512/ti_with_for_update branch May 21, 2026 18:10
kaxil added a commit that referenced this pull request May 22, 2026
…mit (#67353)
PR #59686 dropped the _handle_fail_fast_for_dag call in the MySQL-TIMESTAMP-limit
branch of the reschedule path based on an incorrect SQLA2 deadlock concern. As a
result, DAGs with fail_fast=True silently fail to stop sibling tasks when a
reschedule date exceeds 2038-01-19 on MySQL.
The actual deadlock that motivated #59686 came from a different path (FOR UPDATE
expanding to the lazy-joined dag_run row), fixed in #67246 by scoping the lock
with with_for_update={"of": TI}. With that scope in place, the fail-fast call is
safe and matches the file's two existing fail-fast sites.
Also drops a second misleading comment in the same function claiming session.get
was avoided to "avoid SQLA2 lock contention issues" -- the code itself is fine;
the rationale was wrong.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:APIAirflow's REST/HTTP API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Dev-iL@potiuk@kaxil
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

SQLA2: avoid unnecessary locking when working with TIs - #59686

Merged
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update
Dec 22, 2025
Merged

SQLA2: avoid unnecessary locking when working with TIs#59686
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update

Conversation

@Dev-iL

Copy link
Copy Markdown
Collaborator

Related: #59218

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using with_for_update=True tells it to use the locked version.

All changes are backward-compatible with SQLAlchemy 1.4:

  • The with_for_update=True parameter exists in 1.4 and works correctly
  • Passing a string to TaskReschedule constructor works in both versions
  • Skipping fail_fast in edge cases doesn't affect normal operation

These changes fix the test_ti_update_state_reschedule_mysql_limit test which would otherwise time out:
image


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
@boring-cyborgboring-cyborgBot added the area:API Airflow's REST/HTTP API label Dec 21, 2025
@Dev-iL

Copy link
Copy Markdown
CollaboratorAuthor

Does anyone think this PR requires additional tags so more tests run?
cc: @potiuk@vincbeck

@potiuk

Copy link
Copy Markdown
Member

Nice

@potiuk
potiuk merged commit eb6844f into apache:mainDec 22, 2025
126 checks passed
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Jan 2, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
stegololz pushed a commit to stegololz/airflow that referenced this pull request Jan 9, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
jhgoebbert pushed a commit to jhgoebbert/airflow_Owen-CH-Leung that referenced this pull request Feb 8, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Mar 4, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Comment on lines -551 to -553
ti = session.get(TI, ti_id_str)
if ti is not None:
_handle_fail_fast_for_dag(ti=ti, dag_id=dag_id, session=session, dag_bag=dag_bag)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dev-iL Why was this silently dropped?

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly because it was not covered by tests and therefore unneeded

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not covered by test isn't a good reason to drop things

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So was this an intentional change or unintentional?

@Dev-iLDev-iLMay 21, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks unintentional 6mo later, but perhaps it was resolving some flakiness or inconsistency between sqla versions, or deemed unnecessary in light of the other changes.

The lack of coverage is not the motivation for the removal, but rather the reason it "succeeded".

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re the "silently" part - the PR description does say that

Skipping fail_fast in edge cases doesn't affect normal operation

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fail_fast is a feature that stopped working for reschedule cases.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skipping fail_fast in edge cases doesn't affect normal operation

That's completely wrong. Normal operation isn't things just working. fail_fast is a feature not an edge case!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will create a PR to restore that.

@Dev-iL
Dev-iL deleted the 2512/ti_with_for_update branch May 21, 2026 18:10
kaxil added a commit that referenced this pull request May 22, 2026
…mit (#67353)
PR #59686 dropped the _handle_fail_fast_for_dag call in the MySQL-TIMESTAMP-limit
branch of the reschedule path based on an incorrect SQLA2 deadlock concern. As a
result, DAGs with fail_fast=True silently fail to stop sibling tasks when a
reschedule date exceeds 2038-01-19 on MySQL.
The actual deadlock that motivated #59686 came from a different path (FOR UPDATE
expanding to the lazy-joined dag_run row), fixed in #67246 by scoping the lock
with with_for_update={"of": TI}. With that scope in place, the fail-fast call is
safe and matches the file's two existing fail-fast sites.
Also drops a second misleading comment in the same function claiming session.get
was avoided to "avoid SQLA2 lock contention issues" -- the code itself is fine;
the rationale was wrong.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:APIAirflow's REST/HTTP API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Dev-iL@potiuk@kaxil
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

SQLA2: avoid unnecessary locking when working with TIs - #59686

Merged
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update
Dec 22, 2025
Merged

SQLA2: avoid unnecessary locking when working with TIs#59686
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update

Conversation

@Dev-iL

Copy link
Copy Markdown
Collaborator

Related: #59218

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using with_for_update=True tells it to use the locked version.

All changes are backward-compatible with SQLAlchemy 1.4:

  • The with_for_update=True parameter exists in 1.4 and works correctly
  • Passing a string to TaskReschedule constructor works in both versions
  • Skipping fail_fast in edge cases doesn't affect normal operation

These changes fix the test_ti_update_state_reschedule_mysql_limit test which would otherwise time out:
image


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
@boring-cyborgboring-cyborgBot added the area:API Airflow's REST/HTTP API label Dec 21, 2025
@Dev-iL

Copy link
Copy Markdown
CollaboratorAuthor

Does anyone think this PR requires additional tags so more tests run?
cc: @potiuk@vincbeck

@potiuk

Copy link
Copy Markdown
Member

Nice

@potiuk
potiuk merged commit eb6844f into apache:mainDec 22, 2025
126 checks passed
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Jan 2, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
stegololz pushed a commit to stegololz/airflow that referenced this pull request Jan 9, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
jhgoebbert pushed a commit to jhgoebbert/airflow_Owen-CH-Leung that referenced this pull request Feb 8, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Mar 4, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Comment on lines -551 to -553
ti = session.get(TI, ti_id_str)
if ti is not None:
_handle_fail_fast_for_dag(ti=ti, dag_id=dag_id, session=session, dag_bag=dag_bag)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dev-iL Why was this silently dropped?

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly because it was not covered by tests and therefore unneeded

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not covered by test isn't a good reason to drop things

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So was this an intentional change or unintentional?

@Dev-iLDev-iLMay 21, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks unintentional 6mo later, but perhaps it was resolving some flakiness or inconsistency between sqla versions, or deemed unnecessary in light of the other changes.

The lack of coverage is not the motivation for the removal, but rather the reason it "succeeded".

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re the "silently" part - the PR description does say that

Skipping fail_fast in edge cases doesn't affect normal operation

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fail_fast is a feature that stopped working for reschedule cases.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skipping fail_fast in edge cases doesn't affect normal operation

That's completely wrong. Normal operation isn't things just working. fail_fast is a feature not an edge case!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will create a PR to restore that.

@Dev-iL
Dev-iL deleted the 2512/ti_with_for_update branch May 21, 2026 18:10
kaxil added a commit that referenced this pull request May 22, 2026
…mit (#67353)
PR #59686 dropped the _handle_fail_fast_for_dag call in the MySQL-TIMESTAMP-limit
branch of the reschedule path based on an incorrect SQLA2 deadlock concern. As a
result, DAGs with fail_fast=True silently fail to stop sibling tasks when a
reschedule date exceeds 2038-01-19 on MySQL.
The actual deadlock that motivated #59686 came from a different path (FOR UPDATE
expanding to the lazy-joined dag_run row), fixed in #67246 by scoping the lock
with with_for_update={"of": TI}. With that scope in place, the fail-fast call is
safe and matches the file's two existing fail-fast sites.
Also drops a second misleading comment in the same function claiming session.get
was avoided to "avoid SQLA2 lock contention issues" -- the code itself is fine;
the rationale was wrong.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:APIAirflow's REST/HTTP API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Dev-iL@potiuk@kaxil
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

SQLA2: avoid unnecessary locking when working with TIs - #59686

Merged
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update
Dec 22, 2025
Merged

SQLA2: avoid unnecessary locking when working with TIs#59686
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update

Conversation

@Dev-iL

Copy link
Copy Markdown
Collaborator

Related: #59218

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using with_for_update=True tells it to use the locked version.

All changes are backward-compatible with SQLAlchemy 1.4:

  • The with_for_update=True parameter exists in 1.4 and works correctly
  • Passing a string to TaskReschedule constructor works in both versions
  • Skipping fail_fast in edge cases doesn't affect normal operation

These changes fix the test_ti_update_state_reschedule_mysql_limit test which would otherwise time out:
image


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
@boring-cyborgboring-cyborgBot added the area:API Airflow's REST/HTTP API label Dec 21, 2025
@Dev-iL

Copy link
Copy Markdown
CollaboratorAuthor

Does anyone think this PR requires additional tags so more tests run?
cc: @potiuk@vincbeck

@potiuk

Copy link
Copy Markdown
Member

Nice

@potiuk
potiuk merged commit eb6844f into apache:mainDec 22, 2025
126 checks passed
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Jan 2, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
stegololz pushed a commit to stegololz/airflow that referenced this pull request Jan 9, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
jhgoebbert pushed a commit to jhgoebbert/airflow_Owen-CH-Leung that referenced this pull request Feb 8, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Mar 4, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Comment on lines -551 to -553
ti = session.get(TI, ti_id_str)
if ti is not None:
_handle_fail_fast_for_dag(ti=ti, dag_id=dag_id, session=session, dag_bag=dag_bag)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dev-iL Why was this silently dropped?

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly because it was not covered by tests and therefore unneeded

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not covered by test isn't a good reason to drop things

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So was this an intentional change or unintentional?

@Dev-iLDev-iLMay 21, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks unintentional 6mo later, but perhaps it was resolving some flakiness or inconsistency between sqla versions, or deemed unnecessary in light of the other changes.

The lack of coverage is not the motivation for the removal, but rather the reason it "succeeded".

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re the "silently" part - the PR description does say that

Skipping fail_fast in edge cases doesn't affect normal operation

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fail_fast is a feature that stopped working for reschedule cases.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skipping fail_fast in edge cases doesn't affect normal operation

That's completely wrong. Normal operation isn't things just working. fail_fast is a feature not an edge case!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will create a PR to restore that.

@Dev-iL
Dev-iL deleted the 2512/ti_with_for_update branch May 21, 2026 18:10
kaxil added a commit that referenced this pull request May 22, 2026
…mit (#67353)
PR #59686 dropped the _handle_fail_fast_for_dag call in the MySQL-TIMESTAMP-limit
branch of the reschedule path based on an incorrect SQLA2 deadlock concern. As a
result, DAGs with fail_fast=True silently fail to stop sibling tasks when a
reschedule date exceeds 2038-01-19 on MySQL.
The actual deadlock that motivated #59686 came from a different path (FOR UPDATE
expanding to the lazy-joined dag_run row), fixed in #67246 by scoping the lock
with with_for_update={"of": TI}. With that scope in place, the fail-fast call is
safe and matches the file's two existing fail-fast sites.
Also drops a second misleading comment in the same function claiming session.get
was avoided to "avoid SQLA2 lock contention issues" -- the code itself is fine;
the rationale was wrong.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:APIAirflow's REST/HTTP API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Dev-iL@potiuk@kaxil
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

SQLA2: avoid unnecessary locking when working with TIs - #59686

Merged
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update
Dec 22, 2025
Merged

SQLA2: avoid unnecessary locking when working with TIs#59686
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update

Conversation

@Dev-iL

Copy link
Copy Markdown
Collaborator

Related: #59218

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using with_for_update=True tells it to use the locked version.

All changes are backward-compatible with SQLAlchemy 1.4:

  • The with_for_update=True parameter exists in 1.4 and works correctly
  • Passing a string to TaskReschedule constructor works in both versions
  • Skipping fail_fast in edge cases doesn't affect normal operation

These changes fix the test_ti_update_state_reschedule_mysql_limit test which would otherwise time out:
image


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
@boring-cyborgboring-cyborgBot added the area:API Airflow's REST/HTTP API label Dec 21, 2025
@Dev-iL

Copy link
Copy Markdown
CollaboratorAuthor

Does anyone think this PR requires additional tags so more tests run?
cc: @potiuk@vincbeck

@potiuk

Copy link
Copy Markdown
Member

Nice

@potiuk
potiuk merged commit eb6844f into apache:mainDec 22, 2025
126 checks passed
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Jan 2, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
stegololz pushed a commit to stegololz/airflow that referenced this pull request Jan 9, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
jhgoebbert pushed a commit to jhgoebbert/airflow_Owen-CH-Leung that referenced this pull request Feb 8, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Mar 4, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Comment on lines -551 to -553
ti = session.get(TI, ti_id_str)
if ti is not None:
_handle_fail_fast_for_dag(ti=ti, dag_id=dag_id, session=session, dag_bag=dag_bag)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dev-iL Why was this silently dropped?

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly because it was not covered by tests and therefore unneeded

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not covered by test isn't a good reason to drop things

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So was this an intentional change or unintentional?

@Dev-iLDev-iLMay 21, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks unintentional 6mo later, but perhaps it was resolving some flakiness or inconsistency between sqla versions, or deemed unnecessary in light of the other changes.

The lack of coverage is not the motivation for the removal, but rather the reason it "succeeded".

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re the "silently" part - the PR description does say that

Skipping fail_fast in edge cases doesn't affect normal operation

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fail_fast is a feature that stopped working for reschedule cases.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skipping fail_fast in edge cases doesn't affect normal operation

That's completely wrong. Normal operation isn't things just working. fail_fast is a feature not an edge case!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will create a PR to restore that.

@Dev-iL
Dev-iL deleted the 2512/ti_with_for_update branch May 21, 2026 18:10
kaxil added a commit that referenced this pull request May 22, 2026
…mit (#67353)
PR #59686 dropped the _handle_fail_fast_for_dag call in the MySQL-TIMESTAMP-limit
branch of the reschedule path based on an incorrect SQLA2 deadlock concern. As a
result, DAGs with fail_fast=True silently fail to stop sibling tasks when a
reschedule date exceeds 2038-01-19 on MySQL.
The actual deadlock that motivated #59686 came from a different path (FOR UPDATE
expanding to the lazy-joined dag_run row), fixed in #67246 by scoping the lock
with with_for_update={"of": TI}. With that scope in place, the fail-fast call is
safe and matches the file's two existing fail-fast sites.
Also drops a second misleading comment in the same function claiming session.get
was avoided to "avoid SQLA2 lock contention issues" -- the code itself is fine;
the rationale was wrong.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:APIAirflow's REST/HTTP API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Dev-iL@potiuk@kaxil
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

SQLA2: avoid unnecessary locking when working with TIs - #59686

Merged
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update
Dec 22, 2025
Merged

SQLA2: avoid unnecessary locking when working with TIs#59686
potiuk merged 1 commit into
apache:mainfrom
Dev-iL:2512/ti_with_for_update

Conversation

@Dev-iL

Copy link
Copy Markdown
Collaborator

Related: #59218

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using with_for_update=True tells it to use the locked version.

All changes are backward-compatible with SQLAlchemy 1.4:

  • The with_for_update=True parameter exists in 1.4 and works correctly
  • Passing a string to TaskReschedule constructor works in both versions
  • Skipping fail_fast in edge cases doesn't affect normal operation

These changes fix the test_ti_update_state_reschedule_mysql_limit test which would otherwise time out:
image


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
@boring-cyborgboring-cyborgBot added the area:API Airflow's REST/HTTP API label Dec 21, 2025
@Dev-iL

Copy link
Copy Markdown
CollaboratorAuthor

Does anyone think this PR requires additional tags so more tests run?
cc: @potiuk@vincbeck

@potiuk

Copy link
Copy Markdown
Member

Nice

@potiuk
potiuk merged commit eb6844f into apache:mainDec 22, 2025
126 checks passed
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Jan 2, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
stegololz pushed a commit to stegololz/airflow that referenced this pull request Jan 9, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
jhgoebbert pushed a commit to jhgoebbert/airflow_Owen-CH-Leung that referenced this pull request Feb 8, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Subham-KRLX pushed a commit to Subham-KRLX/airflow that referenced this pull request Mar 4, 2026
In SQLAlchemy 2.0, we need to explicitly tell get() not to issue a new SELECT for an already-loaded object. Using `with_for_update=True` tells it to use the locked version.
Comment on lines -551 to -553
ti = session.get(TI, ti_id_str)
if ti is not None:
_handle_fail_fast_for_dag(ti=ti, dag_id=dag_id, session=session, dag_bag=dag_bag)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Dev-iL Why was this silently dropped?

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly because it was not covered by tests and therefore unneeded

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not covered by test isn't a good reason to drop things

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So was this an intentional change or unintentional?

@Dev-iLDev-iLMay 21, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks unintentional 6mo later, but perhaps it was resolving some flakiness or inconsistency between sqla versions, or deemed unnecessary in light of the other changes.

The lack of coverage is not the motivation for the removal, but rather the reason it "succeeded".

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re the "silently" part - the PR description does say that

Skipping fail_fast in edge cases doesn't affect normal operation

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fail_fast is a feature that stopped working for reschedule cases.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skipping fail_fast in edge cases doesn't affect normal operation

That's completely wrong. Normal operation isn't things just working. fail_fast is a feature not an edge case!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will create a PR to restore that.

@Dev-iL
Dev-iL deleted the 2512/ti_with_for_update branch May 21, 2026 18:10
kaxil added a commit that referenced this pull request May 22, 2026
…mit (#67353)
PR #59686 dropped the _handle_fail_fast_for_dag call in the MySQL-TIMESTAMP-limit
branch of the reschedule path based on an incorrect SQLA2 deadlock concern. As a
result, DAGs with fail_fast=True silently fail to stop sibling tasks when a
reschedule date exceeds 2038-01-19 on MySQL.
The actual deadlock that motivated #59686 came from a different path (FOR UPDATE
expanding to the lazy-joined dag_run row), fixed in #67246 by scoping the lock
with with_for_update={"of": TI}. With that scope in place, the fail-fast call is
safe and matches the file's two existing fail-fast sites.
Also drops a second misleading comment in the same function claiming session.get
was avoided to "avoid SQLA2 lock contention issues" -- the code itself is fine;
the rationale was wrong.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:APIAirflow's REST/HTTP API

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Dev-iL@potiuk@kaxil