Add test for ec with k=3 and m=2 and also up the pg's

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>

diff --git a/qa/suites/rbd/librbd/pool/ec-data-pool.yaml b/qa/suites/rbd/librbd/pool/ec-data-pool.yaml
index a63ab270340745cb2b10872c2091fb9a5d2be64b..ec831078823b304359b733c96e7365453e3e3831 100644 (file)
--- a/qa/suites/rbd/librbd/pool/ec-data-pool.yaml
+++ b/qa/suites/rbd/librbd/pool/ec-data-pool.yaml
@@ -2,7 +2,7 @@ tasks:
 - exec:
     client.0:
       - sudo ceph osd erasure-code-profile set teuthologyprofile crush-failure-domain=osd m=1 k=2
-      - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile
+      - sudo ceph osd pool create datapool 128 128 erasure teuthologyprofile
       - sudo ceph osd pool set datapool allow_ec_overwrites true
       - rbd pool init datapool
 
@@ -22,7 +22,6 @@ overrides:
         debug bdev: 20
         debug bluefs: 20
         debug rocksdb: 10
-        enable experimental unrecoverable data corrupting features: "*"
         osd debug randomize hobject sort order: false
 # this doesn't work with failures bc the log writes are not atomic across the two backends
 #        bluestore bluefs env mirror: true

diff --git a/qa/suites/rbd/librbd/pool/ec_k3_m2.yaml b/qa/suites/rbd/librbd/pool/ec_k3_m2.yaml
new file mode 100644 (file)
index 0000000..6656b8b
--- /dev/null
+++ b/qa/suites/rbd/librbd/pool/ec_k3_m2.yaml
@@ -0,0 +1,28 @@
+tasks:
+- exec:
+    client.0:
+      - sudo ceph osd erasure-code-profile set teuthologyprofile crush-failure-domain=osd m=2 k=3
+      - sudo ceph osd pool create datapool 128 128 erasure teuthologyprofile
+      - sudo ceph osd pool set datapool allow_ec_overwrites true
+      - rbd pool init datapool
+
+overrides:
+  thrashosds:
+    bdev_inject_crash: 2
+    bdev_inject_crash_probability: .5
+  ceph:
+    fs: xfs
+    conf:
+      client:
+        rbd default data pool: datapool
+      osd: # force bluestore since it's required for ec overwrites
+        osd objectstore: bluestore
+        bluestore block size: 96636764160
+        debug bluestore: 30
+        debug bdev: 20
+        debug bluefs: 20
+        debug rocksdb: 10
+        enable experimental unrecoverable data corrupting features: "*"
+        osd debug randomize hobject sort order: false
+# this doesn't work with failures bc the log writes are not atomic across the two backends
+#        bluestore bluefs env mirror: true

diff --git a/qa/suites/rbd/librbd/pool/replicated-data-pool.yaml b/qa/suites/rbd/librbd/pool/replicated-data-pool.yaml
index c5647dba1c68779ee5d4e83ad929a490c38e9138..6f495b5ed5eed7431954fa95529724253ac91f87 100644 (file)
--- a/qa/suites/rbd/librbd/pool/replicated-data-pool.yaml
+++ b/qa/suites/rbd/librbd/pool/replicated-data-pool.yaml
@@ -1,7 +1,7 @@
 tasks:
 - exec:
     client.0:
-      - sudo ceph osd pool create datapool 4
+      - sudo ceph osd pool create datapool 128 128
       - rbd pool init datapool
 
 overrides:

diff --git a/qa/suites/rbd/librbd/pool/small-cache-pool.yaml b/qa/suites/rbd/librbd/pool/small-cache-pool.yaml
index 1b5056573543048929c95acbb31c5f3a8595a9f4..342492c69738ffbf8d6d31df01a875f567f984aa 100644 (file)
--- a/qa/suites/rbd/librbd/pool/small-cache-pool.yaml
+++ b/qa/suites/rbd/librbd/pool/small-cache-pool.yaml
@@ -7,7 +7,7 @@ overrides:
 tasks:
 - exec:
     client.0:
-      - sudo ceph osd pool create cache 4
+      - sudo ceph osd pool create cache 128 128
       - sudo ceph osd tier add rbd cache
       - sudo ceph osd tier cache-mode cache writeback
       - sudo ceph osd tier set-overlay rbd cache