openstack
/
oslo-incubator
Code Issues Proposed changes

Merge "Make wait & stop methods work on all threads"

This commit is contained in:
Jenkins 2013-12-09 17:09:33 +00:00 committed by Gerrit Code Review
parent fbbb12ea5f 25ff65e955
commit 2fb6570d5f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openstack/common/threadgroup.py
View File

@ -87,7 +87,10 @@ class ThreadGroup(object):
def stop(self):
current = greenthread.getcurrent()
for x in self.threads:
# Iterate over a copy of self.threads so thread_done doesn't
# modify the list while we're iterating
for x in self.threads[:]:
if x is current:
# don't kill the current thread.
continue
@ -112,7 +115,10 @@ class ThreadGroup(object):
except Exception as ex:
LOG.exception(ex)
current = greenthread.getcurrent()
for x in self.threads:
# Iterate over a copy of self.threads so thread_done doesn't
# modify the list while we're iterating
for x in self.threads[:]:
if x is current:
continue
try: