Merge pull request #234 from ceph/wip-dzaddscrub

Add scrub_test and repair_test to rados basic suite

Reviewed-by: Loic Dachary <ldachary@redhat.com>

suites/rados/basic/tasks/repair_test.yaml

@@ -0,0 +1,11 @@
+overrides:
+  ceph:
+    log-whitelist: ['candidate had a read error', 'deep-scrub 0 missing, 1 inconsistent objects', 'deep-scrub 0 missing, 4 inconsistent objects', 'deep-scrub 1 errors', 'deep-scrub 4 errors', '!= known omap_digest', 'repair 0 missing, 1 inconsistent objects', 'repair 0 missing, 4 inconsistent objects', 'repair 1 errors, 1 fixed', 'repair 4 errors, 4 fixed', 'scrub 0 missing, 1 inconsistent', 'scrub 1 errors', 'size 1 != known size']
+    conf:
+      osd:
+        filestore debug inject read err : true
+tasks:
+- install:
+- ceph:
+- repair_test:
+

suites/rados/basic/tasks/scrub_test.yaml

@@ -0,0 +1,13 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - '!= known digest'
+    - '!= known omap_digest'
+    - deep-scrub 0 missing, 1 inconsistent objects
+    - deep-scrub 1 errors
+    - repair 0 missing, 1 inconsistent objects
+    - repair 1 errors, 1 fixed
+tasks:
+- install:
+- ceph:
+- scrub_test:

tasks/repair_test.py

@@ -282,6 +282,12 @@ def task(ctx, config):
             logger=log.getChild('ceph_manager')
             )
 
+    num_osds = teuthology.num_instances_of_type(ctx.cluster, 'osd')
+    log.info('num_osds is %s' % num_osds)
+
+    while len(ctx.manager.get_osd_status()['up']) < num_osds:
+        time.sleep(10)
+
     tests = [
         gen_repair_test_1(mdataerr(ctx), choose_primary(ctx), "scrub"),
         gen_repair_test_1(mdataerr(ctx), choose_replica(ctx), "scrub"),