Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Deferrable stuck as "scheduled" during backfill #26205

Merged
merged 3 commits into from Sep 23, 2022
Merged

Fix Deferrable stuck as "scheduled" during backfill #26205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eea53ca
Fix Deferrable Operators get stuck as "scheduled" during backfill
ephraimbuddy Sep 7, 2022
c681ffd
Taskinstance can be deferred by the trigger, we should do nothing
ephraimbuddy Sep 8, 2022
4383ff6
Update airflow/jobs/backfill_job.py
ephraimbuddy Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions airflow/jobs/backfill_job.py
View file
Open in desktop
Expand Up @@ -217,6 +217,12 @@ def _update_counters(self, ti_status, session=None):
tis_to_be_scheduled.append(ti)
ti_status.running.pop(reduced_key)
ti_status.to_run[ti.key] = ti
# special case: Deferrable task can go from DEFERRED to SCHEDULED;
# when that happens, we need to put it back as in UP_FOR_RESCHEDULE
elif ti.state == TaskInstanceState.SCHEDULED:
self.log.debug("Task instance %s is resumed from deferred state", ti)
ti_status.running.pop(ti.key)
ti_status.to_run[ti.key] = ti

# Batch schedule of task instances
if tis_to_be_scheduled:
Expand Down
24 changes: 24 additions & 0 deletions tests/jobs/test_backfill_job.py
View file
Open in desktop
Expand Up @@ -1415,6 +1415,30 @@ def test_update_counters(self, dag_maker, session):

ti_status.to_run.clear()

# test for scheduled
ti.set_state(State.SCHEDULED)
# Deferred tasks are put into scheduled by the triggerer
# Check that they are put into to_run
ti_status.running[ti.key] = ti
job._update_counters(ti_status=ti_status, session=session)
assert len(ti_status.running) == 0
assert len(ti_status.succeeded) == 0
assert len(ti_status.skipped) == 0
assert len(ti_status.failed) == 0
assert len(ti_status.to_run) == 1

ti_status.to_run.clear()
# test for deferred
# if a task is deferred and it's not yet time for the triggerer
# to reschedule it, we should leave it in ti_status.running
ti.set_state(State.DEFERRED)
ti_status.running[ti.key] = ti
job._update_counters(ti_status=ti_status, session=session)
assert len(ti_status.running) == 1
assert len(ti_status.succeeded) == 0
assert len(ti_status.skipped) == 0
assert len(ti_status.failed) == 0
assert len(ti_status.to_run) == 0
session.close()

def test_dag_dagrun_infos_between(self, dag_maker):
Expand Down