From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 22 Dec 2014 11:29:10 +0000 (+0100)
Subject: tests: remove spurious lines from osd-scrub-repair.sh
X-Git-Tag: v0.92~105^2~3^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=992e7eacf4e980c329a2702aa9be4984350d0b07;p=ceph.git

tests: remove spurious lines from osd-scrub-repair.sh

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

diff --git a/src/test/osd/osd-scrub-repair.sh b/src/test/osd/osd-scrub-repair.sh
index 8eb6d7c15b44..a91e5dab4ed5 100755
--- a/src/test/osd/osd-scrub-repair.sh
+++ b/src/test/osd/osd-scrub-repair.sh
@@ -91,31 +91,8 @@ function corrupt_and_repair_one() {
     objectstore_tool $dir $osd SOMETHING list-attrs || return 1
     rados --pool $poolname get SOMETHING $dir/COPY || return 1
     diff $dir/ORIGINAL $dir/COPY || return 1
-}
-    wait_for_clean || return 1
-
-    ceph osd set noscrub || return 1
-    ceph osd set nodeep-scrub || return 1
 
-    local payload=ABCDEF
-    echo $payload > $dir/ORIGINAL
-    #
-    # 1) add an object
-    #
-    rados --pool $poolname put SOMETHING $dir/ORIGINAL || return 1
-    #
-    # 2) remove the corresponding file from the OSD
-    #
-    objectstore_tool $dir $osd SOMETHING remove || return 1
-    #
-    # 3) repair the PG
-    #
-    local pg=$(get_pg $poolname SOMETHING)
-    repair $pg
-    #
-    # The file must be back
-    #
-    objectstore_tool $dir $osd SOMETHING list-attrs || return 1
+    wait_for_clean || return 1
 }
 
 main osd-scrub-repair "$@"