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/12/02 15:23:03 UTC
[5/5] incubator-airflow git commit: Merge pull request #2822 from
StephanErb/db_robustness
Merge pull request #2822 from StephanErb/db_robustness
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/1359d873
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/1359d873
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/1359d873
Branch: refs/heads/master
Commit: 1359d87352bda220f5d88613fd81904378624c7b
Parents: 406d738 94deac3
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Sat Dec 2 16:22:50 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Sat Dec 2 16:22:50 2017 +0100
----------------------------------------------------------------------
airflow/bin/cli.py | 9 +-
airflow/config_templates/default_airflow.cfg | 9 +-
airflow/configuration.py | 5 +-
airflow/contrib/hooks/gcp_dataflow_hook.py | 8 +-
airflow/contrib/hooks/ssh_hook.py | 3 +-
airflow/executors/celery_executor.py | 2 +-
airflow/executors/dask_executor.py | 2 +-
airflow/executors/local_executor.py | 2 +-
airflow/executors/sequential_executor.py | 2 +-
airflow/hooks/hive_hooks.py | 3 +-
airflow/hooks/pig_hook.py | 3 +-
airflow/jobs.py | 7 +-
airflow/minihivecluster.py | 3 +-
airflow/operators/python_operator.py | 4 +-
airflow/operators/s3_file_transform_operator.py | 2 +-
airflow/security/kerberos.py | 2 +-
airflow/settings.py | 27 ++++-
airflow/task_runner/base_task_runner.py | 11 +-
airflow/utils/db.py | 34 ------
airflow/utils/helpers.py | 2 +-
airflow/utils/sqlalchemy.py | 108 +++++++++++++++++++
21 files changed, 185 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/1359d873/airflow/bin/cli.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/1359d873/airflow/jobs.py
----------------------------------------------------------------------
diff --cc airflow/jobs.py
index 0ff7819,ed6da60..28c5980
--- a/airflow/jobs.py
+++ b/airflow/jobs.py
@@@ -54,10 -54,9 +54,9 @@@ from airflow.utils.dag_processing impor
SimpleDag,
SimpleDagBag,
list_py_file_paths)
- from airflow.utils.db import (
- create_session, provide_session, pessimistic_connection_handling)
+ from airflow.utils.db import create_session, provide_session
from airflow.utils.email import send_email
-from airflow.utils.log.logging_mixin import LoggingMixin, StreamLogWriter
+from airflow.utils.log.logging_mixin import LoggingMixin, set_context, StreamLogWriter
from airflow.utils.state import State
Base = models.Base
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/1359d873/airflow/task_runner/base_task_runner.py
----------------------------------------------------------------------