diff --git a/etc/nova/nova-config-generator.conf b/etc/nova/nova-config-generator.conf index ad2be609139f..50a2f75c46d6 100644 --- a/etc/nova/nova-config-generator.conf +++ b/etc/nova/nova-config-generator.conf @@ -10,7 +10,6 @@ namespace = oslo.privsep namespace = oslo.service.periodic_task namespace = oslo.service.service namespace = oslo.db -namespace = oslo.db.concurrency namespace = oslo.middleware namespace = oslo.concurrency namespace = keystonemiddleware.auth_token diff --git a/nova/db/api.py b/nova/db/api.py index 8c5281d8a608..35ddc6475834 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -27,17 +27,17 @@ these objects be simple dictionaries. """ -from oslo_db import concurrency +from oslo_db import api from oslo_log import log as logging import nova.conf - CONF = nova.conf.CONF LOG = logging.getLogger(__name__) -_BACKEND_MAPPING = {'sqlalchemy': 'nova.db.sqlalchemy.api'} -IMPL = concurrency.TpoolDbapiWrapper(CONF, backend_mapping=_BACKEND_MAPPING) +IMPL = api.DBAPI.from_config( + conf=CONF, backend_mapping={'sqlalchemy': 'nova.db.sqlalchemy.api'}, +) ################### diff --git a/releasenotes/notes/drop-oslo_db-use_tpool-48542a28d10e1bae.yaml b/releasenotes/notes/drop-oslo_db-use_tpool-48542a28d10e1bae.yaml new file mode 100644 index 000000000000..9dee372f1567 --- /dev/null +++ b/releasenotes/notes/drop-oslo_db-use_tpool-48542a28d10e1bae.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + Experimental support for thread pooling of DB API calls has been removed. + This feature was first introduced in the 2014.2 (Juno) release but has not + graduated to fully-supported status since nor was it being used for any + API DB calls. The ``[oslo_db] use_tpool`` config option used to enable + this feature will now be ignored by nova.