You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bb...@apache.org on 2022/04/13 14:43:14 UTC
[airflow] branch update-state-priority created (now 28397fef3d)
This is an automated email from the ASF dual-hosted git repository.
bbovenzi pushed a change to branch update-state-priority
in repository https://gitbox.apache.org/repos/asf/airflow.git
at 28397fef3d Add no_status to state priority list
This branch includes the following new commits:
new 28397fef3d Add no_status to state priority list
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[airflow] 01/01: Add no_status to state priority list
Posted by bb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bbovenzi pushed a commit to branch update-state-priority
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 28397fef3d1e9640e738a7268846aa8eb4f58825
Author: Brent Bovenzi <br...@gmail.com>
AuthorDate: Wed Apr 13 10:41:12 2022 -0400
Add no_status to state priority list
---
airflow/www/utils.py | 36 +++++++++++++++++++-----------------
airflow/www/views.py | 19 +------------------
2 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/airflow/www/utils.py b/airflow/www/utils.py
index fc29d62027..8a5cc3c717 100644
--- a/airflow/www/utils.py
+++ b/airflow/www/utils.py
@@ -75,24 +75,26 @@ def get_instance_with_map(task_instance, session):
return get_mapped_summary(task_instance, mapped_instances)
-def get_mapped_summary(parent_instance, task_instances):
- priority = [
- TaskInstanceState.FAILED,
- TaskInstanceState.UPSTREAM_FAILED,
- TaskInstanceState.UP_FOR_RETRY,
- TaskInstanceState.UP_FOR_RESCHEDULE,
- TaskInstanceState.QUEUED,
- TaskInstanceState.SCHEDULED,
- TaskInstanceState.DEFERRED,
- TaskInstanceState.SENSING,
- TaskInstanceState.RUNNING,
- TaskInstanceState.SHUTDOWN,
- TaskInstanceState.RESTARTING,
- TaskInstanceState.REMOVED,
- TaskInstanceState.SUCCESS,
- TaskInstanceState.SKIPPED,
- ]
+priority = [
+ TaskInstanceState.FAILED,
+ TaskInstanceState.UPSTREAM_FAILED,
+ TaskInstanceState.UP_FOR_RETRY,
+ TaskInstanceState.UP_FOR_RESCHEDULE,
+ TaskInstanceState.QUEUED,
+ TaskInstanceState.SCHEDULED,
+ TaskInstanceState.DEFERRED,
+ TaskInstanceState.SENSING,
+ TaskInstanceState.RUNNING,
+ TaskInstanceState.SHUTDOWN,
+ TaskInstanceState.RESTARTING,
+ TaskInstanceState.REMOVED,
+ None,
+ TaskInstanceState.SUCCESS,
+ TaskInstanceState.SKIPPED,
+]
+
+def get_mapped_summary(parent_instance, task_instances):
mapped_states = [ti.state for ti in task_instances]
group_state = None
diff --git a/airflow/www/views.py b/airflow/www/views.py
index 953164e94a..8f2104c90b 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -255,23 +255,6 @@ def task_group_to_tree(task_item_or_group, dag, dag_runs, tis, session):
]
def get_summary(dag_run, children):
- priority = [
- TaskInstanceState.FAILED,
- TaskInstanceState.UPSTREAM_FAILED,
- TaskInstanceState.UP_FOR_RETRY,
- TaskInstanceState.UP_FOR_RESCHEDULE,
- TaskInstanceState.QUEUED,
- TaskInstanceState.SCHEDULED,
- TaskInstanceState.DEFERRED,
- TaskInstanceState.SENSING,
- TaskInstanceState.RUNNING,
- TaskInstanceState.SHUTDOWN,
- TaskInstanceState.RESTARTING,
- TaskInstanceState.REMOVED,
- TaskInstanceState.SUCCESS,
- TaskInstanceState.SKIPPED,
- ]
-
child_instances = [child['instances'] for child in children if 'instances' in child]
child_instances = [item for sublist in child_instances for item in sublist]
@@ -284,7 +267,7 @@ def task_group_to_tree(task_item_or_group, dag, dag_runs, tis, session):
children_states = [item['state'] for item in child_instances if item['run_id'] == dag_run.run_id]
group_state = None
- for state in priority:
+ for state in wwwutils.priority:
if state in children_states:
group_state = state
break