From: Sage Weil <sage@redhat.com>
Date: Tue, 27 Feb 2018 22:25:21 +0000 (-0600)
Subject: qa/suites/rados/singleton/all/recovery_preemption: make test more reliable
X-Git-Tag: v13.1.0~390^2~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29a885c91526d54b01fae638a14d040c80e052a9;p=ceph.git

qa/suites/rados/singleton/all/recovery_preemption: make test more reliable

A 30 second run did only 7000 ops, which means ~50 log entires per pg...
not enough to trigger backfill.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/suites/rados/singleton/all/recovery-preemption.yaml b/qa/suites/rados/singleton/all/recovery-preemption.yaml
index 6b4bb04af272..868e3894a3e6 100644
--- a/qa/suites/rados/singleton/all/recovery-preemption.yaml
+++ b/qa/suites/rados/singleton/all/recovery-preemption.yaml
@@ -17,8 +17,9 @@ tasks:
     conf:
       osd:
         osd recovery sleep: .1
-        osd min pg log entries: 100
+        osd min pg log entries: 10
         osd max pg log entries: 1000
+        osd pg log trim min: 10
     log-whitelist:
       - \(POOL_APP_NOT_ENABLED\)
       - \(OSDMAP_FLAGS\)
@@ -30,6 +31,10 @@ tasks:
     osd.0:
       - ceph osd pool create foo 128
       - ceph osd pool application enable foo foo
+      - sleep 5
+- ceph.healthy:
+- exec:
+    osd.0:
       - rados -p foo bench 30 write -b 4096 --no-cleanup
       - ceph osd out 0
       - sleep 5