From 4d8b0c29bf6a8295ae793a555d26fd48f8a178ae Mon Sep 17 00:00:00 2001 From: Kamoltat Date: Wed, 30 Nov 2022 22:51:02 +0000 Subject: [PATCH] qa/standalone/mon: remove --mon-inital-members setting Problem: --mon-initial-members does nothing but causes monmap to populate ``removed_ranks`` because the way we start monitors in standalone tests uses ``run_mon $dir $id ..`` on each mon. Regardless of --mon-initial-members=a,b,c, if we set --mon-host=$MONA,$MONB,$MONC (which we do every single tests), everytime we run a monitor (e.g.,run mon.b) it will pre-build our monmap with ``` noname-a=mon.noname-a addrs v2:127.0.0.1:7127/0, b=mon.b addrs v2:127.0.0.1:7128/0, noname-c=mon.noname-c addrs v2:127.0.0.1:7129/0, ``` Now, with --mon-initial-members=a,b,c we are letting monmap know that we should have initial members name: a,b,c, which we only have `b` as a match. So what ``MonMap::set_initial_members`` do is that it will remove noname-a and noname-c which will populate `removed_ranks`. Solution: remove all instances of --mon-initial-members in the standalone test as it has no impact on the nature of the tests themselves. Fixes: https://tracker.ceph.com/issues/58132 Signed-off-by: Kamoltat --- qa/standalone/ceph-helpers.sh | 2 +- qa/standalone/mon/misc.sh | 1 - qa/standalone/mon/mon-bind.sh | 4 ---- qa/standalone/mon/mon-handle-forward.sh | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh index 0901815ee9bb2..07e53321c4fe1 100755 --- a/qa/standalone/ceph-helpers.sh +++ b/qa/standalone/ceph-helpers.sh @@ -496,7 +496,7 @@ function test_run_mon() { setup $dir || return 1 - run_mon $dir a --mon-initial-members=a || return 1 + run_mon $dir a || return 1 ceph mon dump | grep "mon.a" || return 1 kill_daemons $dir || return 1 diff --git a/qa/standalone/mon/misc.sh b/qa/standalone/mon/misc.sh index aef109633fb17..c7fc6d441171f 100755 --- a/qa/standalone/mon/misc.sh +++ b/qa/standalone/mon/misc.sh @@ -169,7 +169,6 @@ function TEST_mon_features() { MONC=127.0.0.1:7129 # git grep '\<7129\>' ; there must be only one CEPH_ARGS_orig=$CEPH_ARGS CEPH_ARGS="--fsid=$fsid --auth-supported=none " - CEPH_ARGS+="--mon-initial-members=a,b,c " CEPH_ARGS+="--mon-host=$MONA,$MONB,$MONC " CEPH_ARGS+="--mon-debug-no-initial-persistent-features " CEPH_ARGS+="--mon-debug-no-require-reef " diff --git a/qa/standalone/mon/mon-bind.sh b/qa/standalone/mon/mon-bind.sh index b0a092a533abb..41982b9160a9e 100755 --- a/qa/standalone/mon/mon-bind.sh +++ b/qa/standalone/mon/mon-bind.sh @@ -60,7 +60,6 @@ function TEST_mon_client_connect_fails() { # start the mon with a public-bind-addr that is different # from the public-addr. - CEPH_ARGS+="--mon-initial-members=a " CEPH_ARGS+="--mon-host=${MON_IP}:${MONA_PUBLIC} " run_mon $dir a --mon-host=${MON_IP}:${MONA_PUBLIC} --public-bind-addr=${MON_IP}:${MONA_BIND} || return 1 @@ -74,7 +73,6 @@ function TEST_mon_client_connect() { # start the mon with a public-bind-addr that is different # from the public-addr. - CEPH_ARGS+="--mon-initial-members=a " CEPH_ARGS+="--mon-host=${MON_IP}:${MONA_PUBLIC} " run_mon $dir a --mon-host=${MON_IP}:${MONA_PUBLIC} --public-bind-addr=${MON_IP}:${MONA_BIND} || return 1 @@ -90,7 +88,6 @@ function TEST_mon_quorum() { # start the mon with a public-bind-addr that is different # from the public-addr. - CEPH_ARGS+="--mon-initial-members=a,b,c " CEPH_ARGS+="--mon-host=${MON_IP}:${MONA_PUBLIC},${MON_IP}:${MONB_PUBLIC},${MON_IP}:${MONC_PUBLIC} " run_mon $dir a --public-addr=${MON_IP}:${MONA_PUBLIC} --public-bind-addr=${MON_IP}:${MONA_BIND} || return 1 run_mon $dir b --public-addr=${MON_IP}:${MONB_PUBLIC} --public-bind-addr=${MON_IP}:${MONB_BIND} || return 1 @@ -117,7 +114,6 @@ function TEST_put_get() { # start the mon with a public-bind-addr that is different # from the public-addr. - CEPH_ARGS+="--mon-initial-members=a,b,c " CEPH_ARGS+="--mon-host=${MON_IP}:${MONA_PUBLIC},${MON_IP}:${MONB_PUBLIC},${MON_IP}:${MONC_PUBLIC} " run_mon $dir a --public-addr=${MON_IP}:${MONA_PUBLIC} --public-bind-addr=${MON_IP}:${MONA_BIND} || return 1 run_mon $dir b --public-addr=${MON_IP}:${MONB_PUBLIC} --public-bind-addr=${MON_IP}:${MONB_BIND} || return 1 diff --git a/qa/standalone/mon/mon-handle-forward.sh b/qa/standalone/mon/mon-handle-forward.sh index 8633959d5f2a4..01c8f130f5462 100755 --- a/qa/standalone/mon/mon-handle-forward.sh +++ b/qa/standalone/mon/mon-handle-forward.sh @@ -28,7 +28,7 @@ function run() { FSID=$(uuidgen) export CEPH_ARGS CEPH_ARGS+="--fsid=$FSID --auth-supported=none " - CEPH_ARGS+="--mon-initial-members=a,b --mon-host=$MONA,$MONB " + CEPH_ARGS+="--mon-host=$MONA,$MONB " run_mon $dir a --public-addr $MONA || return 1 run_mon $dir b --public-addr $MONB || return 1 ) -- 2.39.5