Displaying "actual" try number in TaskInstance view (apache#34635)

abhishekbhakat · Mar 5, 2024 · d0dd71c · d0dd71c
1 parent b11e06a
commit d0dd71c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/airflow/models/taskinstance.py b/airflow/models/taskinstance.py
@@ -1433,6 +1433,18 @@ def try_number(self):
         """
         return _get_try_number(task_instance=self)
 
+    @try_number.expression
+    def try_number(cls):
+        """
+        This is what will be used by SQLAlchemy when filtering on try_number.
+
+        This is required because the override in the get_try_number function causes
+        try_number values to be off by one when listing tasks in the UI.
+
+        :meta private:
+        """
+        return cls._try_number
+
     @try_number.setter
     def try_number(self, value: int) -> None:
         """

diff --git a/airflow/www/views.py b/airflow/www/views.py
@@ -5476,7 +5476,7 @@ class TaskInstanceModelView(AirflowModelView):
         "priority_weight",
         "queue",
         "queued_dttm",
-        "try_number",
+        "prev_attempted_tries",
         "pool",
         "queued_by_job_id",
         "external_executor_id",
@@ -5505,9 +5505,7 @@ class TaskInstanceModelView(AirflowModelView):
         "queued_by_job_id",
     ]
 
-    label_columns = {
-        "dag_run.execution_date": "Logical Date",
-    }
+    label_columns = {"dag_run.execution_date": "Logical Date", "prev_attempted_tries": "Try Number"}
 
     search_columns = [
         "state",