qa: enable mon osdmap pruning on 'rados/' suites

Signed-off-by: Joao Eduardo Luis <joao@suse.de>

diff --git a/qa/suites/rados/basic/ceph.yaml b/qa/suites/rados/basic/ceph.yaml
index 2030acb90836ccb748eab56844f8342763b3dd8c..c0857e14f27909511f912c5c6eaf83444ab370d6 100644 (file)
--- a/qa/suites/rados/basic/ceph.yaml
+++ b/qa/suites/rados/basic/ceph.yaml
@@ -1,3 +1,13 @@
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon min osdmap epochs: 50
+        paxos service trim min: 10
+        # prune full osdmaps regularly
+        mon osdmap full prune min: 15
+        mon osdmap full prune interval: 2
+        mon osdmap full prune txsize: 2
 tasks:
 - install:
 - ceph:

diff --git a/qa/suites/rados/thrash/thrashers/default.yaml b/qa/suites/rados/thrash/thrashers/default.yaml
index 9e2b5b188a1b99b143eade09baedcbc999acb25b..e8e2007f86d323fe860383b06a3a705547683135 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/default.yaml
+++ b/qa/suites/rados/thrash/thrashers/default.yaml
@@ -10,6 +10,13 @@ overrides:
         osd scrub max interval: 120
         osd max backfills: 3
         osd snap trim sleep: 2
+      mon:
+        mon min osdmap epochs: 50
+        paxos service trim min: 10
+        # prune full osdmaps regularly
+        mon osdmap full prune min: 15
+        mon osdmap full prune interval: 2
+        mon osdmap full prune txsize: 2
 tasks:
 - thrashosds:
     timeout: 1200

diff --git a/qa/suites/rados/thrash/thrashers/mapgap.yaml b/qa/suites/rados/thrash/thrashers/mapgap.yaml
index 8962ff1ebe181e1e822afd067a391d0127eac62a..7b55097f77b6ba5edf9f2cdd0ff9fc05965dc7ca 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/mapgap.yaml
+++ b/qa/suites/rados/thrash/thrashers/mapgap.yaml
@@ -6,7 +6,12 @@ overrides:
     - osd_map_cache_size
     conf:
       mon:
-        mon min osdmap epochs: 2
+        mon min osdmap epochs: 50
+        paxos service trim min: 10
+        # prune full osdmaps regularly
+        mon osdmap full prune min: 15
+        mon osdmap full prune interval: 2
+        mon osdmap full prune txsize: 2
       osd:
         osd map cache size: 1
         osd scrub min interval: 60

diff --git a/qa/suites/rados/thrash/thrashers/pggrow.yaml b/qa/suites/rados/thrash/thrashers/pggrow.yaml
index 2a8087f8b73f29a7cee2e56751a3bb888ef3b67a..8721fd18188391b7ed105313e5ab9cdbd0279697 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/pggrow.yaml
+++ b/qa/suites/rados/thrash/thrashers/pggrow.yaml
@@ -10,6 +10,13 @@ overrides:
         filestore odsync write: true
         osd max backfills: 2
         osd snap trim sleep: .5
+      mon:
+        mon min osdmap epochs: 50
+        paxos service trim min: 10
+        # prune full osdmaps regularly
+        mon osdmap full prune min: 15
+        mon osdmap full prune interval: 2
+        mon osdmap full prune txsize: 2
 tasks:
 - thrashosds:
     timeout: 1200

diff --git a/qa/suites/rados/verify/ceph.yaml b/qa/suites/rados/verify/ceph.yaml
index 2030acb90836ccb748eab56844f8342763b3dd8c..c0857e14f27909511f912c5c6eaf83444ab370d6 100644 (file)
--- a/qa/suites/rados/verify/ceph.yaml
+++ b/qa/suites/rados/verify/ceph.yaml
@@ -1,3 +1,13 @@
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon min osdmap epochs: 50
+        paxos service trim min: 10
+        # prune full osdmaps regularly
+        mon osdmap full prune min: 15
+        mon osdmap full prune interval: 2
+        mon osdmap full prune txsize: 2
 tasks:
 - install:
 - ceph: