openstack/rally-openstack
Code Issues Proposed changes

Cleanup threads config option

Browse Source 
Allow the user to change the number of cleanup threads via the rally
config. When scaling out to thousands of instances, the cleanup can take
forever with the static 20 threads.

Change-Id: I0fa5c6ba2dec01b6a33a336e635713602ce9a61c
This commit is contained in:
Joe Talerico 2016-03-22 09:08:07 -04:00
parent 97f4378efb
commit c4e063269f
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
etc/rally/rally.conf.sample
View File

@ -17,20 +17,13 @@
# The name of a logging configuration file. This file is appended to
# any existing logging configuration files. For details about logging
# configuration files, see the Python logging module documentation.
# Note that when logging configuration files are used all logging
# configuration is defined in the configuration file and other logging
# configuration options are ignored (for example, log_format). (string
# value)
# Note that when logging configuration files are used then all logging
# configuration is set in the configuration file and other logging
# configuration options are ignored (for example,
# logging_context_format_string). (string value)
# Deprecated group/name - [DEFAULT]/log_config
#log_config_append = <None>
# DEPRECATED. A logging.Formatter log message format string which may
# use any of the available logging.LogRecord attributes. This option
# is deprecated. Please use logging_context_format_string and
# logging_default_format_string instead. This option is ignored if
# log_config_append is set. (string value)
#log_format = <None>
# Defines the format string for %%(asctime)s in log records. Default:
# %(default)s . This option is ignored if log_config_append is set.
# (string value)
@ -59,15 +52,6 @@
# log_config_append is set. (boolean value)
#use_syslog = false
# Enables or disables syslog rfc5424 format for logging. If enabled,
# prefixes the MSG part of the syslog message with APP-NAME (RFC5424).
# This option is ignored if log_config_append is set. (boolean value)
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
# Reason: The format without the APP-NAME is deprecated in Kilo, and
# will be removed in Mitaka, along with this option.
#use_syslog_rfc_format = true
# Syslog facility to receive log lines. This option is ignored if
# log_config_append is set. (string value)
#syslog_log_facility = LOG_USER
@ -541,6 +525,9 @@
# A timeout in seconds for deleting resources (integer value)
#resource_deletion_timeout = 600
# Number of cleanup threads to run (integer value)
#cleanup_threads = 20
[database]
@ -611,7 +598,7 @@
# value)
# Deprecated group/name - [DEFAULT]/sql_max_overflow
# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow
#max_overflow = <None>
#max_overflow = 50
# Verbosity of SQL debugging information: 0=None, 100=Everything.
# (integer value)

6
rally/plugins/openstack/cleanup/base.py
View File

@ -23,7 +23,9 @@ CONF = cfg.CONF
CLEANUP_OPTS = [
cfg.IntOpt("resource_deletion_timeout", default=600,
help="A timeout in seconds for deleting resources")
help="A timeout in seconds for deleting resources"),
cfg.IntOpt("cleanup_threads", default=20,
help="Number of cleanup threads to run")
]
cleanup_group = cfg.OptGroup(name="cleanup", title="Cleanup Options")
CONF.register_group(cleanup_group)
@ -33,7 +35,7 @@ CONF.register_opts(CLEANUP_OPTS, cleanup_group)
def resource(service, resource, order=0, admin_required=False,
perform_for_admin_only=False, tenant_resource=False,
max_attempts=3, timeout=CONF.cleanup.resource_deletion_timeout,
interval=1, threads=20):
interval=1, threads=CONF.cleanup.cleanup_threads):
"""Decorator that overrides resource specification.
Just put it on top of your resource class and specify arguments that you