Merge pull request ceph#17504 from dillaman/wip-21251

qa/suites/rbd: miscellaneous test fixes Reviewed-by: Mykola Golub <[email protected]>
blmt · Sep 7, 2017 · f618508 · f618508
2 parents 24ed122 + 27194c3
commit f618508
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 20 deletions.
diff --git a/qa/suites/rbd/cli/pool/ec-data-pool.yaml b/qa/suites/rbd/cli/pool/ec-data-pool.yaml
@@ -21,10 +21,6 @@ overrides:
       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

diff --git a/qa/suites/rbd/librbd/pool/ec-data-pool.yaml b/qa/suites/rbd/librbd/pool/ec-data-pool.yaml
@@ -18,10 +18,6 @@ overrides:
       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

diff --git a/qa/suites/rbd/maintenance/workloads/dynamic_features_no_cache.yaml b/qa/suites/rbd/maintenance/workloads/dynamic_features_no_cache.yaml
@@ -1,5 +1,5 @@
-tasks:
-- ceph:
+overrides:
+  ceph:
     conf:
       client:
         rbd cache: false

diff --git a/qa/suites/rbd/mirror/cluster/2-node.yaml b/qa/suites/rbd/mirror/cluster/2-node.yaml
@@ -1,18 +1,14 @@
 meta:
-- desc: 2 ceph clusters with 3 mons and 3 osds each
+- desc: 2 ceph clusters with 1 mon and 3 osds each
 roles:
 - - cluster1.mon.a
-  - cluster1.mon.b
   - cluster1.mgr.x
   - cluster1.osd.0
   - cluster1.osd.1
   - cluster1.osd.2
-  - cluster2.mon.c
   - cluster1.client.0
   - cluster2.client.0
-- - cluster1.mon.c
-  - cluster2.mon.a
-  - cluster2.mon.b
+- - cluster2.mon.a
   - cluster2.mgr.x
   - cluster2.osd.0
   - cluster2.osd.1

diff --git a/qa/suites/rbd/qemu/pool/ec-data-pool.yaml b/qa/suites/rbd/qemu/pool/ec-data-pool.yaml
@@ -18,10 +18,6 @@ overrides:
       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