From c8bb7e0fe406e4afe8fb7f2655d4f350ece528dc Mon Sep 17 00:00:00 2001
From: Craig Rueda <craig@craigrueda.com>
Date: Thu, 2 May 2019 12:45:15 -0700
Subject: [PATCH] Quick fix to address deadlock issue (#7434)

---
 superset/__init__.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/superset/__init__.py b/superset/__init__.py
index c405c01de72..8f8936ded38 100644
--- a/superset/__init__.py
+++ b/superset/__init__.py
@@ -195,13 +195,14 @@ if not issubclass(custom_sm, SupersetSecurityManager):
          not FAB's security manager.
          See [4565] in UPDATING.md""")
 
-appbuilder = AppBuilder(
-    app,
-    db.session,
-    base_template='superset/base.html',
-    indexview=MyIndexView,
-    security_manager_class=custom_sm,
-)
+with app.app_context():
+    appbuilder = AppBuilder(
+        app,
+        db.session,
+        base_template='superset/base.html',
+        indexview=MyIndexView,
+        security_manager_class=custom_sm,
+    )
 
 security_manager = appbuilder.sm