Update to the latest oslo loopingcall.
This renames a class from loopingcall.LoopingCall to loopingcall.FixedIntervalLoopingCall. Change-Id: If51d3f4cc2a393f730cd168b16d444725151dbf4
This commit is contained in:
parent
779607bd15
commit
23a99acc06
@ -686,7 +686,8 @@ class DhcpAgentWithStateReport(DhcpAgent):
|
|||||||
'agent_type': constants.AGENT_TYPE_DHCP}
|
'agent_type': constants.AGENT_TYPE_DHCP}
|
||||||
report_interval = cfg.CONF.AGENT.report_interval
|
report_interval = cfg.CONF.AGENT.report_interval
|
||||||
if report_interval:
|
if report_interval:
|
||||||
self.heartbeat = loopingcall.LoopingCall(self._report_state)
|
self.heartbeat = loopingcall.FixedIntervalLoopingCall(
|
||||||
|
self._report_state)
|
||||||
self.heartbeat.start(interval=report_interval)
|
self.heartbeat.start(interval=report_interval)
|
||||||
|
|
||||||
def _report_state(self):
|
def _report_state(self):
|
||||||
|
@ -697,7 +697,8 @@ class L3NATAgentWithStateReport(L3NATAgent):
|
|||||||
'agent_type': l3_constants.AGENT_TYPE_L3}
|
'agent_type': l3_constants.AGENT_TYPE_L3}
|
||||||
report_interval = cfg.CONF.AGENT.report_interval
|
report_interval = cfg.CONF.AGENT.report_interval
|
||||||
if report_interval:
|
if report_interval:
|
||||||
self.heartbeat = loopingcall.LoopingCall(self._report_state)
|
self.heartbeat = loopingcall.FixedIntervalLoopingCall(
|
||||||
|
self._report_state)
|
||||||
self.heartbeat.start(interval=report_interval)
|
self.heartbeat.start(interval=report_interval)
|
||||||
|
|
||||||
def _report_state(self):
|
def _report_state(self):
|
||||||
|
@ -46,12 +46,23 @@ class LoopingCallDone(Exception):
|
|||||||
self.retvalue = retvalue
|
self.retvalue = retvalue
|
||||||
|
|
||||||
|
|
||||||
class LoopingCall(object):
|
class LoopingCallBase(object):
|
||||||
def __init__(self, f=None, *args, **kw):
|
def __init__(self, f=None, *args, **kw):
|
||||||
self.args = args
|
self.args = args
|
||||||
self.kw = kw
|
self.kw = kw
|
||||||
self.f = f
|
self.f = f
|
||||||
self._running = False
|
self._running = False
|
||||||
|
self.done = None
|
||||||
|
|
||||||
|
def stop(self):
|
||||||
|
self._running = False
|
||||||
|
|
||||||
|
def wait(self):
|
||||||
|
return self.done.wait()
|
||||||
|
|
||||||
|
|
||||||
|
class FixedIntervalLoopingCall(LoopingCallBase):
|
||||||
|
"""A fixed interval looping call."""
|
||||||
|
|
||||||
def start(self, interval, initial_delay=None):
|
def start(self, interval, initial_delay=None):
|
||||||
self._running = True
|
self._running = True
|
||||||
@ -77,7 +88,7 @@ class LoopingCall(object):
|
|||||||
self.stop()
|
self.stop()
|
||||||
done.send(e.retvalue)
|
done.send(e.retvalue)
|
||||||
except Exception:
|
except Exception:
|
||||||
LOG.exception(_('in looping call'))
|
LOG.exception(_('in fixed duration looping call'))
|
||||||
done.send_exception(*sys.exc_info())
|
done.send_exception(*sys.exc_info())
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
@ -88,8 +99,49 @@ class LoopingCall(object):
|
|||||||
greenthread.spawn_n(_inner)
|
greenthread.spawn_n(_inner)
|
||||||
return self.done
|
return self.done
|
||||||
|
|
||||||
def stop(self):
|
|
||||||
self._running = False
|
|
||||||
|
|
||||||
def wait(self):
|
# TODO(mikal): this class name is deprecated in Havana and should be removed
|
||||||
return self.done.wait()
|
# in the I release
|
||||||
|
LoopingCall = FixedIntervalLoopingCall
|
||||||
|
|
||||||
|
|
||||||
|
class DynamicLoopingCall(LoopingCallBase):
|
||||||
|
"""A looping call which sleeps until the next known event.
|
||||||
|
|
||||||
|
The function called should return how long to sleep for before being
|
||||||
|
called again.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def start(self, initial_delay=None, periodic_interval_max=None):
|
||||||
|
self._running = True
|
||||||
|
done = event.Event()
|
||||||
|
|
||||||
|
def _inner():
|
||||||
|
if initial_delay:
|
||||||
|
greenthread.sleep(initial_delay)
|
||||||
|
|
||||||
|
try:
|
||||||
|
while self._running:
|
||||||
|
idle = self.f(*self.args, **self.kw)
|
||||||
|
if not self._running:
|
||||||
|
break
|
||||||
|
|
||||||
|
if periodic_interval_max is not None:
|
||||||
|
idle = min(idle, periodic_interval_max)
|
||||||
|
LOG.debug(_('Dynamic looping call sleeping for %.02f '
|
||||||
|
'seconds'), idle)
|
||||||
|
greenthread.sleep(idle)
|
||||||
|
except LoopingCallDone, e:
|
||||||
|
self.stop()
|
||||||
|
done.send(e.retvalue)
|
||||||
|
except Exception:
|
||||||
|
LOG.exception(_('in dynamic looping call'))
|
||||||
|
done.send_exception(*sys.exc_info())
|
||||||
|
return
|
||||||
|
else:
|
||||||
|
done.send(True)
|
||||||
|
|
||||||
|
self.done = done
|
||||||
|
|
||||||
|
greenthread.spawn(_inner)
|
||||||
|
return self.done
|
||||||
|
@ -63,7 +63,7 @@ class ThreadGroup(object):
|
|||||||
|
|
||||||
def add_timer(self, interval, callback, initial_delay=None,
|
def add_timer(self, interval, callback, initial_delay=None,
|
||||||
*args, **kwargs):
|
*args, **kwargs):
|
||||||
pulse = loopingcall.LoopingCall(callback, *args, **kwargs)
|
pulse = loopingcall.FixedIntervalLoopingCall(callback, *args, **kwargs)
|
||||||
pulse.start(interval=interval,
|
pulse.start(interval=interval,
|
||||||
initial_delay=initial_delay)
|
initial_delay=initial_delay)
|
||||||
self.timers.append(pulse)
|
self.timers.append(pulse)
|
||||||
|
@ -517,7 +517,8 @@ class LinuxBridgeQuantumAgentRPC(sg_rpc.SecurityGroupAgentRpcMixin):
|
|||||||
consumers)
|
consumers)
|
||||||
report_interval = cfg.CONF.AGENT.report_interval
|
report_interval = cfg.CONF.AGENT.report_interval
|
||||||
if report_interval:
|
if report_interval:
|
||||||
heartbeat = loopingcall.LoopingCall(self._report_state)
|
heartbeat = loopingcall.FixedIntervalLoopingCall(
|
||||||
|
self._report_state)
|
||||||
heartbeat.start(interval=report_interval)
|
heartbeat.start(interval=report_interval)
|
||||||
|
|
||||||
def setup_linux_bridge(self, interface_mappings):
|
def setup_linux_bridge(self, interface_mappings):
|
||||||
|
@ -169,7 +169,8 @@ class NECQuantumAgent(object):
|
|||||||
|
|
||||||
report_interval = config.CONF.AGENT.report_interval
|
report_interval = config.CONF.AGENT.report_interval
|
||||||
if report_interval:
|
if report_interval:
|
||||||
heartbeat = loopingcall.LoopingCall(self._report_state)
|
heartbeat = loopingcall.FixedIntervalLoopingCall(
|
||||||
|
self._report_state)
|
||||||
heartbeat.start(interval=report_interval)
|
heartbeat.start(interval=report_interval)
|
||||||
|
|
||||||
def _report_state(self):
|
def _report_state(self):
|
||||||
|
@ -225,7 +225,8 @@ class OVSQuantumAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin):
|
|||||||
consumers)
|
consumers)
|
||||||
report_interval = cfg.CONF.AGENT.report_interval
|
report_interval = cfg.CONF.AGENT.report_interval
|
||||||
if report_interval:
|
if report_interval:
|
||||||
heartbeat = loopingcall.LoopingCall(self._report_state)
|
heartbeat = loopingcall.FixedIntervalLoopingCall(
|
||||||
|
self._report_state)
|
||||||
heartbeat.start(interval=report_interval)
|
heartbeat.start(interval=report_interval)
|
||||||
|
|
||||||
def get_net_uuid(self, vif_id):
|
def get_net_uuid(self, vif_id):
|
||||||
|
@ -141,7 +141,7 @@ class Service(service.Service):
|
|||||||
self.manager.init_host()
|
self.manager.init_host()
|
||||||
super(Service, self).start()
|
super(Service, self).start()
|
||||||
if self.report_interval:
|
if self.report_interval:
|
||||||
pulse = loopingcall.LoopingCall(self.report_state)
|
pulse = loopingcall.FixedIntervalLoopingCall(self.report_state)
|
||||||
pulse.start(interval=self.report_interval,
|
pulse.start(interval=self.report_interval,
|
||||||
initial_delay=self.report_interval)
|
initial_delay=self.report_interval)
|
||||||
self.timers.append(pulse)
|
self.timers.append(pulse)
|
||||||
@ -152,7 +152,8 @@ class Service(service.Service):
|
|||||||
else:
|
else:
|
||||||
initial_delay = None
|
initial_delay = None
|
||||||
|
|
||||||
periodic = loopingcall.LoopingCall(self.periodic_tasks)
|
periodic = loopingcall.FixedIntervalLoopingCall(
|
||||||
|
self.periodic_tasks)
|
||||||
periodic.start(interval=self.periodic_interval,
|
periodic.start(interval=self.periodic_interval,
|
||||||
initial_delay=initial_delay)
|
initial_delay=initial_delay)
|
||||||
self.timers.append(periodic)
|
self.timers.append(periodic)
|
||||||
|
Loading…
Reference in New Issue
Block a user