Sync with latest oslo-incubator
Periodic sync with latest oslo-incubator code Change-Id: I06cd458ce2e5eefb39f80d16573539a082c68c31
This commit is contained in:
parent
09c7afa181
commit
9dea288747
@ -143,7 +143,7 @@ def initialize_if_enabled():
|
|||||||
# listen(). In any case, pull the port number out here.
|
# listen(). In any case, pull the port number out here.
|
||||||
port = sock.getsockname()[1]
|
port = sock.getsockname()[1]
|
||||||
LOG.info(
|
LOG.info(
|
||||||
_LI('Eventlet backdoor listening on %(port)s for process %(pid)d') %
|
_LI('Eventlet backdoor listening on %(port)s for process %(pid)d'),
|
||||||
{'port': port, 'pid': os.getpid()}
|
{'port': port, 'pid': os.getpid()}
|
||||||
)
|
)
|
||||||
eventlet.spawn_n(eventlet.backdoor.backdoor_server, sock,
|
eventlet.spawn_n(eventlet.backdoor.backdoor_server, sock,
|
||||||
|
@ -84,9 +84,9 @@ class FixedIntervalLoopingCall(LoopingCallBase):
|
|||||||
break
|
break
|
||||||
delay = end - start - interval
|
delay = end - start - interval
|
||||||
if delay > 0:
|
if delay > 0:
|
||||||
LOG.warn(_LW('task %(func_name)r run outlasted '
|
LOG.warning(_LW('task %(func_name)r run outlasted '
|
||||||
'interval by %(delay).2f sec'),
|
'interval by %(delay).2f sec'),
|
||||||
{'func_name': self.f, 'delay': delay})
|
{'func_name': self.f, 'delay': delay})
|
||||||
greenthread.sleep(-delay if delay < 0 else 0)
|
greenthread.sleep(-delay if delay < 0 else 0)
|
||||||
except LoopingCallDone as e:
|
except LoopingCallDone as e:
|
||||||
self.stop()
|
self.stop()
|
||||||
|
@ -17,6 +17,7 @@ import threading
|
|||||||
import eventlet
|
import eventlet
|
||||||
from eventlet import greenpool
|
from eventlet import greenpool
|
||||||
|
|
||||||
|
from heat.openstack.common._i18n import _LE
|
||||||
from heat.openstack.common import loopingcall
|
from heat.openstack.common import loopingcall
|
||||||
|
|
||||||
|
|
||||||
@ -98,15 +99,15 @@ class ThreadGroup(object):
|
|||||||
x.stop()
|
x.stop()
|
||||||
except eventlet.greenlet.GreenletExit:
|
except eventlet.greenlet.GreenletExit:
|
||||||
pass
|
pass
|
||||||
except Exception as ex:
|
except Exception:
|
||||||
LOG.exception(ex)
|
LOG.exception(_LE('Error stopping thread.'))
|
||||||
|
|
||||||
def stop_timers(self):
|
def stop_timers(self):
|
||||||
for x in self.timers:
|
for x in self.timers:
|
||||||
try:
|
try:
|
||||||
x.stop()
|
x.stop()
|
||||||
except Exception as ex:
|
except Exception:
|
||||||
LOG.exception(ex)
|
LOG.exception(_LE('Error stopping timer.'))
|
||||||
self.timers = []
|
self.timers = []
|
||||||
|
|
||||||
def stop(self, graceful=False):
|
def stop(self, graceful=False):
|
||||||
@ -132,8 +133,8 @@ class ThreadGroup(object):
|
|||||||
x.wait()
|
x.wait()
|
||||||
except eventlet.greenlet.GreenletExit:
|
except eventlet.greenlet.GreenletExit:
|
||||||
pass
|
pass
|
||||||
except Exception as ex:
|
except Exception:
|
||||||
LOG.exception(ex)
|
LOG.exception(_LE('Error waiting on ThreadGroup.'))
|
||||||
current = threading.current_thread()
|
current = threading.current_thread()
|
||||||
|
|
||||||
# Iterate over a copy of self.threads so thread_done doesn't
|
# Iterate over a copy of self.threads so thread_done doesn't
|
||||||
|
@ -6,7 +6,6 @@ module=eventlet_backdoor
|
|||||||
module=loopingcall
|
module=loopingcall
|
||||||
module=service
|
module=service
|
||||||
module=threadgroup
|
module=threadgroup
|
||||||
module=versionutils
|
|
||||||
|
|
||||||
# The base module to hold the copy of openstack.common
|
# The base module to hold the copy of openstack.common
|
||||||
base=heat
|
base=heat
|
||||||
|
Loading…
Reference in New Issue
Block a user