diff options
| author | Kamoltat (Junior) Sirivadhna <ksirivad@redhat.com> | 2024-12-09 20:32:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-09 20:32:07 +0100 |
| commit | 2676d3ede1bb529316e2a067167a05a276c6c00e (patch) | |
| tree | 7d91f28a05decbc79ec57fd92d159bcd830e95f4 /qa | |
| parent | Merge pull request #60998 from MaxKellermann/test_time__using_mono_clock (diff) | |
| parent | qa/workunits/mon: ensure election strategy is "connectivity" for stretch mode (diff) | |
| download | ceph-2676d3ede1bb529316e2a067167a05a276c6c00e.tar.xz ceph-2676d3ede1bb529316e2a067167a05a276c6c00e.zip | |
Merge pull request #60927 from ljflores/wip-tracker-69107
qa/workunits/mon: ensure election strategy is "connectivity" for stretch mode
Reviewed-by: Kamoltat Sirivadhna <ksirivad@redhat.com>
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/suites/rados/singleton/all/stretch-mode-5-mons-8-osds.yaml | 3 | ||||
| -rwxr-xr-x | qa/workunits/mon/mon-stretch-mode-5-mons-8-osds.sh | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/qa/suites/rados/singleton/all/stretch-mode-5-mons-8-osds.yaml b/qa/suites/rados/singleton/all/stretch-mode-5-mons-8-osds.yaml index d7b10c50a94..69a54b0f1b7 100644 --- a/qa/suites/rados/singleton/all/stretch-mode-5-mons-8-osds.yaml +++ b/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
\ No newline at end of file + - tasks.stretch_mode_disable_enable diff --git a/qa/workunits/mon/mon-stretch-mode-5-mons-8-osds.sh b/qa/workunits/mon/mon-stretch-mode-5-mons-8-osds.sh index ded13854160..827fb0a0b13 100755 --- a/qa/workunits/mon/mon-stretch-mode-5-mons-8-osds.sh +++ b/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
\ No newline at end of file +ceph mon enable_stretch_mode e stretch_rule datacenter |