ceph.conf: more frequent osd scrubbing; remove old cruft

diff --git a/teuthology/ceph.conf b/teuthology/ceph.conf
index 4d991c4aa8f07540dec4ba99e0ac96852ebcb632..0a23cfb91e1e01ae31ca603426f89de2faa241f8 100644 (file)
--- a/teuthology/ceph.conf
+++ b/teuthology/ceph.conf
@@ -1,8 +1,6 @@
 [global]
         keyring = /tmp/cephtest/ceph.keyring
        log file = /tmp/cephtest/archive/log/$name.log
-        logger = true
-       logger dir = /tmp/cephtest/archive/profiling-logger
        chdir = ""
        pid file = $name.pid
         auth supported = cephx
@@ -13,20 +11,24 @@
         mon data = /tmp/cephtest/data/mon.$id
 
 [osd]
-        osd scrub load threshold = 5.0
-        lockdep = 1
         osd data = /tmp/cephtest/data/osd.$id.data
         osd journal = /tmp/cephtest/data/osd.$id.journal
         osd journal size = 100
         keyring = /tmp/cephtest/data/osd.$id.keyring
         osd class dir = /tmp/cephtest/binary/usr/local/lib/rados-classes
+        lockdep = 1
+
+       ; make scrubbing more frequent
+        osd scrub load threshold = 5.0
+       osd scrub max interval = 600
+
 
 [mds]
+        keyring = /tmp/cephtest/data/mds.$id.keyring
         lockdep = 1
         mds debug scatterstat = true
         mds verify scatter = true
         mds debug frag = true
-        keyring = /tmp/cephtest/data/mds.$id.keyring
 
 [client]
         keyring = /tmp/cephtest/data/client.$id.keyring