Adding upstream version 14.2.21.upstream/14.2.21upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

27 files changed, 146 insertions, 0 deletions

diff --git a/qa/suites/fs/upgrade/snaps/% b/qa/suites/fs/upgrade/snaps/%
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/%
diff --git a/qa/suites/fs/upgrade/snaps/.qa b/qa/suites/fs/upgrade/snaps/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/clusters/.qa b/qa/suites/fs/upgrade/snaps/clusters/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/clusters/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/clusters/3-mds.yaml b/qa/suites/fs/upgrade/snaps/clusters/3-mds.yaml
new file mode 120000
index 00000000..d7ec418e
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/clusters/3-mds.yaml
@@ -0,0 +1 @@
+.qa/cephfs/clusters/3-mds.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/conf b/qa/suites/fs/upgrade/snaps/conf
new file mode 120000
index 00000000..16e8cc44
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/conf
@@ -0,0 +1 @@
+.qa/cephfs/conf
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/objectstore-ec b/qa/suites/fs/upgrade/snaps/objectstore-ec
new file mode 120000
index 00000000..affe2949
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/objectstore-ec
@@ -0,0 +1 @@
+.qa/cephfs/objectstore-ec
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/overrides/% b/qa/suites/fs/upgrade/snaps/overrides/%
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/overrides/%
diff --git a/qa/suites/fs/upgrade/snaps/overrides/.qa b/qa/suites/fs/upgrade/snaps/overrides/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/overrides/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/overrides/frag_enable.yaml b/qa/suites/fs/upgrade/snaps/overrides/frag_enable.yaml
new file mode 120000
index 00000000..34a39a36
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/overrides/frag_enable.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/overrides/multimds/.qa b/qa/suites/fs/upgrade/snaps/overrides/multimds/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/overrides/multimds/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/overrides/multimds/no.yaml b/qa/suites/fs/upgrade/snaps/overrides/multimds/no.yaml
new file mode 100644
index 00000000..c740a450
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/overrides/multimds/no.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    max_mds: 1
diff --git a/qa/suites/fs/upgrade/snaps/overrides/multimds/yes.yaml b/qa/suites/fs/upgrade/snaps/overrides/multimds/yes.yaml
new file mode 100644
index 00000000..ecf118d9
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/overrides/multimds/yes.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    max_mds: 2
diff --git a/qa/suites/fs/upgrade/snaps/overrides/whitelist_health.yaml b/qa/suites/fs/upgrade/snaps/overrides/whitelist_health.yaml
new file mode 120000
index 00000000..74f39a49
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/overrides/whitelist_health.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/whitelist_health.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/overrides/whitelist_rstat.yaml b/qa/suites/fs/upgrade/snaps/overrides/whitelist_rstat.yaml
new file mode 100644
index 00000000..434b5ddc
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/overrides/whitelist_rstat.yaml
@@ -0,0 +1,8 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - inconsistent rstat on inode
+    conf:
+      mds:
+        mds debug scatterstat: 0
+        mds verify scatter: 0
diff --git a/qa/suites/fs/upgrade/snaps/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/fs/upgrade/snaps/overrides/whitelist_wrongly_marked_down.yaml
new file mode 120000
index 00000000..b4528c0f
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/overrides/whitelist_wrongly_marked_down.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/tasks/% b/qa/suites/fs/upgrade/snaps/tasks/%
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/%
diff --git a/qa/suites/fs/upgrade/snaps/tasks/.qa b/qa/suites/fs/upgrade/snaps/tasks/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
new file mode 100644
index 00000000..7835cbf9
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
@@ -0,0 +1,41 @@
+meta:
+- desc: |
+   install ceph/luminous latest
+tasks:
+- install:
+    branch: luminous
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
+      - ceph-mgr-ssh
+    extra_packages: ['librados2']
+- print: "**** done installing luminous"
+- ceph:
+    mon_bind_addrvec: false
+    mon_bind_msgr2: false
+    log-whitelist:
+      - overall HEALTH_
+      - \(FS_
+      - \(MDS_
+      - \(OSD_
+      - \(MON_DOWN\)
+      - \(CACHE_POOL_
+      - \(POOL_
+      - \(MGR_DOWN\)
+      - \(PG_
+      - \(SMALLER_PGP_NUM\)
+      - Monitor daemon marked osd
+      - Behind on trimming
+      - Manager daemon
+    conf:
+      global:
+        mon warn on pool no app: false
+        ms bind msgr2: false
+- exec:
+    osd.0:
+      - ceph osd require-osd-release luminous
+      - ceph osd set-require-min-compat-client luminous
+- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/snaps/tasks/1-client.yaml b/qa/suites/fs/upgrade/snaps/tasks/1-client.yaml
new file mode 100644
index 00000000..0aa6dcf7
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/1-client.yaml
@@ -0,0 +1,13 @@
+tasks:
+- ceph-fuse:
+- print: "**** done luminous client"
+- exec:
+    mon.a:
+    - ceph fs set cephfs allow_new_snaps true --yes-i-really-mean-it
+- workunit:
+    timeout: 5m
+    cleanup: false
+    clients:
+      client.0:
+      - fs/snap-hierarchy.sh
+- print: "**** done snap hierarchy"
diff --git a/qa/suites/fs/upgrade/snaps/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/snaps/tasks/2-upgrade.yaml
new file mode 100644
index 00000000..7252bb35
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/2-upgrade.yaml
@@ -0,0 +1,19 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        mon pg warn min per osd: 0
+        bluestore warn on legacy statfs: false
+
+tasks:
+- mds_pre_upgrade:
+- print: "**** done mds pre-upgrade sequence"
+- install.upgrade:
+    mon.a:
+    mon.b:
+- print: "**** done install.upgrade both hosts"
+- ceph.stop: [mds.*]
+- ceph.restart:
+    daemons: [mon.*, mgr.*, osd.*, mds.*]
+    mon-health-to-clog: false
+- print: "**** done ceph.restart"
diff --git a/qa/suites/fs/upgrade/snaps/tasks/3-sanity.yaml b/qa/suites/fs/upgrade/snaps/tasks/3-sanity.yaml
new file mode 100644
index 00000000..d93dc3ba
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/3-sanity.yaml
@@ -0,0 +1,10 @@
+tasks:
+- exec:
+    mon.a:
+    - ceph status
+    - ceph fs dump --format=json-pretty
+    - ceph fs set cephfs max_mds 2 && exit 1 || true
+- print: "**** confirmed cannot set max_mds=2"
+- exec:
+    mon.a:
+    - ceph fs set cephfs allow_new_snaps true
diff --git a/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/.qa b/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/no.yaml b/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/no.yaml
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/no.yaml
diff --git a/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/yes.yaml b/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/yes.yaml
new file mode 100644
index 00000000..13b590e2
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/4-client-upgrade/yes.yaml
@@ -0,0 +1,10 @@
+tasks:
+- install.upgrade:
+    client.0:
+- print: "**** done install.upgrade on client.0"
+- ceph-fuse:
+    client.0:
+      mounted: false
+- ceph-fuse:
+    client.0:
+- print: "**** done remount client"
diff --git a/qa/suites/fs/upgrade/snaps/tasks/5-client-sanity.yaml b/qa/suites/fs/upgrade/snaps/tasks/5-client-sanity.yaml
new file mode 100644
index 00000000..680e4407
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/5-client-sanity.yaml
@@ -0,0 +1,10 @@
+tasks:
+- workunit:
+    timeout: 5m
+    cleanup: false
+    env:
+      VERIFY: verify
+    clients:
+      client.0:
+      - fs/snap-hierarchy.sh
+- print: "**** done verify snap hierarchy"
diff --git a/qa/suites/fs/upgrade/snaps/tasks/6-snap-upgrade.yaml b/qa/suites/fs/upgrade/snaps/tasks/6-snap-upgrade.yaml
new file mode 100644
index 00000000..fe0b17e1
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/6-snap-upgrade.yaml
@@ -0,0 +1,16 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - bad backtrace on inode
+tasks:
+- cephfs_upgrade_snap:
+- print: "**** upgraded snapshot metadata"
+- exec:
+    mon.a:
+    - ceph fs set cephfs max_mds 2
+- print: "**** increased max_mds=2"
+- sleep:
+    duration: 10
+- exec:
+    mon.a:
+    - ceph fs dump | grep '^max_mds.*2'
diff --git a/qa/suites/fs/upgrade/snaps/tasks/7-client-sanity.yaml b/qa/suites/fs/upgrade/snaps/tasks/7-client-sanity.yaml
new file mode 120000
index 00000000..4ad65e45
--- /dev/null
+++ b/qa/suites/fs/upgrade/snaps/tasks/7-client-sanity.yaml
@@ -0,0 +1 @@
+5-client-sanity.yaml
\ No newline at end of file