openstack/oslo.service
Code Issues Proposed changes

Merge "Move the common thread manipulating routine to a shared routine"

Browse Source
This commit is contained in:
Jenkins 2015-10-09 07:35:31 +00:00 committed by Gerrit Code Review
commit 7ecf3bec34
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
oslo_service/threadgroup.py
View File

@ -99,21 +99,25 @@ class ThreadGroup(object):
def timer_done(self, timer): def timer_done(self, timer):
self.timers.remove(timer) self.timers.remove(timer)
def _stop_threads(self): def _perform_action_on_threads(self, action_func, on_error_func):
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
# modify the list while we're iterating # modify the list while we're iterating
for x in self.threads[:]: for x in self.threads[:]:
if x.ident == current.ident: if x.ident == current.ident:
# don't kill the current thread. # Don't perform actions on the current thread.
continue continue
try: try:
x.stop() action_func(x)
except eventlet.greenlet.GreenletExit: except eventlet.greenlet.GreenletExit:
pass pass
except Exception: except Exception:
LOG.exception(_LE('Error stopping thread.')) on_error_func(x)
def _stop_threads(self):
self._perform_action_on_threads(
lambda x: x.stop(),
lambda x: LOG.exception(_LE('Error stopping thread.')))
def stop_timers(self): def stop_timers(self):
for x in self.timers: for x in self.timers:
@ -148,16 +152,6 @@ class ThreadGroup(object):
pass pass
except Exception: except Exception:
LOG.exception(_LE('Error waiting on timer.')) LOG.exception(_LE('Error waiting on timer.'))
current = threading.current_thread() self._perform_action_on_threads(
lambda x: x.wait(),
# Iterate over a copy of self.threads so thread_done doesn't lambda x: LOG.exception(_LE('Error waiting on thread.')))
# modify the list while we're iterating
for x in self.threads[:]:
if x.ident == current.ident:
continue
try:
x.wait()
except eventlet.greenlet.GreenletExit:
pass
except Exception:
LOG.exception(_LE('Error waiting on thread.'))