Skip to content

Add row lock to ADRQ before Dag run creation - #60773

Merged
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr
Mar 17, 2026
Merged

Add row lock to ADRQ before Dag run creation#60773
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr

Conversation

@Lee-W

@Lee-WLee-W commented Jan 19, 2026

Copy link
Copy Markdown
Member

closes: #63507

Why

2 or more different schedulers might read the same set of ADRQs and attempt to create more then 1 Dag run while only the first scheduler should create one

What

Add row_ock to ADRQ before Dag run creation


Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

@Lee-WLee-W changed the title Lock adprAdd row lock to ADRQJan 19, 2026
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from daebc01 to 5b93f53CompareFebruary 5, 2026 14:08
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 2 times, most recently from 2606938 to 4abdc74CompareMarch 2, 2026 03:23
@Lee-WLee-W changed the title Add row lock to ADRQAdd row lock to ADRQ before Dag run creationMar 2, 2026
@Lee-W
Lee-W marked this pull request as ready for review March 2, 2026 03:25
@Lee-W
Lee-W requested review from XD-DENG and ashb as code ownersMarch 2, 2026 03:25
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from 2ffff9e to 5df556cCompareMarch 3, 2026 11:35
@Lee-W

Lee-W commented Mar 3, 2026

Copy link
Copy Markdown
MemberAuthor

would be nice if we can make it part of 3.1.8

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 5 times, most recently from e2873dc to b96509aCompareMarch 9, 2026 08:58
@Lee-W
Lee-W marked this pull request as draft March 9, 2026 09:02
@Lee-W
Lee-W marked this pull request as ready for review March 10, 2026 13:39
@Lee-WLee-W added this to the Airflow 3.1.9 milestone Mar 11, 2026

@potiukpotiuk left a comment

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.

LGTM - but I will defer to @uranusjr !

Nice catch!

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated

@jason810496jason810496 left a comment

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.

Thanks!

@Lee-W
Lee-W merged commit b3055d7 into apache:mainMar 17, 2026
75 checks passed
@Lee-W
Lee-W deleted the lock-adpr branch March 17, 2026 03:35
@github-actions

Copy link
Copy Markdown
Contributor

Backport failed to create: v3-1-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

StatusBranchResult
v3-1-testCommit Link

You can attempt to backport this manually by running:

cherry_picker b3055d7 v3-1-test

This should apply the commit to the v3-1-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
fat-catTW pushed a commit to fat-catTW/airflow that referenced this pull request Mar 22, 2026
jason810496 pushed a commit that referenced this pull request Mar 23, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
@hussein-awala

Copy link
Copy Markdown
Member

I encountered this exact race condition in production on 3.1.7 — two schedulers both read the ADRQ before either committed, resulting in duplicate asset-triggered DagRuns with the same run_after timestamp. Independently traced it to the missing row lock on ADRQ in _create_dag_runs_asset_triggered. Thanks for the fix!

vatsrahul1001 pushed a commit that referenced this pull request Mar 25, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
abhijeets25012-tech pushed a commit to abhijeets25012-tech/airflow that referenced this pull request Apr 9, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate DAG runs for asset-triggered scheduling with multiple schedulers (HA)

5 participants

@Lee-W@hussein-awala@potiuk@uranusjr@jason810496
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add row lock to ADRQ before Dag run creation by Lee-W · Pull Request #60773 · apache/airflow · GitHub
Skip to content

Add row lock to ADRQ before Dag run creation - #60773

Merged
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr
Mar 17, 2026
Merged

Add row lock to ADRQ before Dag run creation#60773
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr

Conversation

@Lee-W

@Lee-WLee-W commented Jan 19, 2026

Copy link
Copy Markdown
Member

closes: #63507

Why

2 or more different schedulers might read the same set of ADRQs and attempt to create more then 1 Dag run while only the first scheduler should create one

What

Add row_ock to ADRQ before Dag run creation


Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

