openstack
/
oslo.service
Code Issues Proposed changes

Merge "Add stop_on_exception to TG timers"

This commit is contained in:
Zuul 2018-12-19 14:15:34 +00:00 committed by Gerrit Code Review
parent b7e697ae4b 48c51fe9cd
commit 230aa89477
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oslo_service/tests/test_threadgroup.py
View File

@ -55,7 +55,8 @@ class ThreadGroupTestCase(test_base.BaseTestCase):
self.tg.add_dynamic_timer_args(foo, ['arg'], {'kwarg': 'kwarg'},
initial_delay=1,
periodic_interval_max=2)
periodic_interval_max=2,
stop_on_exception=False)
self.assertEqual(1, len(self.tg.timers))
@ -83,7 +84,7 @@ class ThreadGroupTestCase(test_base.BaseTestCase):
pass
self.tg.add_timer_args(1, foo, ['arg'], {'kwarg': 'kwarg'},
initial_delay=1)
initial_delay=1, stop_on_exception=False)
self.assertEqual(1, len(self.tg.timers))

11
oslo_service/threadgroup.py
View File

@ -89,12 +89,14 @@ class ThreadGroup(object):
periodic_interval_max=periodic_interval_max)
def add_dynamic_timer_args(self, callback, args=None, kwargs=None,
initial_delay=None, periodic_interval_max=None):
initial_delay=None, periodic_interval_max=None,
stop_on_exception=True):
args = args or []
kwargs = kwargs or {}
timer = loopingcall.DynamicLoopingCall(callback, *args, **kwargs)
timer.start(initial_delay=initial_delay,
periodic_interval_max=periodic_interval_max)
periodic_interval_max=periodic_interval_max,
stop_on_exception=stop_on_exception)
self.timers.append(timer)
return timer
@ -109,12 +111,13 @@ class ThreadGroup(object):
initial_delay=initial_delay)
def add_timer_args(self, interval, callback, args=None, kwargs=None,
initial_delay=None):
initial_delay=None, stop_on_exception=True):
args = args or []
kwargs = kwargs or {}
pulse = loopingcall.FixedIntervalLoopingCall(callback, *args, **kwargs)
pulse.start(interval=interval,
initial_delay=initial_delay)
initial_delay=initial_delay,
stop_on_exception=stop_on_exception)
self.timers.append(pulse)
return pulse

6
releasenotes/notes/timer-stop_on_exception-9f21d7c4d6d1b0d9.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The ThreadGroup add_timer_args() and add_dynamic_timer_args() methods now
support passing a stop_on_exception=False argument to allow the timer to
keep running even when an exception is raised by the callback function.