]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa/standalone/osd/osd-fast-mark-down: use v1 addr w/ simplemessenger
authorSage Weil <sage@redhat.com>
Wed, 19 Dec 2018 16:03:48 +0000 (10:03 -0600)
committerSage Weil <sage@redhat.com>
Thu, 3 Jan 2019 17:17:31 +0000 (11:17 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
qa/standalone/osd/osd-fast-mark-down.sh

index 6a95b226744617872d6d0085d4c5d27e8dc0985b..cf5851c25ca8fb26d55497bc59c9cde21d1fd9ad 100755 (executable)
@@ -26,7 +26,6 @@ function run() {
     export CEPH_MON="127.0.0.1:7126" # git grep '\<7126\>' : there must be only one
     export CEPH_ARGS
     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 "
@@ -36,11 +35,12 @@ function run() {
     CEPH_ARGS=$OLD_ARGS"--osd-fast-fail-on-connection-refused=true "
     OLD_ARGS=$CEPH_ARGS
 
-    CEPH_ARGS+="--ms_type=simple"
+    # force v1 addr here for simple's benefit
+    CEPH_ARGS+="--ms_type=simple --mon-host=v1:$CEPH_MON"
     echo "Testing simple msgr..."
     test_fast_kill $dir || return 1
 
-    CEPH_ARGS=$OLD_ARGS"--ms_type=async"
+    CEPH_ARGS=$OLD_ARGS"--ms_type=async --mon-host=$CEPH_MON"
     echo "Testing async msgr..."
     test_fast_kill $dir || return 1