Merge PR ceph#57991 into main

* refs/pull/57991/head: qa: upgrade sub-suite upgraded_client from from n-1|n-2 releases qa: upgrade sub-suite nofs from n-1 and n-2 releases qa: use supported releases for featureful_client Reviewed-by: Leonid Usov <[email protected]>
gsoneill · Jun 17, 2024 · baf11d7 · baf11d7
2 parents 8867303 + 7658965
commit baf11d7
Show file tree

Hide file tree

Showing 27 changed files with 274 additions and 56 deletions.
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.stream.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.stream.yaml
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/centos_9.stream.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_9.stream.yaml
diff --git a/...ites/fs/upgrade/nofs/tasks/0-pacific.yaml → ..._client/old_client/tasks/0-from/reef.yaml b/...ites/fs/upgrade/nofs/tasks/0-pacific.yaml → ..._client/old_client/tasks/0-from/reef.yaml
@@ -1,9 +1,9 @@
 meta:
 - desc: |
-   install ceph/pacific latest
+   install ceph/reef latest
 tasks:
 - install:
-    branch: pacific
+    branch: reef
     exclude_packages:
       - librados3
       - ceph-mgr-dashboard
@@ -13,7 +13,7 @@ tasks:
       - cephadm
       - ceph-volume
     extra_packages: ['librados2']
-- print: "**** done installing pacific"
+- print: "**** done installing reef"
 - ceph:
     log-ignorelist:
       - overall HEALTH_
@@ -35,5 +35,5 @@ tasks:
         ms bind msgr2: false
 - exec:
     osd.0:
-      - ceph osd set-require-min-compat-client pacific
+      - ceph osd set-require-min-compat-client reef
 - print: "**** done ceph"
diff --git a/...ul_client/old_client/tasks/0-octopus.yaml → ...client/old_client/tasks/0-from/squid.yaml b/...ul_client/old_client/tasks/0-octopus.yaml → ...client/old_client/tasks/0-from/squid.yaml
@@ -1,9 +1,9 @@
 meta:
 - desc: |
-   install ceph/octopus latest
+   install ceph/squid latest
 tasks:
 - install:
-    branch: octopus
+    branch: squid
     exclude_packages:
       - librados3
       - ceph-mgr-dashboard
@@ -13,7 +13,7 @@ tasks:
       - cephadm
       - ceph-volume
     extra_packages: ['librados2']
-- print: "**** done installing octopus"
+- print: "**** done installing squid"
 - ceph:
     log-ignorelist:
       - overall HEALTH_
@@ -35,5 +35,5 @@ tasks:
         ms bind msgr2: false
 - exec:
     osd.0:
-      - ceph osd set-require-min-compat-client octopus
+      - ceph osd set-require-min-compat-client squid
 - print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml
@@ -1,6 +1,10 @@
 tasks:
 - ceph-fuse:
-- print: "**** done octopus client"
+    client.0:
+      client_feature_range: "[0-13],[15-21]"
+    client.1:
+      client_feature_range: "[0-13],[15-21]"
+- print: "**** done client"
 - workunit:
     clients:
       all:

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
@@ -22,7 +22,6 @@ tasks:
 - install.upgrade:
     # upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons
     mon.a:
-      branch: quincy
 - print: "**** done install.upgrade the host"
 - ceph.restart:
     daemons: [mon.*, mgr.*]
@@ -42,7 +41,7 @@ tasks:
     mon.a:
     - ceph osd dump -f json-pretty
     - ceph versions
-    - ceph osd require-osd-release quincy
+    - ceph osd require-osd-release squid
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
 - ceph.healthy:
 - print: "**** done ceph.restart"
diff --git a/..._client/tasks/3-compat_client/quincy.yaml → ...old_client/tasks/3-compat_client/yes.yaml b/..._client/tasks/3-compat_client/quincy.yaml → ...old_client/tasks/3-compat_client/yes.yaml
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.stream.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.stream.yaml
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_9.stream.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_9.stream.yaml
diff --git a/...ient/upgraded_client/tasks/0-octopus.yaml → ...nt/upgraded_client/tasks/0-from/reef.yaml b/...ient/upgraded_client/tasks/0-octopus.yaml → ...nt/upgraded_client/tasks/0-from/reef.yaml
@@ -1,9 +1,9 @@
 meta:
 - desc: |
-   install ceph/octopus latest
+   install ceph/reef latest
 tasks:
 - install:
-    branch: octopus
+    branch: reef
     exclude_packages:
       - librados3
       - ceph-mgr-dashboard
@@ -13,7 +13,7 @@ tasks:
       - cephadm
       - ceph-volume
     extra_packages: ['librados2']
-- print: "**** done installing octopus"
+- print: "**** done installing reef"
 - ceph:
     log-ignorelist:
       - overall HEALTH_
