From: Joao Eduardo Luis <joao@suse.de>
Date: Wed, 21 Feb 2018 12:37:56 +0000 (+0000)
Subject: qa: enable mon osdmap pruning on 'rados/' suites
X-Git-Tag: v13.1.0~393^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3997eed4dbe6d419a1e18fe114f30521364abb24;p=ceph.git

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 2030acb90836..c0857e14f279 100644
--- 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 9e2b5b188a1b..e8e2007f86d3 100644
--- 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 8962ff1ebe18..7b55097f77b6 100644
--- 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 2a8087f8b73f..8721fd181883 100644
--- 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 2030acb90836..c0857e14f279 100644
--- 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: