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 2018/08/20 22:41:13 UTC
[GitHub] kaxil closed pull request #3758: [AIRFLOW-2908] Allow retries with
KubernetesExecutor.
kaxil closed pull request #3758: [AIRFLOW-2908] Allow retries with KubernetesExecutor.
URL: https://github.com/apache/incubator-airflow/pull/3758
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/airflow/www/views.py b/airflow/www/views.py
index 0c0dcff801..22f166752a 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -996,16 +996,25 @@ def run(self):
ignore_task_deps = request.args.get('ignore_task_deps') == "true"
ignore_ti_state = request.args.get('ignore_ti_state') == "true"
+ from airflow.executors import GetDefaultExecutor
+ executor = GetDefaultExecutor()
+ valid_celery_config = False
+ valid_kubernetes_config = False
+
try:
- from airflow.executors import GetDefaultExecutor
from airflow.executors.celery_executor import CeleryExecutor
- executor = GetDefaultExecutor()
- if not isinstance(executor, CeleryExecutor):
- flash("Only works with the CeleryExecutor, sorry", "error")
- return redirect(origin)
+ valid_celery_config = isinstance(executor, CeleryExecutor)
except ImportError:
- # in case CeleryExecutor cannot be imported it is not active either
- flash("Only works with the CeleryExecutor, sorry", "error")
+ pass
+
+ try:
+ from airflow.contrib.executors.kubernetes_executor import KubernetesExecutor
+ valid_kubernetes_config = isinstance(executor, KubernetesExecutor)
+ except ImportError:
+ pass
+
+ if not valid_celery_config and not valid_kubernetes_config:
+ flash("Only works with the Celery or Kubernetes executors, sorry", "error")
return redirect(origin)
ti = models.TaskInstance(task=task, execution_date=execution_date)
diff --git a/airflow/www_rbac/views.py b/airflow/www_rbac/views.py
index 629f488fc7..aaf30d7e4d 100644
--- a/airflow/www_rbac/views.py
+++ b/airflow/www_rbac/views.py
@@ -717,16 +717,25 @@ def run(self):
ignore_task_deps = request.args.get('ignore_task_deps') == "true"
ignore_ti_state = request.args.get('ignore_ti_state') == "true"
+ from airflow.executors import GetDefaultExecutor
+ executor = GetDefaultExecutor()
+ valid_celery_config = False
+ valid_kubernetes_config = False
+
try:
- from airflow.executors import GetDefaultExecutor
from airflow.executors.celery_executor import CeleryExecutor
- executor = GetDefaultExecutor()
- if not isinstance(executor, CeleryExecutor):
- flash("Only works with the CeleryExecutor, sorry", "error")
- return redirect(origin)
+ valid_celery_config = isinstance(executor, CeleryExecutor)
except ImportError:
- # in case CeleryExecutor cannot be imported it is not active either
- flash("Only works with the CeleryExecutor, sorry", "error")
+ pass
+
+ try:
+ from airflow.contrib.executors.kubernetes_executor import KubernetesExecutor
+ valid_kubernetes_config = isinstance(executor, KubernetesExecutor)
+ except ImportError:
+ pass
+
+ if not valid_celery_config and not valid_kubernetes_config:
+ flash("Only works with the Celery or Kubernetes executors, sorry", "error")
return redirect(origin)
ti = models.TaskInstance(task=task, execution_date=execution_date)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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
With regards,
Apache Git Services