From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Dec 2018 16:03:48 +0000 (-0600)
Subject: qa/standalone/osd/osd-fast-mark-down: use v1 addr w/ simplemessenger
X-Git-Tag: v14.1.0~484^2~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b92be2ca9babec991a018343decb6885d58de60d;p=ceph.git

qa/standalone/osd/osd-fast-mark-down: use v1 addr w/ simplemessenger

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/standalone/osd/osd-fast-mark-down.sh b/qa/standalone/osd/osd-fast-mark-down.sh
index 6a95b226744..cf5851c25ca 100755
--- a/qa/standalone/osd/osd-fast-mark-down.sh
+++ b/qa/standalone/osd/osd-fast-mark-down.sh
@@ -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