diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-16 19:17:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-16 19:17:58 +0000 |
| commit | 9e60f11b0a8add20d0b264297dab71cb48974e5d (patch) | |
| tree | 6604fb35742315b556e8a144672b4989c8c4b5fc | |
| parent | bb9fe5e0c8376488f1d907825bdd10a62d5bcb80 (diff) | |
| parent | 29b0826e1c91aac63f3b41a28a4ff5aebd8f5990 (diff) | |
Merge "Add some sqlalchemy tweakables"
| -rw-r--r-- | nova/config.py | 7 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/session.py | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/nova/config.py b/nova/config.py index 888cb4f32..c991e82ea 100644 --- a/nova/config.py +++ b/nova/config.py @@ -218,6 +218,13 @@ global_opts = [ cfg.IntOpt('sql_retry_interval', default=10, help='interval between retries of opening a sql connection'), + cfg.IntOpt('sql_pool_size', + default=None, + help='If set, use this value for pool_size with sqlalchemy'), + cfg.IntOpt('sql_max_overflow', + default=None, + help='If set, use this value for max_overflow with ' + 'sqlalchemy'), cfg.StrOpt('compute_manager', default='nova.compute.manager.ComputeManager', help='full class name for the Manager for compute'), diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py index 7346760c0..9f9ccf797 100644 --- a/nova/db/sqlalchemy/session.py +++ b/nova/db/sqlalchemy/session.py @@ -273,6 +273,11 @@ def create_engine(sql_connection): 'convert_unicode': True, } + if CONF.sql_pool_size is not None: + engine_args['pool_size'] = CONF.sql_pool_size + if CONF.sql_max_overflow is not None: + engine_args['max_overflow'] = CONF.sql_max_overflow + # Map our SQL debug level to SQLAlchemy's options if CONF.sql_connection_debug >= 100: engine_args['echo'] = 'debug' |