]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/osd-fast-mark-down.sh: wrong assumption on first subtest 12123/head
authorPiotr Dałek <git@predictor.org.pl>
Tue, 22 Nov 2016 09:14:14 +0000 (10:14 +0100)
committerPiotr Dałek <git@predictor.org.pl>
Tue, 22 Nov 2016 09:14:14 +0000 (10:14 +0100)
First subtest checks for proper behavior when "osd fast fail on
connection refused" is disabled, yet it doesn't disable it and
fails, as is it enabled by default.

Signed-off-by: Piotr Dałek <git@predictor.org.pl>
src/test/osd/osd-fast-mark-down.sh

index 0c612546bb274f9b261da4df5eea1f7aa15f4e93..e1bde8342107385debeeb370f859c585a65688d5 100755 (executable)
@@ -29,10 +29,12 @@ function run() {
     CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none "
     CEPH_ARGS+="--mon-host=$CEPH_MON "
     
+    OLD_ARGS=$CEPH_ARGS
+    CEPH_ARGS+="--osd-fast-fail-on-connection-refused=false "
     echo "Ensuring old behavior is there..."
-    test_fast_kill $dir && (echo "OSDs died too early!" ; return 1)
+    test_fast_kill $dir && (echo "OSDs died too early! Old behavior doesn't work." ; return 1)
 
-    CEPH_ARGS+="--osd-fast-fail-on-connection-refused=true"
+    CEPH_ARGS=$OLD_ARGS"--osd-fast-fail-on-connection-refused=true "
     OLD_ARGS=$CEPH_ARGS
 
     CEPH_ARGS+="--ms_type=simple"