You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by da...@apache.org on 2016/11/15 22:07:15 UTC
incubator-airflow git commit: [AIRFLOW-633] Show TI attributes in TI
view
Repository: incubator-airflow
Updated Branches:
refs/heads/master 356fa029a -> 6ea511340
[AIRFLOW-633] Show TI attributes in TI view
Show task instance properties in addition to task
properties in the task instance view. The primary
reason for this is so that we can see things like
the host a task ran on without opening the log
file (which is huge in the case of long-
running/persistent jobs, especially e.g due to the
constant airflow heartbeat). Pagination of the log
would help too but this change is still necessary
and a quicker win.
I think ideally we want to only show an explicit
subset of fields, but for now making behavior
consistent with how task (not task instance)
attributes are displayed. Going to merge to open
source once this is merged.
Testing Done:
- Airbnb production webserver
<img width="1200" alt="screen shot 2016-11-15 at
11 34 30 am" src="https://cloud.githubusercontent.
com/assets/1592778/20324808/dae2861a-ab36-11e6
-8bfa-3942ed529856.png">
Closes #1886 from
aoen/ddavydov/add_ti_info_to_ti_view
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/6ea51134
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/6ea51134
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/6ea51134
Branch: refs/heads/master
Commit: 6ea5113402fdaccf666cf5c4a24a7a0cc781c708
Parents: 356fa02
Author: Dan Davydov <da...@airbnb.com>
Authored: Tue Nov 15 14:06:49 2016 -0800
Committer: Dan Davydov <da...@airbnb.com>
Committed: Tue Nov 15 14:06:53 2016 -0800
----------------------------------------------------------------------
airflow/models.py | 2 ++
airflow/www/templates/airflow/task.html | 17 +++++++++++++++--
airflow/www/views.py | 14 +++++++++++---
3 files changed, 28 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/6ea51134/airflow/models.py
----------------------------------------------------------------------
diff --git a/airflow/models.py b/airflow/models.py
index e64d04f..0e30357 100755
--- a/airflow/models.py
+++ b/airflow/models.py
@@ -753,6 +753,7 @@ class TaskInstance(Base):
self.unixname = getpass.getuser()
if state:
self.state = state
+ self.hostname = ''
self.init_on_load()
@reconstructor
@@ -954,6 +955,7 @@ class TaskInstance(Base):
self.start_date = ti.start_date
self.end_date = ti.end_date
self.try_number = ti.try_number
+ self.hostname = ti.hostname
else:
self.state = None
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/6ea51134/airflow/www/templates/airflow/task.html
----------------------------------------------------------------------
diff --git a/airflow/www/templates/airflow/task.html b/airflow/www/templates/airflow/task.html
index 88af001..e45b745 100644
--- a/airflow/www/templates/airflow/task.html
+++ b/airflow/www/templates/airflow/task.html
@@ -44,13 +44,26 @@
<h5>Attribute: {{ attr }}</h5>
{{ value|safe }}
{% endfor %}
- <h5>Attributes</h5>
+ <h5>Task Instance Attributes</h5>
<table class="table table-striped table-bordered">
<tr>
<th>Attribute</th>
<th>Value</th>
</tr>
- {% for attr, value in attributes %}
+ {% for attr, value in ti_attrs %}
+ <tr>
+ <td>{{ attr }}</td>
+ <td class='code'>{{ value }}</td>
+ </tr>
+ {% endfor %}
+ </table>
+ <h5>Task Attributes</h5>
+ <table class="table table-striped table-bordered">
+ <tr>
+ <th>Attribute</th>
+ <th>Value</th>
+ </tr>
+ {% for attr, value in task_attrs %}
<tr>
<td>{{ attr }}</td>
<td class='code'>{{ value }}</td>
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/6ea51134/airflow/www/views.py
----------------------------------------------------------------------
diff --git a/airflow/www/views.py b/airflow/www/views.py
index 618c8c8..d3857df 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -831,13 +831,20 @@ class Airflow(BaseView):
ti = TI(task=task, execution_date=dttm)
ti.refresh_from_db()
- attributes = []
+ ti_attrs = []
+ for attr_name in dir(ti):
+ if not attr_name.startswith('_'):
+ attr = getattr(ti, attr_name)
+ if type(attr) != type(self.task):
+ ti_attrs.append((attr_name, str(attr)))
+
+ task_attrs = []
for attr_name in dir(task):
if not attr_name.startswith('_'):
attr = getattr(task, attr_name)
if type(attr) != type(self.task) and \
attr_name not in attr_renderer:
- attributes.append((attr_name, str(attr)))
+ task_attrs.append((attr_name, str(attr)))
# Color coding the special attributes that are code
special_attrs_rendered = {}
@@ -867,7 +874,8 @@ class Airflow(BaseView):
title = "Task Instance Details"
return self.render(
'airflow/task.html',
- attributes=attributes,
+ task_attrs=task_attrs,
+ ti_attrs=ti_attrs,
failed_dep_reasons=failed_dep_reasons or no_failed_deps_result,
task_id=task_id,
execution_date=execution_date,