diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-29 16:46:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-29 16:46:43 +0000 |
| commit | a89c2ababda2ebdc115c171605a2989fc80bf101 (patch) | |
| tree | a0fe6ad420aa1a5da71b13556fb57bccec360510 | |
| parent | f64b3baf041017fa8104f45f28a4a76fe07cb74f (diff) | |
| parent | 27868ddf260286d86c8e048934ffc7573d729702 (diff) | |
Merge "Don't run the periodic task if ticks_between_runs is below zero"
| -rw-r--r-- | nova/manager.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/manager.py b/nova/manager.py index 9a3e4a675..b1a1d471d 100644 --- a/nova/manager.py +++ b/nova/manager.py @@ -125,8 +125,9 @@ class ManagerMeta(type): if getattr(value, '_periodic_task', False): task = value name = task.__name__ - cls._periodic_tasks.append((name, task)) - cls._ticks_to_skip[name] = task._ticks_between_runs + if task._ticks_between_runs >= 0: + cls._periodic_tasks.append((name, task)) + cls._ticks_to_skip[name] = task._ticks_between_runs class Manager(base.Base): |