openstack
/
nova
Code Issues Proposed changes

Add warning to periodic_task with interval 0 

In Ia227f4c4e69ecf361ab02d1d17a3010303650104, warnings were
added for several options but instance_delete_interval was
left out by mistake.

Closes-Bug: #1188226
Change-Id: I20b396d664e40252743cac4f2a49f4f34882b32f
This commit is contained in:
Davanum Srinivas 2014-09-06 22:28:21 -04:00 committed by Davanum Srinivas (dims)
parent 4b9ff8823e
commit c1298f13e1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/compute/manager.py
View File

@ -167,7 +167,9 @@ interval_opts = [
cfg.IntOpt('instance_delete_interval', cfg.IntOpt('instance_delete_interval',
default=300, default=300,
help=('Interval in seconds for retrying failed instance file ' help=('Interval in seconds for retrying failed instance file '
'deletes')), 'deletes. Set to -1 to disable. '
'Setting this to 0 will disable, but this will change in '
'the K release to mean "run at the default rate".')),
cfg.IntOpt('block_device_allocate_retries_interval', cfg.IntOpt('block_device_allocate_retries_interval',
default=3, default=3,
help='Waiting time interval (seconds) between block' help='Waiting time interval (seconds) between block'
@ -6056,6 +6058,7 @@ class ComputeManager(manager.Manager):
self.driver.manage_image_cache(context, filtered_instances) self.driver.manage_image_cache(context, filtered_instances)
@compute_utils.periodic_task_spacing_warn("instance_delete_interval")
@periodic_task.periodic_task(spacing=CONF.instance_delete_interval) @periodic_task.periodic_task(spacing=CONF.instance_delete_interval)
def _run_pending_deletes(self, context): def _run_pending_deletes(self, context):
"""Retry any pending instance file deletes.""" """Retry any pending instance file deletes."""