You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2021/03/20 13:16:16 UTC
[GitHub] [airflow] ashb commented on a change in pull request #13199: Create dag dependencies view
ashb commented on a change in pull request #13199:
URL: https://github.com/apache/airflow/pull/13199#discussion_r598109416
##########
File path: airflow/www/templates/airflow/dag_dependencies.html
##########
@@ -0,0 +1,111 @@
+{#
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+#}
+
+{% extends "airflow/main.html" %}
+
+{% block title %}Airflow - DAGs{% endblock %}
Review comment:
Title should say something about dependencies
##########
File path: airflow/www/views.py
##########
@@ -3811,3 +3811,102 @@ def autocomplete(self, session=None):
payload = [row[0] for row in dag_ids_query.union(owners_query).limit(10).all()]
return wwwutils.json_response(payload)
+
+
+class DagDependenciesView(AirflowBaseView):
+ """View to show dependencies between DAGs"""
+
+ refresh_interval = conf.getint(
+ "dag_dependencies_plugin",
Review comment:
It's not a plugin anymore, so this section should change. Probably to webserver?
##########
File path: airflow/www/views.py
##########
@@ -3811,3 +3811,102 @@ def autocomplete(self, session=None):
payload = [row[0] for row in dag_ids_query.union(owners_query).limit(10).all()]
return wwwutils.json_response(payload)
+
+
+class DagDependenciesView(AirflowBaseView):
+ """View to show dependencies between DAGs"""
+
+ refresh_interval = conf.getint(
+ "dag_dependencies_plugin",
+ "refresh_interval",
+ fallback=conf.getint("scheduler", "dag_dir_list_interval"),
+ )
+ last_refresh = datetime.utcnow() - timedelta(seconds=refresh_interval)
+ nodes = []
+ edges = []
+
+ @expose('/dag-dependencies')
+ @auth.has_access(
+ [
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG),
+ ]
+ )
+ @gzipped
+ @action_logging
+ def list(self):
+ """Display DAG dependencies"""
+ title = "DAG Dependencies"
+
+ if datetime.utcnow() > self.last_refresh + timedelta(seconds=self.refresh_interval):
+ self._calculate_graph()
+ self.last_refresh = datetime.utcnow()
+
+ return self.render_template(
+ "airflow/dag_dependencies.html",
+ title=title,
+ nodes=self.nodes,
+ edges=self.edges,
+ last_refresh=self.last_refresh.strftime("%Y-%m-%d %H:%M:%S"),
+ arrange=conf.get("webserver", "dag_orientation"),
+ width=request.args.get("width", "100%"),
+ height=request.args.get("height", "800"),
+ )
+
+ def _calculate_graph(self):
+
+ current_app.dag_bag.collect_dags_from_db()
+
+ nodes = {}
+ edges = []
+
+ for dag_id, dag in current_app.dag_bag.dags.items():
+ dag_node_id = f"d:{dag_id}"
+ nodes[dag_node_id] = self._node_dict(dag_node_id, dag_id, "fill: rgb(232, 247, 228)")
+
+ for task in dag.tasks:
+ task_node_id = f"t:{dag_id}:{task.task_id}"
+ if task.task_type in conf.getlist("core", "dag_dependencies_trigger"):
+ nodes[task_node_id] = self._node_dict(
+ task_node_id, task.task_id, "fill: rgb(255, 239, 235)"
+ )
+
+ edges.extend(
+ [
+ {"u": dag_node_id, "v": task_node_id},
+ {"u": task_node_id, "v": f"d:{task.trigger_dag_id}"},
+ ]
+ )
+ elif task.task_type in conf.getlist("core", "dag_dependencies_sensor"):
+ nodes[task_node_id] = self._node_dict(
+ task_node_id, task.task_id, "fill: rgb(230, 241, 242)"
+ )
+
+ edges.extend(
+ [
+ {"u": task_node_id, "v": dag_node_id},
+ {"u": f"d:{task.external_dag_id}", "v": task_node_id},
+ ]
+ )
+
+ implicit = getattr(dag, "implicit_dependencies", None)
Review comment:
This attribute will never exist because we are loading the SerialisedDag now.
##########
File path: airflow/www/views.py
##########
@@ -3811,3 +3811,102 @@ def autocomplete(self, session=None):
payload = [row[0] for row in dag_ids_query.union(owners_query).limit(10).all()]
return wwwutils.json_response(payload)
+
+
+class DagDependenciesView(AirflowBaseView):
+ """View to show dependencies between DAGs"""
+
+ refresh_interval = conf.getint(
+ "dag_dependencies_plugin",
+ "refresh_interval",
+ fallback=conf.getint("scheduler", "dag_dir_list_interval"),
+ )
+ last_refresh = datetime.utcnow() - timedelta(seconds=refresh_interval)
+ nodes = []
+ edges = []
+
+ @expose('/dag-dependencies')
+ @auth.has_access(
+ [
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG),
+ ]
+ )
+ @gzipped
+ @action_logging
+ def list(self):
+ """Display DAG dependencies"""
+ title = "DAG Dependencies"
+
+ if datetime.utcnow() > self.last_refresh + timedelta(seconds=self.refresh_interval):
+ self._calculate_graph()
+ self.last_refresh = datetime.utcnow()
+
+ return self.render_template(
+ "airflow/dag_dependencies.html",
+ title=title,
+ nodes=self.nodes,
+ edges=self.edges,
+ last_refresh=self.last_refresh.strftime("%Y-%m-%d %H:%M:%S"),
+ arrange=conf.get("webserver", "dag_orientation"),
+ width=request.args.get("width", "100%"),
+ height=request.args.get("height", "800"),
+ )
+
+ def _calculate_graph(self):
+
+ current_app.dag_bag.collect_dags_from_db()
+
+ nodes = {}
+ edges = []
+
+ for dag_id, dag in current_app.dag_bag.dags.items():
+ dag_node_id = f"d:{dag_id}"
+ nodes[dag_node_id] = self._node_dict(dag_node_id, dag_id, "fill: rgb(232, 247, 228)")
Review comment:
We really shouldn't be hardcoding colours in the views - these should be classes and colours defined in css
##########
File path: airflow/www/views.py
##########
@@ -3811,3 +3811,102 @@ def autocomplete(self, session=None):
payload = [row[0] for row in dag_ids_query.union(owners_query).limit(10).all()]
return wwwutils.json_response(payload)
+
+
+class DagDependenciesView(AirflowBaseView):
+ """View to show dependencies between DAGs"""
+
+ refresh_interval = conf.getint(
+ "dag_dependencies_plugin",
+ "refresh_interval",
+ fallback=conf.getint("scheduler", "dag_dir_list_interval"),
+ )
+ last_refresh = datetime.utcnow() - timedelta(seconds=refresh_interval)
+ nodes = []
+ edges = []
+
+ @expose('/dag-dependencies')
+ @auth.has_access(
+ [
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG),
+ ]
+ )
+ @gzipped
+ @action_logging
+ def list(self):
+ """Display DAG dependencies"""
+ title = "DAG Dependencies"
+
+ if datetime.utcnow() > self.last_refresh + timedelta(seconds=self.refresh_interval):
Review comment:
This cache is per webserver worker
##########
File path: airflow/www/views.py
##########
@@ -3811,3 +3811,102 @@ def autocomplete(self, session=None):
payload = [row[0] for row in dag_ids_query.union(owners_query).limit(10).all()]
return wwwutils.json_response(payload)
+
+
+class DagDependenciesView(AirflowBaseView):
+ """View to show dependencies between DAGs"""
+
+ refresh_interval = conf.getint(
+ "dag_dependencies_plugin",
+ "refresh_interval",
+ fallback=conf.getint("scheduler", "dag_dir_list_interval"),
+ )
+ last_refresh = datetime.utcnow() - timedelta(seconds=refresh_interval)
+ nodes = []
+ edges = []
+
+ @expose('/dag-dependencies')
+ @auth.has_access(
+ [
+ (permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG),
+ ]
+ )
+ @gzipped
+ @action_logging
+ def list(self):
+ """Display DAG dependencies"""
+ title = "DAG Dependencies"
+
+ if datetime.utcnow() > self.last_refresh + timedelta(seconds=self.refresh_interval):
+ self._calculate_graph()
+ self.last_refresh = datetime.utcnow()
+
+ return self.render_template(
+ "airflow/dag_dependencies.html",
+ title=title,
+ nodes=self.nodes,
+ edges=self.edges,
+ last_refresh=self.last_refresh.strftime("%Y-%m-%d %H:%M:%S"),
+ arrange=conf.get("webserver", "dag_orientation"),
+ width=request.args.get("width", "100%"),
+ height=request.args.get("height", "800"),
+ )
+
+ def _calculate_graph(self):
+
+ current_app.dag_bag.collect_dags_from_db()
+
+ nodes = {}
+ edges = []
+
+ for dag_id, dag in current_app.dag_bag.dags.items():
+ dag_node_id = f"d:{dag_id}"
+ nodes[dag_node_id] = self._node_dict(dag_node_id, dag_id, "fill: rgb(232, 247, 228)")
+
+ for task in dag.tasks:
+ task_node_id = f"t:{dag_id}:{task.task_id}"
+ if task.task_type in conf.getlist("core", "dag_dependencies_trigger"):
Review comment:
Reading variables from the config for each task is comparatively expensive - we should call this once function at most
##########
File path: airflow/www/views.py
##########
@@ -3811,3 +3811,102 @@ def autocomplete(self, session=None):
payload = [row[0] for row in dag_ids_query.union(owners_query).limit(10).all()]
return wwwutils.json_response(payload)
+
+
+class DagDependenciesView(AirflowBaseView):
+ """View to show dependencies between DAGs"""
+
+ refresh_interval = conf.getint(
+ "dag_dependencies_plugin",
+ "refresh_interval",
+ fallback=conf.getint("scheduler", "dag_dir_list_interval"),
+ )
+ last_refresh = datetime.utcnow() - timedelta(seconds=refresh_interval)
+ nodes = []
+ edges = []
Review comment:
Bit confused as to why these are class variables
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org