From 3a04912ebffee2353aa9950d17e77c1d0d1023e6 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Tue, 22 Oct 2019 15:42:48 +0200 Subject: [PATCH] qa/tasks/ceph.py: cleanup: stop calling get_wwn_id_map() Nowadays, get_wwn_id_map is essentially a noop - it does: return dict((d, d) for d in devs) This reverts another bit of 8f720454cbb536ac6f410fb6c18b2b0945b70160 from 2013. References: https://tracker.ceph.com/issues/42313 Signed-off-by: Nathan Cutler (cherry picked from commit 51c714d9b29402f21b25b5754d42f917964079e2) Conflicts: qa/tasks/ceph.py - trivial conflict caused by missing py3-ization in nautilus --- qa/tasks/ceph.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index b1c3ea2ae3d43..6a41c26e3888a 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -611,19 +611,17 @@ def cluster(ctx, config): if config.get('fs'): log.info('fs option selected, checking for scratch devs') log.info('found devs: %s' % (str(devs),)) - devs_id_map = teuthology.get_wwn_id_map(remote, devs) - iddevs = devs_id_map.values() roles_to_devs = assign_devs( - teuthology.cluster_roles_of_type(roles_for_host, 'osd', cluster_name), iddevs + teuthology.cluster_roles_of_type(roles_for_host, 'osd', cluster_name), devs ) - if len(roles_to_devs) < len(iddevs): - iddevs = iddevs[len(roles_to_devs):] + if len(roles_to_devs) < len(devs): + devs = devs[len(roles_to_devs):] devs_to_clean[remote] = [] if config.get('block_journal'): log.info('block journal enabled') roles_to_journals = assign_devs( - teuthology.cluster_roles_of_type(roles_for_host, 'osd', cluster_name), iddevs + teuthology.cluster_roles_of_type(roles_for_host, 'osd', cluster_name), devs ) log.info('journal map: %s', roles_to_journals) -- 2.39.5