fix: handle concurrent XCom writes with savepoint + UPDATE fallback to avoid 409#69959
Open
nagasrisai wants to merge 4 commits into
Open
fix: handle concurrent XCom writes with savepoint + UPDATE fallback to avoid 409#69959nagasrisai wants to merge 4 commits into
nagasrisai wants to merge 4 commits into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #69956
Summary
When two task runners (concurrent execution or task retry) write the same XCom key at roughly the same time, both call
XComModel.setwhich does a DELETE followed by an INSERT. Both DELETEs succeed (they each see the record that was just written by the peer or see nothing), then both try to INSERT the same primary key. The second INSERT hits the unique constraint and the Execution API converts theIntegrityErrorto an HTTP 409, causing the task to fail.Fix
Wrap the
XComModel.setcall in a savepoint (session.begin_nested()) so that a constraint violation only rolls back the XCom write and not any earlier work in the same request (e.g. thetask_mapmerge). TheIntegrityErroris caught and handled with an explicit UPDATE that overwrites the existing entry with the latest value, which is the correct semantic for a retry.Changes
airflow-core/src/airflow/api_fastapi/execution_api/routes/xcoms.pyupdateto thesqlalchemyimportIntegrityErrorimport fromsqlalchemy.excXComModel.setinsession.begin_nested()and catchIntegrityErrorwith an UPDATE fallback