From 100b9dc62c0ec9f7b38739837c06646122c818d5 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 1 Apr 2021 17:49:02 +0100 Subject: db: Unify 'nova.db.api', 'nova.db.sqlalchemy.api' Merge these, removing an unnecessary layer of abstraction, and place them in the new 'nova.db.main' directory. The resulting change is huge, but it's mainly the result of 's/sqlalchemy import api/main import api/' and 's/nova.db.api/nova.db.main.api/' with some necessary cleanup. We also need to rework how we do the blocking of API calls since we no longer have a 'DBAPI' object that we can monkey patch as we were doing before. This is now done via a global variable that is set by the 'main' function of 'nova.cmd.compute'. The main impact of this change is that it's no longer possible to set '[database] use_db_reconnect' and have all APIs automatically wrapped in a DB retry. Seeing as this behavior is experimental, isn't applied to any of the API DB methods (which don't use oslo.db's 'DBAPI' helper), and is used explicitly in what would appear to be the critical cases (via the explicit 'oslo_db.api.wrap_db_retry' decorator), this doesn't seem like a huge loss. Change-Id: Iad2e4da4546b80a016e477577d23accb2606a6e4 Signed-off-by: Stephen Finucane --- etc/nova/nova-config-generator.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'etc') diff --git a/etc/nova/nova-config-generator.conf b/etc/nova/nova-config-generator.conf index 50a2f75c46..1b946d6af8 100644 --- a/etc/nova/nova-config-generator.conf +++ b/etc/nova/nova-config-generator.conf @@ -9,7 +9,6 @@ namespace = oslo.policy namespace = oslo.privsep namespace = oslo.service.periodic_task namespace = oslo.service.service -namespace = oslo.db namespace = oslo.middleware namespace = oslo.concurrency namespace = keystonemiddleware.auth_token -- cgit v1.2.1