Merge pull request #20729 from dillaman/wip-22738

qa/suites/rbd: segregated v1 image format tests Reviewed-by: Mykola Golub <mgolub@suse.com>
2025-04-01 23:02:17 +00:00 · 2018-03-07 22:53:12 +02:00 · 2018-03-07 22:53:12 +02:00 · 9ffbac6fc5
commit 9ffbac6fc5
parent a1c5a552b8 4046f46d0e
18 changed files with 37 additions and 26 deletions
--- a/qa/suites/rbd/basic/msgr-failures/many.yaml
+++ b/qa/suites/rbd/basic/msgr-failures/many.yaml
@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms inject socket failures: 1000
-overrides:
-  ceph:
-    log-whitelist:
-      - \(MGR_DOWN\)
-      - No standby daemons
--- a/qa/suites/rbd/cli/features/defaults.yaml
+++ b/qa/suites/rbd/cli/features/defaults.yaml
@ -2,5 +2,4 @@ overrides:
  ceph:
    conf:
      client:
-        rbd default format: 2
        rbd default features: 61
--- a/qa/suites/rbd/cli/features/journaling.yaml
+++ b/qa/suites/rbd/cli/features/journaling.yaml
@ -2,5 +2,4 @@ overrides:
  ceph:
    conf:
      client:
-        rbd default format: 2
        rbd default features: 125
--- a/qa/suites/rbd/cli/features/layering.yaml
+++ b/qa/suites/rbd/cli/features/layering.yaml
@ -2,5 +2,4 @@ overrides:
  ceph:
    conf:
      client:
-        rbd default format: 2
        rbd default features: 1
--- a/qa/suites/rbd/cli/msgr-failures/many.yaml
+++ b/qa/suites/rbd/cli/msgr-failures/many.yaml
@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        ms inject socket failures: 1000
-overrides:
-  ceph:
-    log-whitelist:
-      - \(MGR_DOWN\)
-      - No standby daemons
--- a/qa/suites/rbd/cli_v1/%
+++ b/qa/suites/rbd/cli_v1/%
--- a/qa/suites/rbd/cli_v1/base/install.yaml
+++ b/qa/suites/rbd/cli_v1/base/install.yaml
@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph:
--- a/qa/suites/rbd/cli_v1/clusters
+++ b/qa/suites/rbd/cli_v1/clusters
@ -0,0 +1 @@
+../basic/clusters
--- a/qa/suites/rbd/cli_v1/features/format-1.yaml
+++ b/qa/suites/rbd/cli_v1/features/format-1.yaml
--- a/qa/suites/rbd/cli_v1/msgr-failures/few.yaml
+++ b/qa/suites/rbd/cli_v1/msgr-failures/few.yaml
@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms inject socket failures: 5000
--- a/qa/suites/rbd/cli_v1/objectstore
+++ b/qa/suites/rbd/cli_v1/objectstore
@ -0,0 +1 @@
+../../../objectstore
--- a/qa/suites/rbd/cli_v1/pool/none.yaml
+++ b/qa/suites/rbd/cli_v1/pool/none.yaml
--- a/qa/suites/rbd/cli_v1/pool/small-cache-pool.yaml
+++ b/qa/suites/rbd/cli_v1/pool/small-cache-pool.yaml
@ -0,0 +1,17 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - \(CACHE_POOL_NEAR_FULL\)
+      - \(CACHE_POOL_NO_HIT_SET\)
+tasks:
+- exec:
+    client.0:
+      - sudo ceph osd pool create cache 4
+      - sudo ceph osd tier add rbd cache
+      - sudo ceph osd tier cache-mode cache writeback
+      - sudo ceph osd tier set-overlay rbd cache
+      - sudo ceph osd pool set cache hit_set_type bloom
+      - sudo ceph osd pool set cache hit_set_count 8
+      - sudo ceph osd pool set cache hit_set_period 60
+      - sudo ceph osd pool set cache target_max_objects 250
--- a/qa/suites/rbd/cli_v1/workloads/rbd_cli_generic.yaml
+++ b/qa/suites/rbd/cli_v1/workloads/rbd_cli_generic.yaml
@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/cli_generic.sh
--- a/qa/suites/rbd/cli_v1/workloads/rbd_cli_import_export.yaml
+++ b/qa/suites/rbd/cli_v1/workloads/rbd_cli_import_export.yaml
@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rbd/import_export.sh
--- a/qa/suites/rbd/openstack/features/minimum.yaml
+++ b/qa/suites/rbd/openstack/features/minimum.yaml
@ -2,5 +2,4 @@ overrides:
  ceph:
    conf:
      client:
-        rbd default format: 2
        rbd default features: 1
--- a/qa/suites/rbd/qemu/features/defaults.yaml
+++ b/qa/suites/rbd/qemu/features/defaults.yaml
@ -2,5 +2,4 @@ overrides:
  ceph:
    conf:
      client:
-        rbd default format: 2
        rbd default features: 61
--- a/qa/suites/rbd/qemu/features/journaling.yaml
+++ b/qa/suites/rbd/qemu/features/journaling.yaml
@ -2,5 +2,4 @@ overrides:
  ceph:
    conf:
      client:
-        rbd default format: 2
        rbd default features: 125