You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ka...@apache.org on 2020/08/14 18:49:51 UTC
[airflow] branch v1-10-test updated (4e98e4e -> 762e37b)
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a change to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git.
omit 4e98e4e Fix airflow-webserver startup errors when using Kerberos Auth (#10047)
omit e77c28f [AIRFLOW-5897] Allow setting -1 as pool slots value in webserver (#6550)
new 1c38ef3 [AIRFLOW-5897] Allow setting -1 as pool slots value in webserver (#6550)
new 762e37b Fix airflow-webserver startup errors when using Kerberos Auth (#10047)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4e98e4e)
\
N -- N -- N refs/heads/v1-10-test (762e37b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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.
Summary of changes:
airflow/jobs/scheduler_job.py | 2 --
1 file changed, 2 deletions(-)
[airflow] 02/02: Fix airflow-webserver startup errors when using
Kerberos Auth (#10047)
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 762e37be7b4efa43dca8fb09ad9789839dc1e052
Author: Kurganov <ku...@gmail.com>
AuthorDate: Wed Jul 29 17:17:06 2020 +0300
Fix airflow-webserver startup errors when using Kerberos Auth (#10047)
fix airflow-webserer startup errors if airflow.api.auth.backend.kerberos_auth enabled
(cherry picked from commit 87b495b8cfc28c9887eb5dc52ad50eccb71579b6)
---
airflow/contrib/auth/backends/kerberos_auth.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/airflow/contrib/auth/backends/kerberos_auth.py b/airflow/contrib/auth/backends/kerberos_auth.py
index e84a0b2..63cea8d 100644
--- a/airflow/contrib/auth/backends/kerberos_auth.py
+++ b/airflow/contrib/auth/backends/kerberos_auth.py
@@ -20,7 +20,9 @@
import logging
import flask_login
from airflow.exceptions import AirflowConfigException
-from flask_login import current_user
+# Need to expose these downstream
+# flake8: noqa: F401
+from flask_login import current_user, login_required, logout_user
from flask import flash
from wtforms import Form, PasswordField, StringField
from wtforms.validators import InputRequired
[airflow] 01/02: [AIRFLOW-5897] Allow setting -1 as pool slots
value in webserver (#6550)
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 1c38ef3199c22756b2909702d20c587ae7fa4f50
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Fri Aug 14 16:13:34 2020 +0200
[AIRFLOW-5897] Allow setting -1 as pool slots value in webserver (#6550)
This is a follow-up to 5d9216201b061cb35c9e349da0c4bb4c22c774e0.
The original fix only applied to the www UI not the www_rbac one.
(cherry picked from commit 03a46ddb0919d5327471a9442f961cf0636c1cb1)
---
airflow/jobs/scheduler_job.py | 2 --
airflow/www_rbac/views.py | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/airflow/jobs/scheduler_job.py b/airflow/jobs/scheduler_job.py
index 2fae2e3..685b57f 100644
--- a/airflow/jobs/scheduler_job.py
+++ b/airflow/jobs/scheduler_job.py
@@ -995,9 +995,7 @@ class SchedulerJob(BaseJob):
priority_sorted_task_instances = sorted(
task_instances, key=lambda ti: (-ti.priority_weight, ti.execution_date))
- # Number of tasks that cannot be scheduled because of no open slot in pool
num_starving_tasks = 0
- num_tasks_in_executor = 0
for current_index, task_instance in enumerate(priority_sorted_task_instances):
if open_slots <= 0:
self.log.info(
diff --git a/airflow/www_rbac/views.py b/airflow/www_rbac/views.py
index 96d4079..f098b25 100644
--- a/airflow/www_rbac/views.py
+++ b/airflow/www_rbac/views.py
@@ -2382,7 +2382,7 @@ class PoolModelView(AirflowModelView):
validators_columns = {
'pool': [validators.DataRequired()],
- 'slots': [validators.NumberRange(min=0)]
+ 'slots': [validators.NumberRange(min=-1)]
}