@@ -35,5 +35,5 @@ tasks:
         ms bind msgr2: false
 - exec:
     osd.0:
-      - ceph osd set-require-min-compat-client octopus
+      - ceph osd set-require-min-compat-client reef
 - print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/squid.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/squid.yaml
@@ -0,0 +1,39 @@
+meta:
+- desc: |
+   install ceph/squid latest
+tasks:
+- install:
+    branch: squid
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+      - ceph-volume
+    extra_packages: ['librados2']
+- print: "**** done installing squid"
+- ceph:
+    log-ignorelist:
+      - 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 set-require-min-compat-client squid
+- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml
@@ -3,9 +3,11 @@ overrides:
   nuke-on-error: false
 tasks:
 - ceph-fuse:
-- print: "**** done octopus client"
-#- workunit:
-#    clients:
-#      all:
-#      - suites/fsstress.sh
+    client.1:
+      client_feature_range: "[0-13],[15-21]"
+- print: "**** done client"
+- workunit:
+    clients:
+      all:
+      - suites/fsstress.sh
 - print: "**** done fsstress"
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
@@ -22,7 +22,6 @@ tasks:
 - install.upgrade:
     # upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons
     mon.a:
-      branch: quincy
 - print: "**** done install.upgrade the host"
 - ceph.restart:
     daemons: [mon.*, mgr.*]
@@ -42,7 +41,7 @@ tasks:
     mon.a:
     - ceph versions
     - ceph osd dump -f json-pretty
-    - ceph osd require-osd-release quincy
+    - ceph osd require-osd-release squid
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
 - ceph.healthy:
 - print: "**** done ceph.restart"
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install.upgrade:
     client.0:
-      branch: quincy
 - print: "**** done install.upgrade on client.0"
 - ceph-fuse:
     client.0:

diff --git a/qa/suites/fs/upgrade/nofs/centos_8.stream.yaml b/qa/suites/fs/upgrade/nofs/centos_8.stream.yaml
diff --git a/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml b/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_9.stream.yaml
diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-from/reef.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-from/reef.yaml
@@ -0,0 +1,39 @@
+meta:
+- desc: |
+   install ceph/reef latest
+tasks:
+- install:
+    branch: reef
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+      - ceph-volume
+    extra_packages: ['librados2']
+- print: "**** done installing reef"
+- ceph:
+    log-ignorelist:
+      - 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 set-require-min-compat-client reef
+- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-from/squid.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-from/squid.yaml
@@ -0,0 +1,39 @@
+meta:
+- desc: |
+   install ceph/squid latest
+tasks:
+- install:
+    branch: squid
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+      - ceph-volume
+    extra_packages: ['librados2']
+- print: "**** done installing squid"
+- ceph:
+    log-ignorelist:
+      - 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 set-require-min-compat-client squid
+- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
@@ -23,7 +23,6 @@ tasks:
     - ceph fs dump
 - install.upgrade:
     mon.a:
-      branch: reef
 - print: "**** done install.upgrade"
 - ceph.restart:
     daemons: [mon.*, mgr.*]
@@ -39,7 +38,7 @@ tasks:
     - ceph versions
     - ceph osd dump -f json-pretty
     - ceph fs dump
-    - ceph osd require-osd-release quincy
+    - ceph osd require-osd-release squid
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
 - ceph.healthy:
 - print: "**** done ceph.restart"
diff --git a/qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_9.stream.yaml
diff --git a/...rade/upgraded_client/tasks/0-install.yaml → ...graded_client/tasks/0-install/quincy.yaml b/...rade/upgraded_client/tasks/0-install.yaml → ...graded_client/tasks/0-install/quincy.yaml
@@ -1,15 +1,9 @@
-teuthology:
-  premerge: |
-            local branch = yaml.teuthology.branch
-            yaml_fragment['tasks'][0]['install']['branch'] = tostring(branch)
-            print_branch = "**** done installing "..tostring(branch)
-            yaml_fragment['tasks'][1]['print'] = print_branch
-            local exec = yaml_fragment['tasks'][3]['exec']['osd.0']
-            local set_compat = "ceph osd set-require-min-compat-client "..tostring(branch)
-            py_attrgetter(exec).append(set_compat)
+meta:
+- desc: |
+   install ceph/quincy latest
 tasks:
 - install:
-    branch: []
+    branch: quincy
     exclude_packages:
       - cephadm
       - ceph-mgr-cephadm
@@ -33,7 +27,7 @@ tasks:
       - NetworkManager
       - iproute
       - util-linux
-- print: []
+- print: "**** done installing quincy"
 - ceph:
     log-ignorelist:
       - overall HEALTH_
@@ -54,5 +48,6 @@ tasks:
         mon warn on pool no app: false
         ms bind msgr2: false
 - exec:
-    osd.0: []
+    osd.0:
+      - ceph osd set-require-min-compat-client quincy
 - print: "**** done ceph"