jedcunningham commented on code in PR #31151:
URL: https://github.com/apache/airflow/pull/31151#discussion_r1188705142
##########
airflow/models/trigger.py:
##########
@@ -220,16 +220,24 @@ def assign_unassigned(cls, triggerer_id, capacity,
session: Session = NEW_SESSIO
# Find triggers who do NOT have an alive triggerer_id, and then assign
# up to `capacity` of those to us.
+ trigger_ids_query = cls.get_sorted_triggers(
+ capacity=capacity, alive_triggerer_ids=alive_triggerer_ids,
session=session
+ )
+ if trigger_ids_query:
+ session.query(cls).filter(cls.id.in_([i.id for i in
trigger_ids_query])).update(
+ {cls.triggerer_id: triggerer_id},
+ synchronize_session=False,
+ )
+ session.commit()
+
+ @classmethod
+ def get_sorted_triggers(cls, capacity, alive_triggerer_ids, session):
trigger_ids_query = with_row_locks(
Review Comment:
```suggestion
return with_row_locks(
```
##########
tests/models/test_trigger.py:
##########
@@ -184,3 +185,34 @@ def test_assign_unassigned(session, create_task_instance):
session.query(Trigger).filter(Trigger.id ==
trigger_on_healthy_triggerer.id).one().triggerer_id
== healthy_triggerer.id
)
+
+
+def test_get_sorted_triggers(session, create_task_instance):
+ """
+ Tests that triggers are sorted by the creation_date.
+ """
+ trigger_old = Trigger(
+ classpath="airflow.triggers.testing.SuccessTrigger",
+ kwargs={},
+ created_date=datetime.datetime(
+ 2023, 5, 9, 12, 16, 14, 474415,
tzinfo=pytz.timezone("Africa/Abidjan")
+ ),
+ )
+ trigger_old.id = 1
+ trigger_new = Trigger(
+ classpath="airflow.triggers.testing.SuccessTrigger",
+ kwargs={},
+ created_date=datetime.datetime(
+ 2023, 5, 9, 12, 17, 14, 474415,
tzinfo=pytz.timezone("Africa/Abidjan")
+ ),
+ )
+ trigger_new.id = 2
+ session.add(trigger_old)
+ session.add(trigger_new)
+ session.commit()
+ assert session.query(Trigger).count() == 2
+
+ trigger_ids_query = Trigger.get_sorted_triggers(capacity=100,
alive_triggerer_ids=[], session=session)
+ session.expire_all()
Review Comment:
Do we need this?
##########
airflow/models/trigger.py:
##########
@@ -220,16 +220,24 @@ def assign_unassigned(cls, triggerer_id, capacity,
session: Session = NEW_SESSIO
# Find triggers who do NOT have an alive triggerer_id, and then assign
# up to `capacity` of those to us.
+ trigger_ids_query = cls.get_sorted_triggers(
+ capacity=capacity, alive_triggerer_ids=alive_triggerer_ids,
session=session
+ )
+ if trigger_ids_query:
+ session.query(cls).filter(cls.id.in_([i.id for i in
trigger_ids_query])).update(
+ {cls.triggerer_id: triggerer_id},
+ synchronize_session=False,
+ )
+ session.commit()
+
+ @classmethod
+ def get_sorted_triggers(cls, capacity, alive_triggerer_ids, session):
trigger_ids_query = with_row_locks(
session.query(cls.id)
.filter(or_(cls.triggerer_id.is_(None),
cls.triggerer_id.notin_(alive_triggerer_ids)))
+ .order_by(cls.created_date)
.limit(capacity),
session,
skip_locked=True,
).all()
- if trigger_ids_query:
- session.query(cls).filter(cls.id.in_([i.id for i in
trigger_ids_query])).update(
- {cls.triggerer_id: triggerer_id},
- synchronize_session=False,
- )
- session.commit()
+ return trigger_ids_query
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
