@@ -352,6 +352,27 @@ def _update_dagrun_to_latest_version(
352352 session .flush ()
353353
354354
355+ def _pin_versionless_tis_to_run_version (dag_run : DagRun , dag_version_id : UUID , session : Session ) -> None :
356+ """
357+ Give the run's unfinished task instances a dag version if they have none.
358+
359+ Once the run is pinned the scheduler stops backfilling versions onto them, and one
360+ without a version is never enqueued.
361+ """
362+ session .execute (
363+ update (TaskInstance )
364+ .where (
365+ TaskInstance .dag_id == dag_run .dag_id ,
366+ TaskInstance .run_id == dag_run .run_id ,
367+ TaskInstance .dag_version_id .is_ (None ),
368+ # State.unfinished holds None, which SQL IN never matches.
369+ or_ (TaskInstance .state .is_ (None ), TaskInstance .state .in_ (State .unfinished )),
370+ )
371+ .values (dag_version_id = dag_version_id )
372+ .execution_options (synchronize_session = "evaluate" )
373+ )
374+
375+
355376def clear_task_instances (
356377 tis : list [TaskInstance ],
357378 session : Session ,
@@ -372,7 +393,9 @@ def clear_task_instances(
372393 :param session: current session
373394 :param dag_run_state: state to set finished DagRuns to.
374395 If set to False, DagRuns state will not be changed.
375- :param run_on_latest_version: whether to run on latest serialized DAG and Bundle version
396+ :param run_on_latest_version: whether to run on latest serialized DAG and Bundle version.
397+ A run with no version of its own uses the latest either way, since there is nothing
398+ else for it to run on; a task instance with no version joins its run's.
376399
377400 :meta private:
378401 """
@@ -396,7 +419,10 @@ def clear_task_instances(
396419 # the task is terminated and becomes eligible for retry.
397420 else :
398421 dr = ti .dag_run
399- if run_on_latest_version :
422+ # A run with no version of its own has nothing to re-run on but the latest, and the
423+ # run loop below moves it there.
424+ use_latest_version = run_on_latest_version or dr .created_dag_version_id is None
425+ if use_latest_version :
400426 ti_dag = scheduler_dagbag .get_latest_version_of_dag (ti .dag_id , session = session )
401427 else :
402428 ti_dag = scheduler_dagbag .get_dag_for_run (dag_run = dr , session = session )
@@ -418,11 +444,15 @@ def clear_task_instances(
418444 ti .state = None
419445 ti .external_executor_id = None
420446 ti .clear_next_method_args ()
421- # Match DagVersion to latest serialized DAG when run_on_latest_version .
422- if run_on_latest_version :
447+ # Match DagVersion to latest serialized DAG when running on the latest version .
448+ if use_latest_version :
423449 latest_dag_version = DagVersion .get_latest_version (ti .dag_id , session = session )
424450 if latest_dag_version is not None :
425451 ti .dag_version_id = latest_dag_version .id
452+ elif ti .dag_version_id is None :
453+ # One without a version is never enqueued, and the run keeps its own, so it can
454+ # only go there.
455+ ti .dag_version_id = dr .created_dag_version_id
426456 session .merge (ti )
427457
428458 if dag_run_state is not False and tis :
@@ -461,10 +491,14 @@ def clear_task_instances(
461491
462492 _recalculate_dagrun_queued_at_deadlines (dr , dr .queued_at , session )
463493
494+ # A run with no version of its own has nothing to preserve, so the latest is all
495+ # it can be re-run on. Runs migrated from Airflow 2 are like this, as are runs
496+ # whose version `airflow db clean` has since deleted.
497+ use_latest_version = run_on_latest_version or dr .created_dag_version_id is None
464498 if dr .state in State .finished_dr_states :
465499 dr .state = dag_run_state
466500 dr .start_date = timezone .utcnow ()
467- if run_on_latest_version :
501+ if use_latest_version :
468502 dr_dag = scheduler_dagbag .get_latest_version_of_dag (dr .dag_id , session = session )
469503 dag_version = DagVersion .get_latest_version (dr .dag_id , session = session )
470504 if dag_version :
@@ -478,14 +512,14 @@ def clear_task_instances(
478512 dr_dag = scheduler_dagbag .get_dag_for_run (dag_run = dr , session = session )
479513 if not dr_dag :
480514 log .warning ("No serialized dag found for dag '%s'" , dr .dag_id )
481- if dr_dag and not dr_dag .disable_bundle_versioning and run_on_latest_version :
515+ if dr_dag and not dr_dag .disable_bundle_versioning and use_latest_version :
482516 bundle_version = dr .dag_model .bundle_version
483- if bundle_version is not None and run_on_latest_version :
517+ if bundle_version is not None :
484518 dr .bundle_version = bundle_version
485519 if dag_run_state == DagRunState .QUEUED :
486520 dr .last_scheduling_decision = None
487521 dr .start_date = None
488- elif run_on_latest_version :
522+ elif use_latest_version :
489523 # Queued/running DagRun: update DR to latest version/bundle for workloads that use it.
490524 dag_version = DagVersion .get_latest_version (dr .dag_id , session = session )
491525 if dag_version and dr .created_dag_version_id != dag_version .id :
@@ -499,6 +533,9 @@ def clear_task_instances(
499533 bundle_version = dr .dag_model .bundle_version
500534 if bundle_version is not None :
501535 dr .bundle_version = bundle_version
536+
537+ if dr .created_dag_version_id :
538+ _pin_versionless_tis_to_run_version (dr , dr .created_dag_version_id , session )
502539 for ti in tis :
503540 ti .context_carrier = new_task_run_carrier (ti .dag_run .context_carrier )
504541 session .flush ()
0 commit comments