Make SQLAlchemy engine options POOL_SIZE & MAX_OVERFLOW configurable #6208

web/config.py

@@ -22,6 +22,13 @@
 if sys.path[0] != root:
     sys.path.insert(0, root)
 
+# The config database connection pool size.
+# Setting this to 0 will remove any limit.
+CONFIG_DATABASE_CONNECTION_POOL_SIZE = 5
+# The number of connections allowed to overflow beyond
+# the connection pool size.
+CONFIG_DATABASE_CONNECTION_MAX_OVERFLOW = 100
+
 from pgadmin.utils import env, IS_WIN, fs_short_path
 
 ##########################################################################

web/pgadmin/model/__init__.py

@@ -23,7 +23,7 @@
 from sqlalchemy.ext.mutable import MutableDict
 import sqlalchemy.types as types
 import uuid
-import json
+import config
 
 ##########################################################################
 #
@@ -41,7 +41,12 @@
 #
 ##########################################################################
 
-db = SQLAlchemy()
+db = SQLAlchemy(
+    engine_options={
+        'pool_size': config.CONFIG_DATABASE_CONNECTION_POOL_SIZE,
+        'max_overflow': config.CONFIG_DATABASE_CONNECTION_MAX_OVERFLOW})
+
+
 USER_ID = 'user.id'
 SERVER_ID = 'server.id'
 

web/regression/runtests.py

@@ -49,9 +49,8 @@
 if sys.path[0] != root:
     sys.path.insert(0, root)
     os.chdir(root)
-
-from pgadmin import create_app
 import config
+from pgadmin import create_app
 
 if config.SERVER_MODE is True:
     config.SECURITY_RECOVERABLE = True