You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bo...@apache.org on 2017/01/16 21:24:03 UTC
[1/4] incubator-airflow git commit: [AIRFLOW-757] Set
child_process_log_directory default more sensible
Repository: incubator-airflow
Updated Branches:
refs/heads/master 44798e0d4 -> 3ac2fba88
[AIRFLOW-757] Set child_process_log_directory default more sensible
The default of child_process_log_directory was pointing to
/tmp/airflow/logs/scheduler. This could take people by surprise as
it is a non standard location and deviates from Airflow's other
log folders.
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/a9ab119b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/a9ab119b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/a9ab119b
Branch: refs/heads/master
Commit: a9ab119b4081d66cc53146ea01abe8612a6c5098
Parents: 648bd4e
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Sat Jan 14 13:58:38 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Sat Jan 14 13:58:38 2017 +0100
----------------------------------------------------------------------
airflow/configuration.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/a9ab119b/airflow/configuration.py
----------------------------------------------------------------------
diff --git a/airflow/configuration.py b/airflow/configuration.py
index 6778464..9b27328 100644
--- a/airflow/configuration.py
+++ b/airflow/configuration.py
@@ -349,7 +349,7 @@ dag_dir_list_interval = 300
# How often should stats be printed to the logs
print_stats_interval = 30
-child_process_log_directory = /tmp/airflow/scheduler/logs
+child_process_log_directory = {AIRFLOW_HOME}/logs/scheduler
# Local task jobs periodically heartbeat to the DB. If the job has
# not heartbeat in this many seconds, the scheduler will mark the
[3/4] incubator-airflow git commit: Merge branch 'AIRFLOW-757'
Posted by bo...@apache.org.
Merge branch 'AIRFLOW-757'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/b0110bb4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/b0110bb4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/b0110bb4
Branch: refs/heads/master
Commit: b0110bb4877a1f14c9e93fe29a0511914d1bb249
Parents: 44798e0 a9ab119
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Mon Jan 16 22:23:27 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Mon Jan 16 22:23:27 2017 +0100
----------------------------------------------------------------------
airflow/configuration.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/4] incubator-airflow git commit: [AIRFLOW-760] Update systemd
config
Posted by bo...@apache.org.
[AIRFLOW-760] Update systemd config
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/f3e18fbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/f3e18fbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/f3e18fbe
Branch: refs/heads/master
Commit: f3e18fbe022714f3a8a82040750db0b1ade9845a
Parents: 648bd4e
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Sat Jan 14 21:32:27 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Sat Jan 14 21:32:27 2017 +0100
----------------------------------------------------------------------
scripts/systemd/airflow-flower.service | 3 +--
scripts/systemd/airflow-kerberos.service | 3 +--
scripts/systemd/airflow-scheduler.service | 1 -
scripts/systemd/airflow-webserver.service | 7 ++-----
scripts/systemd/airflow-worker.service | 2 +-
5 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f3e18fbe/scripts/systemd/airflow-flower.service
----------------------------------------------------------------------
diff --git a/scripts/systemd/airflow-flower.service b/scripts/systemd/airflow-flower.service
index 4d524e8..de298c6 100644
--- a/scripts/systemd/airflow-flower.service
+++ b/scripts/systemd/airflow-flower.service
@@ -22,9 +22,8 @@ User=airflow
Group=airflow
Type=simple
ExecStart=/bin/airflow flower
-KillMode=process
Restart=on-failure
-RestartSec=42s
+RestartSec=5s
[Install]
WantedBy=multi-user.target
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f3e18fbe/scripts/systemd/airflow-kerberos.service
----------------------------------------------------------------------
diff --git a/scripts/systemd/airflow-kerberos.service b/scripts/systemd/airflow-kerberos.service
index 9c4ed6b..6113595 100644
--- a/scripts/systemd/airflow-kerberos.service
+++ b/scripts/systemd/airflow-kerberos.service
@@ -22,9 +22,8 @@ User=airflow
Group=airflow
Type=simple
ExecStart=/bin/airflow kerberos
-KillMode=process
Restart=on-failure
-RestartSec=42s
+RestartSec=5s
[Install]
WantedBy=multi-user.target
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f3e18fbe/scripts/systemd/airflow-scheduler.service
----------------------------------------------------------------------
diff --git a/scripts/systemd/airflow-scheduler.service b/scripts/systemd/airflow-scheduler.service
index 8c541cd..95229d6 100644
--- a/scripts/systemd/airflow-scheduler.service
+++ b/scripts/systemd/airflow-scheduler.service
@@ -22,7 +22,6 @@ User=airflow
Group=airflow
Type=simple
ExecStart=/bin/airflow scheduler -n ${SCHEDULER_RUNS}
-KillMode=process
Restart=always
RestartSec=5s
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f3e18fbe/scripts/systemd/airflow-webserver.service
----------------------------------------------------------------------
diff --git a/scripts/systemd/airflow-webserver.service b/scripts/systemd/airflow-webserver.service
index 73445fe..e39083e 100644
--- a/scripts/systemd/airflow-webserver.service
+++ b/scripts/systemd/airflow-webserver.service
@@ -17,16 +17,13 @@ After=network.target postgresql.service mysql.service redis.service rabbitmq-ser
Wants=postgresql.service mysql.service redis.service rabbitmq-server.service
[Service]
-PIDFile=/run/airflow/webserver.pid
EnvironmentFile=/etc/sysconfig/airflow
User=airflow
Group=airflow
-Type=forking
+Type=simple
ExecStart=/bin/airflow webserver --pid /run/airflow/webserver.pid
-ExecReload=/bin/kill -s HUP $MAINPID
-ExecStop=/bin/kill -s TERM $MAINPID
Restart=on-failure
-RestartSec=42s
+RestartSec=5s
PrivateTmp=true
[Install]
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f3e18fbe/scripts/systemd/airflow-worker.service
----------------------------------------------------------------------
diff --git a/scripts/systemd/airflow-worker.service b/scripts/systemd/airflow-worker.service
index 7531824..81ea353 100644
--- a/scripts/systemd/airflow-worker.service
+++ b/scripts/systemd/airflow-worker.service
@@ -23,7 +23,7 @@ Group=airflow
Type=simple
ExecStart=/bin/airflow worker
Restart=on-failure
-RestartSec=42s
+RestartSec=10s
[Install]
WantedBy=multi-user.target
\ No newline at end of file
[4/4] incubator-airflow git commit: Merge branch 'AIRFLOW-760'
Posted by bo...@apache.org.
Merge branch 'AIRFLOW-760'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/3ac2fba8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/3ac2fba8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/3ac2fba8
Branch: refs/heads/master
Commit: 3ac2fba8885b64619ee9d622731708a4e78834e5
Parents: b0110bb f3e18fb
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Mon Jan 16 22:23:36 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Mon Jan 16 22:23:36 2017 +0100
----------------------------------------------------------------------
scripts/systemd/airflow-flower.service | 3 +--
scripts/systemd/airflow-kerberos.service | 3 +--
scripts/systemd/airflow-scheduler.service | 1 -
scripts/systemd/airflow-webserver.service | 7 ++-----
scripts/systemd/airflow-worker.service | 2 +-
5 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------