]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: Don't create rbd pool because it creates an object
authorDavid Zafman <dzafman@redhat.com>
Mon, 11 Mar 2019 22:30:28 +0000 (15:30 -0700)
committerDavid Zafman <dzafman@redhat.com>
Mon, 11 Mar 2019 23:57:51 +0000 (16:57 -0700)
This also reverts commit 10b9626ea7b09e7c124067a2ce08a76eea073c9c.

Fixes: http://tracker.ceph.com/issues/38631
Signed-off-by: David Zafman <dzafman@redhat.com>
qa/standalone/scrub/osd-scrub-repair.sh

index 9f285d5cd79d1f294c882f7920efcd4be85a6535..a81ad10e366c2fc45efc3f6465d96f2256c0af97 100755 (executable)
@@ -350,8 +350,6 @@ function unfound_erasure_coded() {
             run_osd $dir $id || return 1
        fi
     done
-    create_rbd_pool || return 1
-    wait_for_clean || return 1
 
     create_ec_pool $poolname $allow_overwrites k=2 m=2 || return 1
 
@@ -384,12 +382,12 @@ function unfound_erasure_coded() {
     #
     # it may take a bit to appear due to mon/mgr asynchrony
     for f in `seq 1 60`; do
-       ceph -s | grep "1/2 objects unfound" && break
+       ceph -s | grep "1/1 objects unfound" && break
        sleep 1
     done
     ceph -s|grep "4 up" || return 1
     ceph -s|grep "4 in" || return 1
-    ceph -s|grep "1/2 objects unfound" || return 1
+    ceph -s|grep "1/1 objects unfound" || return 1
 
     teardown $dir || return 1
 }