@Lee-WLee-W changed the title Lock adprAdd row lock to ADRQJan 19, 2026
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from daebc01 to 5b93f53CompareFebruary 5, 2026 14:08
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 2 times, most recently from 2606938 to 4abdc74CompareMarch 2, 2026 03:23
@Lee-WLee-W changed the title Add row lock to ADRQAdd row lock to ADRQ before Dag run creationMar 2, 2026
@Lee-W
Lee-W marked this pull request as ready for review March 2, 2026 03:25
@Lee-W
Lee-W requested review from XD-DENG and ashb as code ownersMarch 2, 2026 03:25
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from 2ffff9e to 5df556cCompareMarch 3, 2026 11:35
@Lee-W

Lee-W commented Mar 3, 2026

Copy link
Copy Markdown
MemberAuthor

would be nice if we can make it part of 3.1.8

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 5 times, most recently from e2873dc to b96509aCompareMarch 9, 2026 08:58
@Lee-W
Lee-W marked this pull request as draft March 9, 2026 09:02
@Lee-W
Lee-W marked this pull request as ready for review March 10, 2026 13:39
@Lee-WLee-W added this to the Airflow 3.1.9 milestone Mar 11, 2026

@potiukpotiuk left a comment

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.

LGTM - but I will defer to @uranusjr !

Nice catch!

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated

@jason810496jason810496 left a comment

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.

Thanks!

@Lee-W
Lee-W merged commit b3055d7 into apache:mainMar 17, 2026
75 checks passed
@Lee-W
Lee-W deleted the lock-adpr branch March 17, 2026 03:35
@github-actions

Copy link
Copy Markdown
Contributor

Backport failed to create: v3-1-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

StatusBranchResult
v3-1-testCommit Link

You can attempt to backport this manually by running:

cherry_picker b3055d7 v3-1-test

This should apply the commit to the v3-1-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
fat-catTW pushed a commit to fat-catTW/airflow that referenced this pull request Mar 22, 2026
jason810496 pushed a commit that referenced this pull request Mar 23, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
@hussein-awala

Copy link
Copy Markdown
Member

I encountered this exact race condition in production on 3.1.7 — two schedulers both read the ADRQ before either committed, resulting in duplicate asset-triggered DagRuns with the same run_after timestamp. Independently traced it to the missing row lock on ADRQ in _create_dag_runs_asset_triggered. Thanks for the fix!

vatsrahul1001 pushed a commit that referenced this pull request Mar 25, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
abhijeets25012-tech pushed a commit to abhijeets25012-tech/airflow that referenced this pull request Apr 9, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate DAG runs for asset-triggered scheduling with multiple schedulers (HA)

5 participants

@Lee-W@hussein-awala@potiuk@uranusjr@jason810496
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add row lock to ADRQ before Dag run creation by Lee-W · Pull Request #60773 · apache/airflow · GitHub
Skip to content

Add row lock to ADRQ before Dag run creation - #60773

Merged
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr
Mar 17, 2026
Merged

Add row lock to ADRQ before Dag run creation#60773
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr

Conversation

@Lee-W

@Lee-WLee-W commented Jan 19, 2026

Copy link
Copy Markdown
Member

closes: #63507

Why

2 or more different schedulers might read the same set of ADRQs and attempt to create more then 1 Dag run while only the first scheduler should create one

What

Add row_ock to ADRQ before Dag run creation


Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

@Lee-WLee-W changed the title Lock adprAdd row lock to ADRQJan 19, 2026
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from daebc01 to 5b93f53CompareFebruary 5, 2026 14:08
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 2 times, most recently from 2606938 to 4abdc74CompareMarch 2, 2026 03:23
@Lee-WLee-W changed the title Add row lock to ADRQAdd row lock to ADRQ before Dag run creationMar 2, 2026
@Lee-W
Lee-W marked this pull request as ready for review March 2, 2026 03:25
@Lee-W
Lee-W requested review from XD-DENG and ashb as code ownersMarch 2, 2026 03:25
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from 2ffff9e to 5df556cCompareMarch 3, 2026 11:35
@Lee-W

