diff options
Diffstat (limited to 'qa/standalone/mon/misc.sh')
| -rwxr-xr-x | qa/standalone/mon/misc.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/qa/standalone/mon/misc.sh b/qa/standalone/mon/misc.sh index 28655dc5468..c03f7df2014 100755 --- a/qa/standalone/mon/misc.sh +++ b/qa/standalone/mon/misc.sh @@ -169,7 +169,7 @@ function TEST_mon_features() { 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-mimic " + CEPH_ARGS+="--mon-debug-no-require-nautilus " run_mon $dir a --public-addr $MONA || return 1 run_mon $dir b --public-addr $MONB || return 1 @@ -180,13 +180,15 @@ function TEST_mon_features() { jq_success "$jqinput" '.monmap.mons | length == 3' || return 1 # quorum contains two monitors jq_success "$jqinput" '.quorum | length == 2' || return 1 - # quorum's monitor features contain kraken, luminous, and mimic + # quorum's monitor features contain kraken, luminous, mimic, and nautilus jqfilter='.features.quorum_mon[]|select(. == "kraken")' jq_success "$jqinput" "$jqfilter" "kraken" || return 1 jqfilter='.features.quorum_mon[]|select(. == "luminous")' jq_success "$jqinput" "$jqfilter" "luminous" || return 1 jqfilter='.features.quorum_mon[]|select(. == "mimic")' jq_success "$jqinput" "$jqfilter" "mimic" || return 1 + jqfilter='.features.quorum_mon[]|select(. == "nautilus")' + jq_success "$jqinput" "$jqfilter" "nautilus" || return 1 # monmap must have no persistent features set, because we # don't currently have a quorum made out of all the monitors @@ -201,13 +203,15 @@ function TEST_mon_features() { # validate 'mon feature ls' jqinput="$(ceph mon feature ls --format=json 2>/dev/null)" - # k l m are supported + # k l m n are supported jqfilter='.all.supported[] | select(. == "kraken")' jq_success "$jqinput" "$jqfilter" "kraken" || return 1 jqfilter='.all.supported[] | select(. == "luminous")' jq_success "$jqinput" "$jqfilter" "luminous" || return 1 jqfilter='.all.supported[] | select(. == "mimic")' jq_success "$jqinput" "$jqfilter" "mimic" || return 1 + jqfilter='.all.supported[] | select(. == "nautilus")' + jq_success "$jqinput" "$jqfilter" "nautilus" || return 1 # start third monitor run_mon $dir c --public-addr $MONC || return 1 @@ -230,7 +234,7 @@ function TEST_mon_features() { # monmap must have not all k l m persistent # features set. - jqfilter='.monmap.features.persistent | length == 4' + jqfilter='.monmap.features.persistent | length == 5' jq_success "$jqinput" "$jqfilter" || return 1 jqfilter='.monmap.features.persistent[]|select(. == "kraken")' jq_success "$jqinput" "$jqfilter" "kraken" || return 1 @@ -240,6 +244,8 @@ function TEST_mon_features() { jq_success "$jqinput" "$jqfilter" "mimic" || return 1 jqfilter='.monmap.features.persistent[]|select(. == "osdmap-prune")' jq_success "$jqinput" "$jqfilter" "osdmap-prune" || return 1 + jqfilter='.monmap.features.persistent[]|select(. == "nautilus")' + jq_success "$jqinput" "$jqfilter" "nautilus" || return 1 CEPH_ARGS=$CEPH_ARGS_orig # that's all folks. thank you for tuning in. |