This is an automated email from the ASF dual-hosted git repository.

kaxil pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 332649741ef Clean up triggers still referenced by task instances with 
no state (#76834)
332649741ef is described below

commit 332649741ef2e7b01ede260efff3059a3349c40a
Author: Manan Bhatt <[email protected]>
AuthorDate: Tue Nov 17 07:02:24 2026 +0530

    Clean up triggers still referenced by task instances with no state (#76834)
    
    A task instance cleared while deferred keeps its trigger_id with a NULL
    state, and Trigger.clean_unused skipped it because a NULL state never
    satisfies "state != deferred" in SQL. The trigger then stayed referenced
    forever, so the triggerer kept starting it and dropping every event.
---
 airflow-core/src/airflow/models/trigger.py     |  6 ++++--
 airflow-core/tests/unit/models/test_trigger.py | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/airflow-core/src/airflow/models/trigger.py 
b/airflow-core/src/airflow/models/trigger.py
index 8dd3ad35419..138b22b0bed 100644
--- a/airflow-core/src/airflow/models/trigger.py
+++ b/airflow-core/src/airflow/models/trigger.py
@@ -343,11 +343,13 @@ class Trigger(Base):
         if batch_size <= 0:
             raise ValueError("[triggerer] 
unreferenced_triggers_cleanup_batch_size must be at least 1")
 
-        # Update all task instances with trigger IDs that are not DEFERRED to 
remove them
+        # Update all task instances with trigger IDs that are not DEFERRED to 
remove them.
+        # A NULL state never satisfies ``!=`` in SQL, so match it explicitly. 
Clearing a task no longer
+        # leaves a NULL state with a ``trigger_id``, but rows written before 
3.4 can still have one.
         session.execute(
             update(TaskInstance)
             .where(
-                TaskInstance.state != TaskInstanceState.DEFERRED,
+                or_(TaskInstance.state.is_(None), TaskInstance.state != 
TaskInstanceState.DEFERRED),
                 TaskInstance.trigger_id.is_not(None),
             )
             .values(trigger_id=None)
diff --git a/airflow-core/tests/unit/models/test_trigger.py 
b/airflow-core/tests/unit/models/test_trigger.py
index 7908cc268c4..ccfcddadaf4 100644
--- a/airflow-core/tests/unit/models/test_trigger.py
+++ b/airflow-core/tests/unit/models/test_trigger.py
@@ -217,6 +217,28 @@ def test_clean_unused(session, dag_maker):
     assert {result.id for result in results} == expected_trigger_ids
 
 
+def 
test_clean_unused_releases_trigger_held_by_task_instance_without_state(session, 
dag_maker):
+    """A task instance with a NULL state is not waiting on its trigger, so the 
trigger must be cleaned."""
+    trigger = Trigger(classpath="airflow.triggers.testing.SuccessTrigger", 
kwargs={})
+    session.add(trigger)
+    session.flush()
+
+    with dag_maker(session=session):
+        EmptyOperator(task_id="cleared")
+
+    dr = dag_maker.create_dagrun(logical_date=timezone.utcnow())
+    (ti,) = dr.task_instances
+    ti.state = None
+    ti.trigger_id = trigger.id
+    session.commit()
+
+    Trigger.clean_unused()
+    session.expire_all()
+
+    assert session.scalar(select(func.count()).select_from(Trigger)) == 0
+    assert session.get(TaskInstance, ti.id).trigger_id is None
+
+
 @pytest.mark.parametrize("reference_type", ["task-instance", "asset-watcher", 
"callback"])
 def test_delete_unused_batch_rechecks_new_references(session, 
create_task_instance, reference_type):
     trigger = Trigger(classpath="airflow.triggers.testing.SuccessTrigger", 
kwargs={})

Reply via email to