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 <pdonnell@redhat.com>
(cherry picked from commit dcda5cb9ce52a1d194a461d332f6ce497ef19586)

Backport note: dropped pacific.yaml which would result in no upgrade.

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 (symlink)
index 0000000..a602a03
--- /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-from/v16.2.4.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml
new file mode 100644 (file)
index 0000000..47166a9
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml
@@ -0,0 +1,30 @@
+meta:
+- desc: |
+   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
+    cephadm_branch: v16.2.4
+    cephadm_git_url: https://github.com/ceph/ceph
+    # needed for v16.2.4 due to --skip-admin-label
+    avoid_pacific_features: true
+- print: "**** done starting v16.2.4"
+- cephadm.shell:
+    host.a:
+      - ceph orch status
+      - ceph orch ps
+      - ceph orch ls
+      - ceph orch host ls
+      - ceph orch device ls

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-v16.2.4.yaml
deleted file mode 100644 (file)
index e61d622..0000000
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-v16.2.4.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-meta:
-- desc: |
-   setup ceph/pacific v16.2.4
-
-tasks:
-- install:
-    tag: v16.2.4
-    exclude_packages:
-      - ceph-volume
-- cephadm:
-    roleless: true
-    image: docker.io/ceph/ceph:v16.2.4
-    cephadm_branch: v16.2.4
-    cephadm_git_url: https://github.com/ceph/ceph
-    # needed for v16.2.4 due to --skip-admin-label
-    avoid_pacific_features: true
-- print: "**** done starting v16.2.4"
-- cephadm.shell:
-    host.a:
-      - ceph orch status
-      - ceph orch ps
-      - 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 d7352c6bf5c2d3372fa4c0e947bfcb34d3776e60..92b9dda84794f2bff4a183d355941703633e1c6d 100644 (file)
--- 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"