From: Kefu Chai <kchai@redhat.com>
Date: Sun, 19 Jul 2020 09:37:57 +0000 (+0800)
Subject: qa/tasks/rbd: drop python2 support
X-Git-Tag: v16.1.0~1654^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4aa86f7a76206de9e7fce401b9323c36a94286b8;p=ceph.git

qa/tasks/rbd: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/tasks/rbd.py b/qa/tasks/rbd.py
index 7e1128007c52..a5b497a4953c 100644
--- a/qa/tasks/rbd.py
+++ b/qa/tasks/rbd.py
@@ -16,7 +16,6 @@ from teuthology.task.common_fs_utils import generic_mkfs
 from teuthology.task.common_fs_utils import generic_mount
 from teuthology.task.common_fs_utils import default_image_name
 
-import six
 
 #V1 image unsupported but required for testing purposes
 os.environ["RBD_FORCE_ALLOW_V1"] = "1"
@@ -348,16 +347,16 @@ def run_xfstests(ctx, config):
     with parallel() as p:
         for role, properties in config.items():
             p.spawn(run_xfstests_one_client, ctx, role, properties)
-        exc_info = None
+        exc = None
         while True:
             try:
                 p.next()
             except StopIteration:
                 break
             except:
-                exc_info = sys.exc_info()
-        if exc_info:
-            six.reraise(exc_info[0], exc_info[1], exc_info[2])
+                exc = sys.exc_info()[1]
+        if exc is not None:
+            raise exc
     yield
 
 def run_xfstests_one_client(ctx, role, properties):