From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 31 Jan 2022 19:11:08 +0000 (-0500)
Subject: qa: test inline compat set on older MDSMap
X-Git-Tag: v16.2.8~153^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19a9c54177f8d03aa9fa48a02c8599a8d333367a;p=ceph.git

qa: test inline compat set on older MDSMap

Reproduced here:

    /ceph/teuthology-archive/pdonnell-2022-01-31_19:13:02-fs:upgrade-master-distro-default-smithi/6651572/teuthology.log

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 445cdd4120eea26432f8692ebf3db8a0a9f0f9cf)
---

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/3-inline/no.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/3-inline/no.yaml
new file mode 100644
index 000000000000..107f30ecd218
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/3-inline/no.yaml
@@ -0,0 +1,4 @@
+tasks:
+- cephadm.shell:
+    host.a:
+      - ceph fs set cephfs inline_data false
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/3-inline/yes.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/3-inline/yes.yaml
new file mode 100644
index 000000000000..246ed71b448f
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/3-inline/yes.yaml
@@ -0,0 +1,4 @@
+tasks:
+- cephadm.shell:
+    host.a:
+      - ceph fs set cephfs inline_data true --yes-i-really-really-mean-it
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/3-verify.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/3-verify.yaml
deleted file mode 100644
index e71365ad113c..000000000000
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/3-verify.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- cephadm.shell:
-    host.a:
-      - ceph fs dump
-      - ceph --format=json fs dump | jq -e ".filesystems | length == 1"
-      - while ! ceph --format=json mds versions | jq -e ". | add == 4"; do sleep 1; done
-- fs.pre_upgrade_save:
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/4-verify.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/4-verify.yaml
new file mode 100644
index 000000000000..e71365ad113c
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/1-volume/4-verify.yaml
@@ -0,0 +1,7 @@
+tasks:
+- cephadm.shell:
+    host.a:
+      - ceph fs dump
+      - ceph --format=json fs dump | jq -e ".filesystems | length == 1"
+      - while ! ceph --format=json mds versions | jq -e ". | add == 4"; do sleep 1; done
+- fs.pre_upgrade_save: