From: Loic Dachary Date: Wed, 9 Dec 2015 00:41:42 +0000 (+0100) Subject: tests: --osd-scrub-load-threshold=2000 for more consistency X-Git-Tag: v10.0.2~74^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6871%2Fhead;p=ceph.git tests: --osd-scrub-load-threshold=2000 for more consistency In a test environment, consistency is more important than performances. Effectively disable the test that would postpone a scrub depending on the load average. It is assumed that a machine with a load average higher than 2000 won't be useable anyway. http://tracker.ceph.com/issues/14027 Refs: #14027 Signed-off-by: Loic Dachary --- diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh index 3c7bc2e5287c..d1c13d8a685f 100755 --- a/qa/workunits/ceph-helpers.sh +++ b/qa/workunits/ceph-helpers.sh @@ -491,6 +491,7 @@ function activate_osd() { ceph_args+=" --osd-backfill-full-ratio=.99" ceph_args+=" --osd-failsafe-full-ratio=.99" ceph_args+=" --osd-journal-size=100" + ceph_args+=" --osd-scrub-load-threshold=2000" ceph_args+=" --osd-data=$osd_data" ceph_args+=" --chdir=" ceph_args+=" --erasure-code-dir=.libs" diff --git a/src/vstart.sh b/src/vstart.sh index 7e3204738498..8a5b52c0505b 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -460,7 +460,7 @@ $DAEMONOPTS osd journal size = 100 osd class tmp = out osd class dir = $OBJCLASS_PATH - osd scrub load threshold = 5.0 + osd scrub load threshold = 2000.0 osd debug op order = true filestore wbthrottle xfs ios start flusher = 10 filestore wbthrottle xfs ios hard limit = 20