openstack/nova
Code Issues Proposed changes

Merge "Support running periodic tasks immediately at startup"

Browse Source
This commit is contained in:
Jenkins 2013-02-20 00:48:43 +00:00 committed by Gerrit Code Review
commit c003406641
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/manager.py
View File

@ -3356,7 +3356,7 @@ class ComputeManager(manager.SchedulerDependentManager):
capability['host_ip'] = CONF.my_ip capability['host_ip'] = CONF.my_ip
self.update_service_capabilities(capabilities) self.update_service_capabilities(capabilities)
@manager.periodic_task(spacing=600.0) @manager.periodic_task(spacing=600.0, run_immediately=True)
def _sync_power_states(self, context): def _sync_power_states(self, context):
"""Align power states between the database and the hypervisor. """Align power states between the database and the hypervisor.

19
nova/manager.py
View File

@ -88,9 +88,15 @@ def periodic_task(*args, **kwargs):
1. Without arguments '@periodic_task', this will be run on every cycle 1. Without arguments '@periodic_task', this will be run on every cycle
of the periodic scheduler. of the periodic scheduler.
2. With arguments, @periodic_task(periodic_spacing=N), this will be 2. With arguments:
run on approximately every N seconds. If this number is negative the @periodic_task(spacing=N [, run_immediately=[True|False]])
periodic task will be disabled. this will be run on approximately every N seconds. If this number is
negative the periodic task will be disabled. If the run_immediately
argument is provided and has a value of 'True', the first run of the
task will be shortly after task scheduler starts. If
run_immediately is omitted or set to 'False', the first time the
task runs will be approximately N seconds after the task scheduler
starts.
""" """
def decorator(f): def decorator(f):
# Test for old style invocation # Test for old style invocation
@ -107,7 +113,10 @@ def periodic_task(*args, **kwargs):
# Control frequency # Control frequency
f._periodic_spacing = kwargs.pop('spacing', 0) f._periodic_spacing = kwargs.pop('spacing', 0)
f._periodic_last_run = time.time() if kwargs.pop('run_immediately', False):
f._periodic_last_run = None
else:
f._periodic_last_run = time.time()
return f return f
# NOTE(sirp): The `if` is necessary to allow the decorator to be used with # NOTE(sirp): The `if` is necessary to allow the decorator to be used with
@ -213,6 +222,8 @@ class Manager(base.Base):
# If a periodic task is _nearly_ due, then we'll run it early # If a periodic task is _nearly_ due, then we'll run it early
if self._periodic_spacing[task_name] is None: if self._periodic_spacing[task_name] is None:
wait = 0 wait = 0
elif self._periodic_last_run[task_name] is None:
wait = 0
else: else:
due = (self._periodic_last_run[task_name] + due = (self._periodic_last_run[task_name] +
self._periodic_spacing[task_name]) self._periodic_spacing[task_name])