From befe2b815930fcdafd49e869d870f7662dbe50a7 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 16 Nov 2021 15:04:59 -0500 Subject: [PATCH] qa: disable metrics on kernel client during upgrade v16.2.4 MDS triggers an assert from these messages. Also: add latest pacific for extra coverage. Fixes: https://tracker.ceph.com/issues/53293 Signed-off-by: Patrick Donnelly (cherry picked from commit dcda5cb9ce52a1d194a461d332f6ce497ef19586) Backport note: dropped pacific.yaml which would result in no upgrade. --- qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/.qa | 1 + .../tasks/{0-v16.2.4.yaml => 0-from/v16.2.4.yaml} | 7 ++++++- .../fs/upgrade/mds_upgrade_sequence/tasks/2-client.yaml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 120000 qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/.qa rename qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/{0-v16.2.4.yaml => 0-from/v16.2.4.yaml} (71%) diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/.qa b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-v16.2.4.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml similarity index 71% rename from qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-v16.2.4.yaml rename to qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml index e61d622669715..47166a9aff8e7 100644 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-v16.2.4.yaml +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml @@ -3,10 +3,16 @@ meta: setup ceph/pacific v16.2.4 tasks: +# Disable metrics sending by kclient as it may crash (assert) a v16.2.4 MDS +- pexec: + clients: + - sudo modprobe -r ceph + - sudo modprobe ceph disable_send_metrics=on - install: tag: v16.2.4 exclude_packages: - ceph-volume +- print: "**** done install task..." - cephadm: roleless: true image: docker.io/ceph/ceph:v16.2.4 @@ -22,4 +28,3 @@ tasks: - ceph orch ls - ceph orch host ls - ceph orch device ls - diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/2-client.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/2-client.yaml index d7352c6bf5c2d..92b9dda84794f 100644 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/2-client.yaml +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/2-client.yaml @@ -1,3 +1,3 @@ tasks: - kclient: -- print: "**** done kclient client" +- print: "**** done client" -- 2.39.5