From 08a0a738b35fd6dfa105068f0032bd5e84704909 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 24 Jun 2022 09:18:43 +0900 Subject: [PATCH] Remove options for oslo.db thread pool support Thread pool support in oslo.db was already deprecated[1], and it is not actually used by Glance. [1] 74c6bf266e0b86ceb4726cad9268f134d423bae8 Change-Id: I79e934f34f33953c821b6529a34e44dcf2a9688c --- etc/glance-api.conf | 13 ------------- etc/glance-manage.conf | 13 ------------- etc/glance-scrubber.conf | 13 ------------- etc/oslo-config-generator/glance-api.conf | 1 - etc/oslo-config-generator/glance-manage.conf | 1 - etc/oslo-config-generator/glance-scrubber.conf | 1 - 6 files changed, 42 deletions(-) diff --git a/etc/glance-api.conf b/etc/glance-api.conf index 5e319f66e2..e851c42152 100644 --- a/etc/glance-api.conf +++ b/etc/glance-api.conf @@ -1859,19 +1859,6 @@ # specify as param1=value1¶m2=value2&... (string value) #connection_parameters = -# -# From oslo.db.concurrency -# - -# DEPRECATED: Enable the experimental use of thread pooling for all DB API calls -# (boolean value) -# Deprecated group/name - [DEFAULT]/dbapi_use_tpool -# This option is deprecated for removal since 10.0.0. -# Its value may be silently ignored in the future. -# Reason: This feature has never graduated from experimental status and is now -# being removed due to lack of maintenance and test coverage -#use_tpool = false - [file] diff --git a/etc/glance-manage.conf b/etc/glance-manage.conf index dbe1eb61b2..f6da10b942 100644 --- a/etc/glance-manage.conf +++ b/etc/glance-manage.conf @@ -244,16 +244,3 @@ # Optional URL parameters to append onto the connection URL at connect time; # specify as param1=value1¶m2=value2&... (string value) #connection_parameters = - -# -# From oslo.db.concurrency -# - -# DEPRECATED: Enable the experimental use of thread pooling for all DB API calls -# (boolean value) -# Deprecated group/name - [DEFAULT]/dbapi_use_tpool -# This option is deprecated for removal since 10.0.0. -# Its value may be silently ignored in the future. -# Reason: This feature has never graduated from experimental status and is now -# being removed due to lack of maintenance and test coverage -#use_tpool = false diff --git a/etc/glance-scrubber.conf b/etc/glance-scrubber.conf index 26d0497f34..4083746556 100644 --- a/etc/glance-scrubber.conf +++ b/etc/glance-scrubber.conf @@ -855,19 +855,6 @@ # specify as param1=value1¶m2=value2&... (string value) #connection_parameters = -# -# From oslo.db.concurrency -# - -# DEPRECATED: Enable the experimental use of thread pooling for all DB API calls -# (boolean value) -# Deprecated group/name - [DEFAULT]/dbapi_use_tpool -# This option is deprecated for removal since 10.0.0. -# Its value may be silently ignored in the future. -# Reason: This feature has never graduated from experimental status and is now -# being removed due to lack of maintenance and test coverage -#use_tpool = false - [glance_store] diff --git a/etc/oslo-config-generator/glance-api.conf b/etc/oslo-config-generator/glance-api.conf index 49418695de..8e1dc06c07 100644 --- a/etc/oslo-config-generator/glance-api.conf +++ b/etc/oslo-config-generator/glance-api.conf @@ -8,7 +8,6 @@ namespace = glance.multi_store namespace = oslo.concurrency namespace = oslo.messaging namespace = oslo.db -namespace = oslo.db.concurrency namespace = oslo.policy namespace = keystonemiddleware.auth_token namespace = oslo.log diff --git a/etc/oslo-config-generator/glance-manage.conf b/etc/oslo-config-generator/glance-manage.conf index 21e509d043..d3fda02bea 100644 --- a/etc/oslo-config-generator/glance-manage.conf +++ b/etc/oslo-config-generator/glance-manage.conf @@ -3,5 +3,4 @@ wrap_width = 80 output_file = etc/glance-manage.conf.sample namespace = glance.manage namespace = oslo.db -namespace = oslo.db.concurrency namespace = oslo.log diff --git a/etc/oslo-config-generator/glance-scrubber.conf b/etc/oslo-config-generator/glance-scrubber.conf index d370f603b7..700f1ecaca 100644 --- a/etc/oslo-config-generator/glance-scrubber.conf +++ b/etc/oslo-config-generator/glance-scrubber.conf @@ -5,6 +5,5 @@ namespace = glance.scrubber namespace = glance.store namespace = oslo.concurrency namespace = oslo.db -namespace = oslo.db.concurrency namespace = oslo.log namespace = oslo.policy