rados/thrash*: make scrubs happen a lot

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/suites/rados/thrash-erasure-code/thrashers/default.yaml b/suites/rados/thrash-erasure-code/thrashers/default.yaml
index f5b1ad0f7145d3b8bc17c587ae38c482e2f41f4f..fade054b1b7cf7cc5223b6f1beec723a6d5e73a5 100644 (file)
--- a/suites/rados/thrash-erasure-code/thrashers/default.yaml
+++ b/suites/rados/thrash-erasure-code/thrashers/default.yaml
@@ -8,6 +8,8 @@ tasks:
       osd:
         osd debug reject backfill probability: .3
         osd max backfills: 1
+        osd scrub min interval: 60
+        osd scrub max interval: 120
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml b/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml
index c22ac52e7ff0272866d85b123209ab2d4c84091b..c37147fda2291d9c80dbda1b086a7c82b4aad506 100644 (file)
--- a/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml
+++ b/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml
@@ -5,6 +5,8 @@ overrides:
         mon min osdmap epochs: 2
       osd:
         osd map cache size: 1
+        osd scrub min interval: 60
+        osd scrub max interval: 120
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml b/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml
index 5c8c6ecad95389a68111de2883b8e4c58dcaeac2..9ba1b9e5867a5c65c389b1d8d5dfebe621ec74c1 100644 (file)
--- a/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml
+++ b/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml
@@ -4,6 +4,8 @@ tasks:
     conf:
       osd:
         osd max backfills: 1
+        osd scrub min interval: 60
+        osd scrub max interval: 120
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost

diff --git a/suites/rados/thrash-erasure-code/thrashers/pggrow.yaml b/suites/rados/thrash-erasure-code/thrashers/pggrow.yaml
index dcde7251aff3f2a1ecac897e67aa821ca41937d9..744761d8cce7e8cd3130592226d188da9e22d612 100644 (file)
--- a/suites/rados/thrash-erasure-code/thrashers/pggrow.yaml
+++ b/suites/rados/thrash-erasure-code/thrashers/pggrow.yaml
@@ -4,6 +4,10 @@ tasks:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
+    conf:
+      osd:
+        osd scrub min interval: 60
+        osd scrub max interval: 120
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 2

diff --git a/suites/rados/thrash/thrashers/default.yaml b/suites/rados/thrash/thrashers/default.yaml
index dc9c3d5a82fbc408ea68e1328f08119884c61db2..fabfc4f8c402d8fc4c7b635e90b4b600feaafdb8 100644 (file)
--- a/suites/rados/thrash/thrashers/default.yaml
+++ b/suites/rados/thrash/thrashers/default.yaml
@@ -8,6 +8,8 @@ tasks:
       osd:
         osd debug reject backfill probability: .3
         osd max backfills: 1
+        osd scrub min interval: 60
+        osd scrub max interval: 120
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/suites/rados/thrash/thrashers/mapgap.yaml b/suites/rados/thrash/thrashers/mapgap.yaml
index fd7fd17957db7004c6b5759fd5015026bbe1968c..016563bd8eaa5f979e50b9ccd67983b90324e39f 100644 (file)
--- a/suites/rados/thrash/thrashers/mapgap.yaml
+++ b/suites/rados/thrash/thrashers/mapgap.yaml
@@ -5,6 +5,8 @@ overrides:
         mon min osdmap epochs: 2
       osd:
         osd map cache size: 1
+        osd scrub min interval: 60
+        osd scrub max interval: 120
 tasks:
 - install:
 - ceph:

diff --git a/suites/rados/thrash/thrashers/morepggrow.yaml b/suites/rados/thrash/thrashers/morepggrow.yaml
index b292acc7f2c0317ae3080df6f264c652ccc1adee..0bb136ddfea8992ed3e6dd1e35c763d238baeb1d 100644 (file)
--- a/suites/rados/thrash/thrashers/morepggrow.yaml
+++ b/suites/rados/thrash/thrashers/morepggrow.yaml
@@ -4,6 +4,8 @@ tasks:
     conf:
       osd:
         osd max backfills: 1
+        osd scrub min interval: 60
+        osd scrub max interval: 120
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost

diff --git a/suites/rados/thrash/thrashers/pggrow.yaml b/suites/rados/thrash/thrashers/pggrow.yaml
index 6131b00012d80fc0fc04779bcd94fb49808fe155..4a94f50d8293a0686ccf83ccff626a5a091b60a7 100644 (file)
--- a/suites/rados/thrash/thrashers/pggrow.yaml
+++ b/suites/rados/thrash/thrashers/pggrow.yaml
@@ -4,6 +4,10 @@ tasks:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
+    conf:
+      osd:
+        osd scrub min interval: 60
+        osd scrub max interval: 120
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 2