From e7006d06fb8923838883ab59130df57c2b1f992f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 27 Jun 2017 12:52:35 -0400 Subject: [PATCH] qa/tasks/ceph: explicitly add osds to crush map for upgrades Before kraken, ceph-osd didn't add itself to crush... ceph-osd-prestart.sh did it. And ceph.py doesn't use that. Signed-off-by: Sage Weil --- .../jewel-x-singleton/1-jewel-install/jewel.yaml | 1 + .../1-hammer-jewel-install/hammer-jewel.yaml | 1 + .../hammer-to-jewel.yaml | 1 + .../hammer-to-jewel.yaml | 1 + .../jewel-x/parallel/1-jewel-install/jewel.yaml | 1 + .../point-to-point-x/point-to-point-upgrade.yaml | 1 + .../stress-split/1-jewel-install/jewel.yaml | 1 + qa/tasks/ceph.py | 14 ++++++++++++++ 8 files changed, 21 insertions(+) diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml index a617f91d19aba..c138b9be446c9 100644 --- a/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml +++ b/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml @@ -7,4 +7,5 @@ tasks: - print: "**** done install jewel" - ceph: skip_mgr_daemons: true + add_osds_to_crush: true - print: "**** done ceph" diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml index d743c89a50300..c57e071ca69b1 100644 --- a/qa/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml +++ b/qa/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml @@ -6,6 +6,7 @@ tasks: - ceph: fs: xfs skip_mgr_daemons: true + add_osds_to_crush: true - install.upgrade: exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] osd.0: diff --git a/qa/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml b/qa/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml index b69da11c5e9fa..212b8ff5cc544 100644 --- a/qa/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml +++ b/qa/suites/upgrade/hammer-jewel-x/stress-split/1-hammer-install-and-upgrade-to-jewel/hammer-to-jewel.yaml @@ -10,6 +10,7 @@ tasks: - ceph: fs: xfs skip_mgr_daemons: true + add_osds_to_crush: true - install.upgrade: exclude_packages: - ceph-mgr diff --git a/qa/suites/upgrade/hammer-jewel-x/tiering/1-install-hammer-and-upgrade-to-jewel/hammer-to-jewel.yaml b/qa/suites/upgrade/hammer-jewel-x/tiering/1-install-hammer-and-upgrade-to-jewel/hammer-to-jewel.yaml index 4c58e5f0d7511..7485dcef5b855 100644 --- a/qa/suites/upgrade/hammer-jewel-x/tiering/1-install-hammer-and-upgrade-to-jewel/hammer-to-jewel.yaml +++ b/qa/suites/upgrade/hammer-jewel-x/tiering/1-install-hammer-and-upgrade-to-jewel/hammer-to-jewel.yaml @@ -10,3 +10,4 @@ tasks: - ceph: fs: xfs skip_mgr_daemons: true + add_osds_to_crush: true diff --git a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml index f5eec07e51d0a..61b6f81f352bb 100644 --- a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml @@ -10,6 +10,7 @@ tasks: - print: "**** done installing jewel" - ceph: skip_mgr_daemons: true + add_osds_to_crush: true - print: "**** done ceph" - install.upgrade: mon.a: diff --git a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml index fd4a1d8f6b7b4..67d57f7b3f361 100644 --- a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml +++ b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml @@ -49,6 +49,7 @@ tasks: - ceph: fs: xfs skip_mgr_daemons: true + add_osds_to_crush: true - print: "**** done ceph xfs" - sequential: - workload diff --git a/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml b/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml index a617f91d19aba..c138b9be446c9 100644 --- a/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml +++ b/qa/suites/upgrade/jewel-x/stress-split/1-jewel-install/jewel.yaml @@ -7,4 +7,5 @@ tasks: - print: "**** done install jewel" - ceph: skip_mgr_daemons: true + add_osds_to_crush: true - print: "**** done ceph" diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index 1a950f0870f8c..88af108017ad0 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -1130,6 +1130,20 @@ def run_daemon(ctx, config, type_): id_, ] ) + if config.get('add_osds_to_crush'): + remote.run( + args=[ + 'sudo', + 'ceph', + 'osd', + 'crush', + 'create-or-move', + 'osd.' + id_, + '1.0', + 'host=localhost', + 'root=default', + ] + ) run_cmd = [ 'sudo', -- 2.39.5