Lee-W commented Mar 3, 2026

Copy link
Copy Markdown
MemberAuthor

would be nice if we can make it part of 3.1.8

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 5 times, most recently from e2873dc to b96509aCompareMarch 9, 2026 08:58
@Lee-W
Lee-W marked this pull request as draft March 9, 2026 09:02
@Lee-W
Lee-W marked this pull request as ready for review March 10, 2026 13:39
@Lee-WLee-W added this to the Airflow 3.1.9 milestone Mar 11, 2026

@potiukpotiuk left a comment

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.

LGTM - but I will defer to @uranusjr !

Nice catch!

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated

@jason810496jason810496 left a comment

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.

Thanks!

@Lee-W
Lee-W merged commit b3055d7 into apache:mainMar 17, 2026
75 checks passed
@Lee-W
Lee-W deleted the lock-adpr branch March 17, 2026 03:35
@github-actions

Copy link
Copy Markdown
Contributor

Backport failed to create: v3-1-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

StatusBranchResult
v3-1-testCommit Link

You can attempt to backport this manually by running:

cherry_picker b3055d7 v3-1-test

This should apply the commit to the v3-1-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
fat-catTW pushed a commit to fat-catTW/airflow that referenced this pull request Mar 22, 2026
jason810496 pushed a commit that referenced this pull request Mar 23, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
@hussein-awala

Copy link
Copy Markdown
Member

I encountered this exact race condition in production on 3.1.7 — two schedulers both read the ADRQ before either committed, resulting in duplicate asset-triggered DagRuns with the same run_after timestamp. Independently traced it to the missing row lock on ADRQ in _create_dag_runs_asset_triggered. Thanks for the fix!

vatsrahul1001 pushed a commit that referenced this pull request Mar 25, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
abhijeets25012-tech pushed a commit to abhijeets25012-tech/airflow that referenced this pull request Apr 9, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate DAG runs for asset-triggered scheduling with multiple schedulers (HA)

5 participants

