From 59cd40d2b1ea561b388ea07bc400a9aa8416d13b Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Wed, 19 Oct 2022 09:40:57 +0800 Subject: [PATCH] qa/cephfs: fix confusing config when upgrading mds nodes Both these two cephfs tests are using 1-mds-2-client-micro.yaml: roles: - [mon.a, mon.b, mon.c, mgr.x, mgr.y, mds.a, mds.b, mds.c, osd.0, osd.1, osd.2, osd.3] - [client.0] - [client.1] So all the mon/mgr/mds/osd daemons are running in the first single node. It makes no sense to upgrade the same node twice. Signed-off-by: Xiubo Li --- .../featureful_client/old_client/tasks/2-upgrade.yaml | 5 ++--- .../featureful_client/upgraded_client/tasks/2-upgrade.yaml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml index a4692c684d9..26c185946dd 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml @@ -20,11 +20,10 @@ tasks: - mds_pre_upgrade: - print: "**** done mds pre-upgrade sequence" - install.upgrade: + # upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons mon.a: branch: quincy - mon.b: - branch: quincy -- print: "**** done install.upgrade both hosts" +- print: "**** done install.upgrade the host" - ceph.restart: daemons: [mon.*, mgr.*] mon-health-to-clog: false diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml index a68c3d921f9..e5ea8b19cef 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml @@ -20,11 +20,10 @@ tasks: - mds_pre_upgrade: - print: "**** done mds pre-upgrade sequence" - install.upgrade: + # upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons mon.a: branch: quincy - mon.b: - branch: quincy -- print: "**** done install.upgrade both hosts" +- print: "**** done install.upgrade the host" - ceph.restart: daemons: [mon.*, mgr.*] mon-health-to-clog: false -- 2.39.5