Support running periodic tasks immediately at startup
This change adds a parameter to allow periodic tasks that would otherwise have to wait for a lengthy initial interval to run immediately when the periodic tasks are started. This patch also applies the new facility in the the _sync_power_states task in the compute manager to get more timely access to Openstack server state when the compute node starts up. Change-Id: I461a5dbaa7d18919941ec31402910eef188d8e8c
This commit is contained in:
@@ -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,6 +113,9 @@ def periodic_task(*args, **kwargs):
|
|||||||
|
|
||||||
# Control frequency
|
# Control frequency
|
||||||
f._periodic_spacing = kwargs.pop('spacing', 0)
|
f._periodic_spacing = kwargs.pop('spacing', 0)
|
||||||
|
if kwargs.pop('run_immediately', False):
|
||||||
|
f._periodic_last_run = None
|
||||||
|
else:
|
||||||
f._periodic_last_run = time.time()
|
f._periodic_last_run = time.time()
|
||||||
return f
|
return f
|
||||||
|
|
||||||
@@ -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])
|
||||||
|
|||||||
Reference in New Issue
Block a user