@Lee-W@hussein-awala@potiuk@uranusjr@jason810496
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', '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('^' + ".*" + ' Add row lock to ADRQ before Dag run creation by Lee-W · Pull Request #60773 · apache/airflow · GitHub
Skip to content

Add row lock to ADRQ before Dag run creation - #60773

Merged
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr
Mar 17, 2026
Merged

Add row lock to ADRQ before Dag run creation#60773
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr

Conversation

@Lee-W

@Lee-WLee-W commented Jan 19, 2026

Copy link
Copy Markdown
Member

closes: #63507

Why

2 or more different schedulers might read the same set of ADRQs and attempt to create more then 1 Dag run while only the first scheduler should create one

What

Add row_ock to ADRQ before Dag run creation


Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

@Lee-WLee-W changed the title Lock adprAdd row lock to ADRQJan 19, 2026
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from daebc01 to 5b93f53CompareFebruary 5, 2026 14:08
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 2 times, most recently from 2606938 to 4abdc74CompareMarch 2, 2026 03:23
@Lee-WLee-W changed the title Add row lock to ADRQAdd row lock to ADRQ before Dag run creationMar 2, 2026
@Lee-W
Lee-W marked this pull request as ready for review March 2, 2026 03:25
@Lee-W
Lee-W requested review from XD-DENG and ashb as code ownersMarch 2, 2026 03:25
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from 2ffff9e to 5df556cCompareMarch 3, 2026 11:35
@Lee-W

Lee-W commented Mar 3, 2026

Copy link
Copy Markdown
MemberAuthor

would be nice if we can make it part of 3.1.8

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 5 times, most recently from e2873dc to b96509aCompareMarch 9, 2026 08:58
@Lee-W
Lee-W marked this pull request as draft March 9, 2026 09:02
@Lee-W
Lee-W marked this pull request as ready for review March 10, 2026 13:39
@Lee-WLee-W added this to the Airflow 3.1.9 milestone Mar 11, 2026

@potiukpotiuk left a comment

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.

LGTM - but I will defer to @uranusjr !

Nice catch!

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated

@jason810496jason810496 left a comment

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.

Thanks!

@Lee-W
Lee-W merged commit b3055d7 into apache:mainMar 17, 2026
75 checks passed
@Lee-W
Lee-W deleted the lock-adpr branch March 17, 2026 03:35
@github-actions

Copy link
Copy Markdown
Contributor

Backport failed to create: v3-1-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

StatusBranchResult
v3-1-testCommit Link

You can attempt to backport this manually by running:

cherry_picker b3055d7 v3-1-test

This should apply the commit to the v3-1-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
fat-catTW pushed a commit to fat-catTW/airflow that referenced this pull request Mar 22, 2026
jason810496 pushed a commit that referenced this pull request Mar 23, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
@hussein-awala

Copy link
Copy Markdown
Member

I encountered this exact race condition in production on 3.1.7 — two schedulers both read the ADRQ before either committed, resulting in duplicate asset-triggered DagRuns with the same run_after timestamp. Independently traced it to the missing row lock on ADRQ in _create_dag_runs_asset_triggered. Thanks for the fix!

vatsrahul1001 pushed a commit that referenced this pull request Mar 25, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
abhijeets25012-tech pushed a commit to abhijeets25012-tech/airflow that referenced this pull request Apr 9, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate DAG runs for asset-triggered scheduling with multiple schedulers (HA)

5 participants

@Lee-W@hussein-awala@potiuk@uranusjr@jason810496
, '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" + ' Add row lock to ADRQ before Dag run creation by Lee-W · Pull Request #60773 · apache/airflow · GitHub
Skip to content

Add row lock to ADRQ before Dag run creation - #60773

Merged
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr
Mar 17, 2026
Merged

Add row lock to ADRQ before Dag run creation#60773
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr

Conversation

@Lee-W

@Lee-WLee-W commented Jan 19, 2026

Copy link
Copy Markdown
Member

closes: #63507

Why

2 or more different schedulers might read the same set of ADRQs and attempt to create more then 1 Dag run while only the first scheduler should create one

What

Add row_ock to ADRQ before Dag run creation


Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

@Lee-WLee-W changed the title Lock adprAdd row lock to ADRQJan 19, 2026
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from daebc01 to 5b93f53CompareFebruary 5, 2026 14:08
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 2 times, most recently from 2606938 to 4abdc74CompareMarch 2, 2026 03:23
@Lee-WLee-W changed the title Add row lock to ADRQAdd row lock to ADRQ before Dag run creationMar 2, 2026
@Lee-W
Lee-W marked this pull request as ready for review March 2, 2026 03:25
@Lee-W
Lee-W requested review from XD-DENG and ashb as code ownersMarch 2, 2026 03:25
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from 2ffff9e to 5df556cCompareMarch 3, 2026 11:35
@Lee-W

Lee-W commented Mar 3, 2026

Copy link
Copy Markdown
MemberAuthor

would be nice if we can make it part of 3.1.8

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 5 times, most recently from e2873dc to b96509aCompareMarch 9, 2026 08:58
@Lee-W
Lee-W marked this pull request as draft March 9, 2026 09:02
@Lee-W
Lee-W marked this pull request as ready for review March 10, 2026 13:39
@Lee-WLee-W added this to the Airflow 3.1.9 milestone Mar 11, 2026

@potiukpotiuk left a comment

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.

LGTM - but I will defer to @uranusjr !

Nice catch!

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated

@jason810496jason810496 left a comment

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.

Thanks!

@Lee-W
Lee-W merged commit b3055d7 into apache:mainMar 17, 2026
75 checks passed
@Lee-W
Lee-W deleted the lock-adpr branch March 17, 2026 03:35
@github-actions

Copy link
Copy Markdown
Contributor

Backport failed to create: v3-1-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

StatusBranchResult
v3-1-testCommit Link

You can attempt to backport this manually by running:

cherry_picker b3055d7 v3-1-test

This should apply the commit to the v3-1-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
fat-catTW pushed a commit to fat-catTW/airflow that referenced this pull request Mar 22, 2026
jason810496 pushed a commit that referenced this pull request Mar 23, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
@hussein-awala

Copy link
Copy Markdown
Member

I encountered this exact race condition in production on 3.1.7 — two schedulers both read the ADRQ before either committed, resulting in duplicate asset-triggered DagRuns with the same run_after timestamp. Independently traced it to the missing row lock on ADRQ in _create_dag_runs_asset_triggered. Thanks for the fix!

vatsrahul1001 pushed a commit that referenced this pull request Mar 25, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
abhijeets25012-tech pushed a commit to abhijeets25012-tech/airflow that referenced this pull request Apr 9, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate DAG runs for asset-triggered scheduling with multiple schedulers (HA)

5 participants

@Lee-W@hussein-awala@potiuk@uranusjr@jason810496
, '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('^' + ".*" + ' Add row lock to ADRQ before Dag run creation by Lee-W · Pull Request #60773 · apache/airflow · GitHub
Skip to content

Add row lock to ADRQ before Dag run creation - #60773

Merged
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr
Mar 17, 2026
Merged

Add row lock to ADRQ before Dag run creation#60773
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr

Conversation

@Lee-W

@Lee-WLee-W commented Jan 19, 2026

Copy link
Copy Markdown
Member

closes: #63507

Why

2 or more different schedulers might read the same set of ADRQs and attempt to create more then 1 Dag run while only the first scheduler should create one

What

Add row_ock to ADRQ before Dag run creation


Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

@Lee-WLee-W changed the title Lock adprAdd row lock to ADRQJan 19, 2026
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from daebc01 to 5b93f53CompareFebruary 5, 2026 14:08
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 2 times, most recently from 2606938 to 4abdc74CompareMarch 2, 2026 03:23
@Lee-WLee-W changed the title Add row lock to ADRQAdd row lock to ADRQ before Dag run creationMar 2, 2026
@Lee-W
Lee-W marked this pull request as ready for review March 2, 2026 03:25
@Lee-W
Lee-W requested review from XD-DENG and ashb as code ownersMarch 2, 2026 03:25
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from 2ffff9e to 5df556cCompareMarch 3, 2026 11:35
@Lee-W

Lee-W commented Mar 3, 2026

Copy link
Copy Markdown
MemberAuthor

would be nice if we can make it part of 3.1.8

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 5 times, most recently from e2873dc to b96509aCompareMarch 9, 2026 08:58
@Lee-W
Lee-W marked this pull request as draft March 9, 2026 09:02
@Lee-W
Lee-W marked this pull request as ready for review March 10, 2026 13:39
@Lee-WLee-W added this to the Airflow 3.1.9 milestone Mar 11, 2026

@potiukpotiuk left a comment

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.

LGTM - but I will defer to @uranusjr !

Nice catch!

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated

@jason810496jason810496 left a comment

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.

Thanks!

@Lee-W
Lee-W merged commit b3055d7 into apache:mainMar 17, 2026
75 checks passed
@Lee-W
Lee-W deleted the lock-adpr branch March 17, 2026 03:35
@github-actions

Copy link
Copy Markdown
Contributor

Backport failed to create: v3-1-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

StatusBranchResult
v3-1-testCommit Link

You can attempt to backport this manually by running:

cherry_picker b3055d7 v3-1-test

This should apply the commit to the v3-1-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
fat-catTW pushed a commit to fat-catTW/airflow that referenced this pull request Mar 22, 2026
jason810496 pushed a commit that referenced this pull request Mar 23, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
@hussein-awala

Copy link
Copy Markdown
Member

I encountered this exact race condition in production on 3.1.7 — two schedulers both read the ADRQ before either committed, resulting in duplicate asset-triggered DagRuns with the same run_after timestamp. Independently traced it to the missing row lock on ADRQ in _create_dag_runs_asset_triggered. Thanks for the fix!

vatsrahul1001 pushed a commit that referenced this pull request Mar 25, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
abhijeets25012-tech pushed a commit to abhijeets25012-tech/airflow that referenced this pull request Apr 9, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate DAG runs for asset-triggered scheduling with multiple schedulers (HA)

5 participants

@Lee-W@hussein-awala@potiuk@uranusjr@jason810496
, '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); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add row lock to ADRQ before Dag run creation by Lee-W · Pull Request #60773 · apache/airflow · GitHub
Skip to content

Add row lock to ADRQ before Dag run creation - #60773

Merged
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr
Mar 17, 2026
Merged

Add row lock to ADRQ before Dag run creation#60773
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr

Conversation

@Lee-W

@Lee-WLee-W commented Jan 19, 2026

Copy link
Copy Markdown
Member

closes: #63507

Why

2 or more different schedulers might read the same set of ADRQs and attempt to create more then 1 Dag run while only the first scheduler should create one

What

Add row_ock to ADRQ before Dag run creation


Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

@Lee-WLee-W changed the title Lock adprAdd row lock to ADRQJan 19, 2026
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from daebc01 to 5b93f53CompareFebruary 5, 2026 14:08
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 2 times, most recently from 2606938 to 4abdc74CompareMarch 2, 2026 03:23
@Lee-WLee-W changed the title Add row lock to ADRQAdd row lock to ADRQ before Dag run creationMar 2, 2026
@Lee-W
Lee-W marked this pull request as ready for review March 2, 2026 03:25
@Lee-W
Lee-W requested review from XD-DENG and ashb as code ownersMarch 2, 2026 03:25
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from 2ffff9e to 5df556cCompareMarch 3, 2026 11:35
@Lee-W

Lee-W commented Mar 3, 2026

Copy link
Copy Markdown
MemberAuthor

would be nice if we can make it part of 3.1.8

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 5 times, most recently from e2873dc to b96509aCompareMarch 9, 2026 08:58
@Lee-W
Lee-W marked this pull request as draft March 9, 2026 09:02
@Lee-W
Lee-W marked this pull request as ready for review March 10, 2026 13:39
@Lee-WLee-W added this to the Airflow 3.1.9 milestone Mar 11, 2026

@potiukpotiuk left a comment

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.

LGTM - but I will defer to @uranusjr !

Nice catch!

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated

@jason810496jason810496 left a comment

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.

Thanks!

@Lee-W
Lee-W merged commit b3055d7 into apache:mainMar 17, 2026
75 checks passed
@Lee-W
Lee-W deleted the lock-adpr branch March 17, 2026 03:35
@github-actions

Copy link
Copy Markdown
Contributor

Backport failed to create: v3-1-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

StatusBranchResult
v3-1-testCommit Link

You can attempt to backport this manually by running:

cherry_picker b3055d7 v3-1-test

This should apply the commit to the v3-1-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
fat-catTW pushed a commit to fat-catTW/airflow that referenced this pull request Mar 22, 2026
jason810496 pushed a commit that referenced this pull request Mar 23, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
@hussein-awala

Copy link
Copy Markdown
Member

I encountered this exact race condition in production on 3.1.7 — two schedulers both read the ADRQ before either committed, resulting in duplicate asset-triggered DagRuns with the same run_after timestamp. Independently traced it to the missing row lock on ADRQ in _create_dag_runs_asset_triggered. Thanks for the fix!

vatsrahul1001 pushed a commit that referenced this pull request Mar 25, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
abhijeets25012-tech pushed a commit to abhijeets25012-tech/airflow that referenced this pull request Apr 9, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate DAG runs for asset-triggered scheduling with multiple schedulers (HA)

5 participants

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

Add row lock to ADRQ before Dag run creation - #60773

Merged
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr
Mar 17, 2026
Merged

Add row lock to ADRQ before Dag run creation#60773
Lee-W merged 6 commits into
apache:mainfrom
astronomer:lock-adpr

Conversation

@Lee-W

@Lee-WLee-W commented Jan 19, 2026

Copy link
Copy Markdown
Member

closes: #63507

Why

2 or more different schedulers might read the same set of ADRQs and attempt to create more then 1 Dag run while only the first scheduler should create one

What

Add row_ock to ADRQ before Dag run creation


Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst or {issue_number}.significant.rst, in airflow-core/newsfragments.

@Lee-WLee-W changed the title Lock adprAdd row lock to ADRQJan 19, 2026
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from daebc01 to 5b93f53CompareFebruary 5, 2026 14:08
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 2 times, most recently from 2606938 to 4abdc74CompareMarch 2, 2026 03:23
@Lee-WLee-W changed the title Add row lock to ADRQAdd row lock to ADRQ before Dag run creationMar 2, 2026
@Lee-W
Lee-W marked this pull request as ready for review March 2, 2026 03:25
@Lee-W
Lee-W requested review from XD-DENG and ashb as code ownersMarch 2, 2026 03:25
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 3 times, most recently from 2ffff9e to 5df556cCompareMarch 3, 2026 11:35
@Lee-W

Lee-W commented Mar 3, 2026

Copy link
Copy Markdown
MemberAuthor

would be nice if we can make it part of 3.1.8

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
@Lee-W
Lee-Wforce-pushed the lock-adpr branch 5 times, most recently from e2873dc to b96509aCompareMarch 9, 2026 08:58
@Lee-W
Lee-W marked this pull request as draft March 9, 2026 09:02
@Lee-W
Lee-W marked this pull request as ready for review March 10, 2026 13:39
@Lee-WLee-W added this to the Airflow 3.1.9 milestone Mar 11, 2026

@potiukpotiuk left a comment

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.

LGTM - but I will defer to @uranusjr !

Nice catch!

Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated
Comment threadairflow-core/src/airflow/jobs/scheduler_job_runner.py Outdated

@jason810496jason810496 left a comment

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.

Thanks!

@Lee-W
Lee-W merged commit b3055d7 into apache:mainMar 17, 2026
75 checks passed
@Lee-W
Lee-W deleted the lock-adpr branch March 17, 2026 03:35
@github-actions

Copy link
Copy Markdown
Contributor

Backport failed to create: v3-1-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

StatusBranchResult
v3-1-testCommit Link

You can attempt to backport this manually by running:

cherry_picker b3055d7 v3-1-test

This should apply the commit to the v3-1-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
Lee-W added a commit to astronomer/airflow that referenced this pull request Mar 17, 2026
fat-catTW pushed a commit to fat-catTW/airflow that referenced this pull request Mar 22, 2026
jason810496 pushed a commit that referenced this pull request Mar 23, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
@hussein-awala

Copy link
Copy Markdown
Member

I encountered this exact race condition in production on 3.1.7 — two schedulers both read the ADRQ before either committed, resulting in duplicate asset-triggered DagRuns with the same run_after timestamp. Independently traced it to the missing row lock on ADRQ in _create_dag_runs_asset_triggered. Thanks for the fix!

vatsrahul1001 pushed a commit that referenced this pull request Mar 25, 2026
…3776)
* [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773)
(cherry picked from commit b3055d7)
Co-authored-by: Wei Lee <weilee.rx@gmail.com>
* fixup! [v3-1-test] Add row lock to ADRQ before Dag run creation (#60773) (cherry picked from commit b3055d7)
abhijeets25012-tech pushed a commit to abhijeets25012-tech/airflow that referenced this pull request Apr 9, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate DAG runs for asset-triggered scheduling with multiple schedulers (HA)

5 participants

@Lee-W@hussein-awala@potiuk@uranusjr@jason810496