Merge "Remove [database] use_tpool and TpoolDbapiWrapper"

openstack · May 29, 2024 · a59dba4 · a59dba4
2 parents 94926c4 + 59fa4bc
commit a59dba4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 213 deletions.
diff --git a/oslo_db/concurrency.py b/oslo_db/concurrency.py
diff --git a/oslo_db/sqlalchemy/enginefacade.py b/oslo_db/sqlalchemy/enginefacade.py
@@ -187,14 +187,14 @@ def __init__(self):
         }
 
         # 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).
+        # 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',
-                'db_max_retry_interval', 'backend', 'use_tpool'
+                'db_max_retry_interval', 'backend',
             ]
         )
 

diff --git a/oslo_db/tests/test_concurrency.py b/oslo_db/tests/test_concurrency.py
diff --git a/releasenotes/notes/remove-use_tpool-29a8bf9fc68a9bb2.yaml b/releasenotes/notes/remove-use_tpool-29a8bf9fc68a9bb2.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``oslo_db.concurrency.TpoolDbapiWrapper`` class and supporting
+    ``[database] use_tpool`` config option have been removed.
diff --git a/setup.cfg b/setup.cfg
@@ -37,7 +37,6 @@ packages =
 [entry_points]
 oslo.config.opts =
     oslo.db = oslo_db.options:list_opts
-    oslo.db.concurrency = oslo_db.concurrency:list_opts
 
 oslo.db.migration =
     alembic = oslo_db.sqlalchemy.migration_cli.ext_alembic:AlembicExtension