From: Kefu Chai <kchai@redhat.com>
Date: Thu, 2 Apr 2020 05:29:45 +0000 (+0800)
Subject: qa/tasks: do not random.choice(a_view)
X-Git-Tag: v14.2.10~17^2~77
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bb8c15054cc2e67da2adeaacd4d2fb4575a2bbf9;p=ceph.git

qa/tasks: do not random.choice(a_view)

use `random.sample()` instead of `random.choice(list(a_view))` for better performance.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 9ca45bd942ef1ed0d7ed61d87caffdfc97e54e5e)

Conflicts:
	qa/tasks/ceph_manager.py: trivial resolution
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index d02f14592b7c6..0809996fca200 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -1696,7 +1696,7 @@ class CephManager:
         Pick a random pool
         """
         with self.lock:
-            return random.choice(self.pools.keys())
+            return random.sample(self.pools.keys(), 1)[0]
 
     def get_pool_pg_num(self, pool_name):
         """
diff --git a/qa/tasks/cephfs/test_dump_tree.py b/qa/tasks/cephfs/test_dump_tree.py
index 6d943f9dd2ff3..48a2c6f00acb5 100644
--- a/qa/tasks/cephfs/test_dump_tree.py
+++ b/qa/tasks/cephfs/test_dump_tree.py
@@ -39,7 +39,7 @@ class TestDumpTree(CephFSTestCase):
 
         self.populate()
         inos = self.get_paths_to_ino()
-        target = random.choice(inos.keys())
+        target = random.sample(inos.keys(), 1)[0]
 
         if target != "./":
             target = os.path.dirname(target)