diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-09 20:32:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-09 20:32:16 +0000 |
| commit | c432d9e93884d6962592f6d19aaec3f8f66ac3a2 (patch) | |
| tree | 4a98df0b4850bbb7c9a3492531ec210741a21bbe | |
| parent | b0574feed0c987183c724d876d117321f0973aa1 (diff) | |
| parent | 698c62702af8f9ccca574a7ad714d3ae1298a5a8 (diff) | |
| download | oslo-db-c432d9e93884d6962592f6d19aaec3f8f66ac3a2.tar.gz | |
Merge "Ignore 'use_tpool' option"
| -rw-r--r-- | oslo_db/sqlalchemy/enginefacade.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oslo_db/sqlalchemy/enginefacade.py b/oslo_db/sqlalchemy/enginefacade.py index db7bdcf..2b9f81e 100644 --- a/oslo_db/sqlalchemy/enginefacade.py +++ b/oslo_db/sqlalchemy/enginefacade.py @@ -165,15 +165,15 @@ class _TransactionFactory(object): 'on_engine_create': [], } - # other options that are defined in oslo.db.options.database_opts - # but do not apply to the standard enginefacade arguments - # (most seem to apply to api.DBAPI). + # other options that are defined in oslo_db.options.database_opts + # or oslo_db.concurrency.tpool_opts but do not apply to the standard + # enginefacade arguments (most seem to apply to api.DBAPI). self._ignored_cfg = dict( (k, _Default(None)) for k in [ 'db_max_retries', 'db_inc_retry_interval', 'use_db_reconnect', 'db_retry_interval', 'min_pool_size', - 'db_max_retry_interval', 'backend']) + 'db_max_retry_interval', 'backend', 'use_tpool']) self._started = False self._legacy_facade = None |