From: Sage Weil <sage@redhat.com>
Date: Wed, 21 Jun 2017 17:53:23 +0000 (-0400)
Subject: qa/tasks/ceph: do not pregenerate osdmap
X-Git-Tag: v12.1.2~1^2~19^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0eed85515a83e153f0064a5f2313109ca6de6203;p=ceph.git

qa/tasks/ceph: do not pregenerate osdmap

This is useless, and further leads to a situation
where we have a populated CRUSH map before any OSDs,
triggering the OSD_ORPHAN error.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index fa43530a6f5..f2c5ee75cf3 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -577,28 +577,6 @@ def cluster(ctx, config):
 
     log.info('Setting up mon nodes...')
     mons = ctx.cluster.only(teuthology.is_type('mon', cluster_name))
-    osdmap_path = '{tdir}/{cluster}.osdmap'.format(tdir=testdir,
-                                                   cluster=cluster_name)
-    run.wait(
-        mons.run(
-            args=[
-                'adjust-ulimits',
-                'ceph-coverage',
-                coverage_dir,
-                'osdmaptool',
-                '-c', conf_path,
-                '--clobber',
-                '--createsimple', '{num:d}'.format(
-                    num=teuthology.num_instances_of_type(ctx.cluster, 'osd',
-                                                         cluster_name),
-                ),
-                osdmap_path,
-                '--pg_bits', '2',
-                '--pgp_bits', '4',
-            ],
-            wait=False,
-        ),
-    )
 
     if not config.get('skip_mgr_daemons', False):
         log.info('Setting up mgr nodes...')
@@ -872,7 +850,6 @@ def cluster(ctx, config):
                     '--mkfs',
                     '-i', id_,
                     '--monmap', monmap_path,
-                    '--osdmap', osdmap_path,
                     '--keyring', keyring_path,
                 ],
             )
@@ -883,7 +860,6 @@ def cluster(ctx, config):
                 'rm',
                 '--',
                 monmap_path,
-                osdmap_path,
             ],
             wait=False,
         ),
@@ -1012,7 +988,6 @@ def cluster(ctx, config):
                     keyring_path,
                     data_dir,
                     monmap_path,
-                    osdmap_path,
                     run.Raw('{tdir}/../*.pid'.format(tdir=testdir)),
                 ],
                 wait=False,