From: Zack Cerza <zack@redhat.com>
Date: Fri, 31 Mar 2017 21:41:59 +0000 (-0600)
Subject: parallel: Let exceptions interrupt other greenlets
X-Git-Tag: 1.1.0~435^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1059%2Fhead;p=teuthology.git

parallel: Let exceptions interrupt other greenlets

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/parallel.py b/teuthology/parallel.py
index ac47165a5..d17faf326 100644
--- a/teuthology/parallel.py
+++ b/teuthology/parallel.py
@@ -1,15 +1,18 @@
 import logging
 import sys
 
+import gevent
 import gevent.pool
 import gevent.queue
 
 log = logging.getLogger(__name__)
 
+
 class ExceptionHolder(object):
     def __init__(self, exc_info):
         self.exc_info = exc_info
 
+
 def capture_traceback(func, *args, **kwargs):
     """
     Utility function to capture tracebacks of any exception func
@@ -20,6 +23,7 @@ def capture_traceback(func, *args, **kwargs):
     except Exception:
         return ExceptionHolder(sys.exc_info())
 
+
 def resurrect_traceback(exc):
     if isinstance(exc, ExceptionHolder):
         exc_info = exc.exc_info
@@ -30,6 +34,7 @@ def resurrect_traceback(exc):
 
     raise exc_info[0], exc_info[1], exc_info[2]
 
+
 class parallel(object):
     """
     This class is a context manager for running functions in parallel.
@@ -73,20 +78,13 @@ class parallel(object):
         return self
 
     def __exit__(self, type_, value, traceback):
-        self.group.join()
-
         if value is not None:
             return False
 
-        try:
-            # raises if any greenlets exited with an exception
-            for result in self:
-                log.debug('result is %s', repr(result))
-                pass
-        except Exception:
-            # Emit message here because traceback gets stomped when we re-raise
-            log.exception("Exception in parallel execution")
-            raise
+        # raises if any greenlets exited with an exception
+        for result in self:
+            log.debug('result is %s', repr(result))
+
         return True
 
     def __iter__(self):