openstack
/
octavia
Code Issues Proposed changes

Remove deprecated status_update_threads option 

It was marked for removal in the Stein cycle.

Change-Id: Ib82014f92eecbcfd96a4219f2de307e5631486cb
This commit is contained in:
Brian Haley 2020-05-01 12:33:34 -04:00
parent ec2f89830d
commit f6a66d86d4
3 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/octavia.conf
View File

@ -104,10 +104,6 @@
# controller_ip_port_list example: 127.0.0.1:5555, 127.0.0.1:5555 # controller_ip_port_list example: 127.0.0.1:5555, 127.0.0.1:5555
# controller_ip_port_list = # controller_ip_port_list =
# failover_threads = 10 # failover_threads = 10
# status_update_threads will default to the number of processors on the host.
# This setting is deprecated and if you specify health_update_threads and
# stats_update_threads, they override this parameter.
# status_update_threads =
# health_update_threads will default to the number of processors on the host # health_update_threads will default to the number of processors on the host
# health_update_threads = # health_update_threads =
# stats_update_threads will default to the number of processors on the host # stats_update_threads will default to the number of processors on the host

24
octavia/common/config.py
View File

@ -265,14 +265,6 @@ healthmanager_opts = [
cfg.IntOpt('failover_threads', cfg.IntOpt('failover_threads',
default=10, default=10,
help=_('Number of threads performing amphora failovers.')), help=_('Number of threads performing amphora failovers.')),
# TODO(tatsuma) Remove in or after "T" release
cfg.IntOpt('status_update_threads',
default=None,
help=_('Number of processes for amphora status update.'),
deprecated_for_removal=True,
deprecated_reason=_('This option is replaced as '
'health_update_threads and '
'stats_update_threads')),
cfg.IntOpt('health_update_threads', cfg.IntOpt('health_update_threads',
default=None, default=None,
help=_('Number of processes for amphora health update.')), help=_('Number of processes for amphora health update.')),
@ -878,7 +870,6 @@ def init(args, **kwargs):
cfg.CONF(args=args, project='octavia', cfg.CONF(args=args, project='octavia',
version='%%prog %s' % version.version_info.release_string(), version='%%prog %s' % version.version_info.release_string(),
**kwargs) **kwargs)
handle_deprecation_compatibility()
validate.check_default_tls_versions_min_conflict() validate.check_default_tls_versions_min_conflict()
setup_remote_debugger() setup_remote_debugger()
validate.check_default_ciphers_blacklist_conflict() validate.check_default_ciphers_blacklist_conflict()
@ -900,21 +891,6 @@ def setup_logging(conf):
LOG.debug("command line: %s", " ".join(sys.argv)) LOG.debug("command line: %s", " ".join(sys.argv))
# Use cfg.CONF.set_default to override the new configuration setting
# default value. This allows a value set, at the new location, to override
# a value set in the previous location while allowing settings that have
# not yet been moved to be utilized.
def handle_deprecation_compatibility():
# TODO(tatsuma) Remove in or after "T" release
if cfg.CONF.health_manager.status_update_threads is not None:
cfg.CONF.set_default('health_update_threads',
cfg.CONF.health_manager.status_update_threads,
group='health_manager')
cfg.CONF.set_default('stats_update_threads',
cfg.CONF.health_manager.status_update_threads,
group='health_manager')
def _enable_pydev(debugger_host, debugger_port): def _enable_pydev(debugger_host, debugger_port):
try: try:
from pydev import pydevd # pylint: disable=import-outside-toplevel from pydev import pydevd # pylint: disable=import-outside-toplevel

6
releasenotes/notes/remove-status_update_threads-85a8b0307a04c164.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The deprecated option ``status_update_threads`` has been removed,
``health_update_threads`` and ``stats_update_threads`` should be used
instead.