From: Samuel Just <sjust@redhat.com>
Date: Fri, 20 Mar 2015 18:24:22 +0000 (-0700)
Subject: rados/thrash*: make scrubs happen a lot
X-Git-Tag: v10.2.6~165^2^2~515^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d8bc2127f753fb5b935af6c3607e39b077e83d2;p=ceph.git

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 f5b1ad0f714..fade054b1b7 100644
--- 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 c22ac52e7ff..c37147fda22 100644
--- 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 5c8c6ecad95..9ba1b9e5867 100644
--- 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 dcde7251aff..744761d8cce 100644
--- 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 dc9c3d5a82f..fabfc4f8c40 100644
--- 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 fd7fd17957d..016563bd8ea 100644
--- 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 b292acc7f2c..0bb136ddfea 100644
--- 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 6131b00012d..4a94f50d829 100644
--- 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