Merge pull request ceph#60927 from ljflores/wip-tracker-69107

qa/workunits/mon: ensure election strategy is "connectivity" for stretch mode
Reviewed-by: Kamoltat Sirivadhna <[email protected]>

qa/suites/rados/singleton/all/stretch-mode-5-mons-8-osds.yaml

@@ -26,7 +26,6 @@ overrides:
   ceph:
     conf:
       global:
-        mon election default strategy: 3
         osd pool default size: 3
         osd pool default min size: 2
       mon:
@@ -55,4 +54,4 @@ tasks:
         - mon/mon-stretch-mode-5-mons-8-osds.sh
 - cephfs_test_runner:
     modules:
-      - tasks.stretch_mode_disable_enable
+      - tasks.stretch_mode_disable_enable

qa/workunits/mon/mon-stretch-mode-5-mons-8-osds.sh

@@ -9,6 +9,10 @@ if [ $NUM_OSDS_UP -lt 8 ]; then
     exit 1
 fi
 
+# ensure election strategy is set to "connectivity"
+# See https://tracker.ceph.com/issues/69107
+ceph mon set election_strategy connectivity
+
 for dc in dc1 dc2
     do
       ceph osd crush add-bucket $dc datacenter
@@ -65,4 +69,4 @@ EOF
 crushtool --compile crushmap_modified.txt -o crushmap.bin
 ceph osd setcrushmap -i crushmap.bin
 
-ceph mon enable_stretch_mode e stretch_rule datacenter
+ceph mon enable_stretch_mode e stretch_rule datacenter