From: Piotr Dałek <git@predictor.org.pl>
Date: Tue, 22 Nov 2016 09:14:14 +0000 (+0100)
Subject: test/osd-fast-mark-down.sh: wrong assumption on first subtest
X-Git-Tag: v11.1.0~208^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=79f59e4fd56345f6db3c0bd32b3798d1ec7d83da;p=ceph-ci.git

test/osd-fast-mark-down.sh: wrong assumption on first subtest

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>
---

diff --git a/src/test/osd/osd-fast-mark-down.sh b/src/test/osd/osd-fast-mark-down.sh
index 0c612546bb2..e1bde834210 100755
--- a/src/test/osd/osd-fast-mark-down.sh
+++ b/src/test/osd/osd-fast-mark-down.sh
@@ -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"