Merge pull request apache#25 in TP/incubator-airflow from feature/DAT…

…A-3676 to develop

* commit '07783b64cef17cb4309c26c4230ee32f12cb6b4b':
  DATA-3676: bump version to 1.8.2-up1.15.0
  [AIRFLOW-1559] Add sqlalchemy engine disposal

airflow/bin/cli.py

@@ -816,6 +816,7 @@ def webserver(args):
         gunicorn_master_proc = None
 
         def kill_proc(dummy_signum, dummy_frame):
+            settings.engine.dispose()
             gunicorn_master_proc.terminate()
             gunicorn_master_proc.wait()
             sys.exit(0)

airflow/jobs.py

@@ -373,6 +373,7 @@ def helper():
             sys.stderr = f
 
             try:
+                settings.engine.dispose()
                 # Re-configure logging to use the new output streams
                 log_format = settings.LOG_FORMAT_WITH_THREAD_NAME
                 settings.configure_logging(log_format=log_format)
@@ -404,6 +405,8 @@ def helper():
                 sys.stdout = original_stdout
                 sys.stderr = original_stderr
                 f.close()
+                # child is done with connection pool
+                settings.engine.dispose()
 
         p = multiprocessing.Process(target=helper,
                                     args=(),

airflow/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 #
 
-version = '1.8.2-up1.14.0'
+version = '1.8.2-up1.15.0'

airflow/www/app.py

@@ -13,8 +13,10 @@
 # limitations under the License.
 #
 import logging
-import socket
+import signal
 import six
+import socket
+import sys
 
 from flask import Flask
 from flask_admin import Admin, base
@@ -33,6 +35,9 @@
 
 
 def create_app(config=None, testing=False):
+    # cleanup connections
+    signal.signal(signal.SIGTERM, sigterm_handler)
+
     app = Flask(__name__)
     app.secret_key = configuration.get('webserver', 'SECRET_KEY')
     app.config['LOGIN_DISABLED'] = not configuration.getboolean('webserver', 'AUTHENTICATE')
@@ -152,6 +157,11 @@ def shutdown_session(exception=None):
 
         return app
 
+
+def sigterm_handler(signal, frame):
+    settings.engine.dispose()
+    sys.exit(0)
+
 app = None
 
 

upsight/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next release (in development)
 
+## 1.8.2-up1.15.0
+
+* Pulled in [AIRFLOW-1559](https://issues.apache.org/jira/browse/AIRFLOW-1559) ([DATA-3676](https://kontagent.jira.com/browse/DATA-3676))
+
 ## 1.8.2-up1.14.0
 
 * Display DAG run conf in the graph UI view ([DATA-3267](https://kontagent.jira.com/browse/DATA-3267))