From: Alex Ainscow Date: Fri, 7 Feb 2025 16:13:57 +0000 (-0500) Subject: tools/monmaptool: bump new cluster version to X X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d58b5c4be10f2749a834fb548003b5562feb75fe;p=ceph.git tools/monmaptool: bump new cluster version to X Signed-off-by: Alex Ainscow --- diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst index 6f746eae8f2a..244cf183f764 100644 --- a/doc/dev/release-checklists.rst +++ b/doc/dev/release-checklists.rst @@ -76,8 +76,8 @@ Compatsets Mon --- -- [ ] src/tools/monmaptool.cc: bump min_mon_release to X for created (new) clusters -- [ ] src/test/cli/monmaptool/8.t: update output for monmaptool to X +- [x] src/tools/monmaptool.cc: bump min_mon_release to X for created (new) clusters +- [x] src/test/cli/monmaptool/8.t: update output for monmaptool to X - [x] qa/standalone/mon/misc adjust `TEST_mon_features` (add X cases and adjust `--mon-debug-no-require-X`) - [x] qa/standalone/mon/misc bump up `jqfilter='.monmap.features.persistent | length == N'` to `N+1` - [x] mon/MgrMonitor.cc adjust `always_on_modules` diff --git a/src/test/cli/monmaptool/add-exists.t b/src/test/cli/monmaptool/add-exists.t index d223f7bec8d6..e14a2a654543 100644 --- a/src/test/cli/monmaptool/add-exists.t +++ b/src/test/cli/monmaptool/add-exists.t @@ -1,7 +1,7 @@ $ monmaptool --create mymonmap monmaptool: monmap file mymonmap monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) - setting min_mon_release = tentacle + setting min_mon_release = umbrella monmaptool: writing epoch 0 to mymonmap (0 monitors) $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)" @@ -21,7 +21,7 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) - min_mon_release 20 (tentacle) + min_mon_release 21 (umbrella) election_strategy: 1 0: v1:2.3.4.5:6789/0 mon.foo diff --git a/src/test/cli/monmaptool/add-many.t b/src/test/cli/monmaptool/add-many.t index 2f61888c9e9d..5ada4761ce65 100644 --- a/src/test/cli/monmaptool/add-many.t +++ b/src/test/cli/monmaptool/add-many.t @@ -1,7 +1,7 @@ $ monmaptool --create mymonmap monmaptool: monmap file mymonmap monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) - setting min_mon_release = tentacle + setting min_mon_release = umbrella monmaptool: writing epoch 0 to mymonmap (0 monitors) $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)" @@ -24,7 +24,7 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) - min_mon_release 20 (tentacle) + min_mon_release 21 (umbrella) election_strategy: 1 0: v1:2.3.4.5:6789/0 mon.foo 1: [v2:172.21.15.68:6791/0,v1:172.21.15.68:6792/0] mon.fiz diff --git a/src/test/cli/monmaptool/clobber.t b/src/test/cli/monmaptool/clobber.t index 963e1ebeda1c..1d28643c4067 100644 --- a/src/test/cli/monmaptool/clobber.t +++ b/src/test/cli/monmaptool/clobber.t @@ -1,7 +1,7 @@ $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap monmaptool: monmap file mymonmap monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) - setting min_mon_release = tentacle + setting min_mon_release = umbrella monmaptool: writing epoch 0 to mymonmap (1 monitors) $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)" @@ -18,7 +18,7 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) - min_mon_release 20 (tentacle) + min_mon_release 21 (umbrella) election_strategy: 1 0: v1:2.3.4.5:6789/0 mon.foo @@ -28,7 +28,7 @@ $ monmaptool --create --clobber mymonmap monmaptool: monmap file mymonmap monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) - setting min_mon_release = tentacle + setting min_mon_release = umbrella monmaptool: writing epoch 0 to mymonmap (0 monitors) $ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)" @@ -40,5 +40,5 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) - min_mon_release 20 (tentacle) + min_mon_release 21 (umbrella) election_strategy: 1 diff --git a/src/test/cli/monmaptool/create-print.t b/src/test/cli/monmaptool/create-print.t index bf99d2589930..0a5e1c70e9cb 100644 --- a/src/test/cli/monmaptool/create-print.t +++ b/src/test/cli/monmaptool/create-print.t @@ -1,7 +1,7 @@ $ monmaptool --create mymonmap monmaptool: monmap file mymonmap monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) - setting min_mon_release = tentacle + setting min_mon_release = umbrella monmaptool: writing epoch 0 to mymonmap (0 monitors) $ monmaptool --print mymonmap @@ -10,7 +10,7 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) - min_mon_release 20 (tentacle) + min_mon_release 21 (umbrella) election_strategy: 1 $ monmaptool --print -- mymonmap @@ -19,5 +19,5 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) - min_mon_release 20 (tentacle) + min_mon_release 21 (umbrella) election_strategy: 1 diff --git a/src/test/cli/monmaptool/create-with-add.t b/src/test/cli/monmaptool/create-with-add.t index 9aaaa7e6c8d3..33c7efbdb118 100644 --- a/src/test/cli/monmaptool/create-with-add.t +++ b/src/test/cli/monmaptool/create-with-add.t @@ -1,7 +1,7 @@ $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap monmaptool: monmap file mymonmap monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) - setting min_mon_release = tentacle + setting min_mon_release = umbrella monmaptool: writing epoch 0 to mymonmap (1 monitors) $ monmaptool --print mymonmap @@ -10,6 +10,6 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) - min_mon_release 20 (tentacle) + min_mon_release 21 (umbrella) election_strategy: 1 0: v1:2.3.4.5:6789/0 mon.foo diff --git a/src/test/cli/monmaptool/rm-nonexistent.t b/src/test/cli/monmaptool/rm-nonexistent.t index c6709f934d0b..60c320a08af3 100644 --- a/src/test/cli/monmaptool/rm-nonexistent.t +++ b/src/test/cli/monmaptool/rm-nonexistent.t @@ -1,7 +1,7 @@ $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap monmaptool: monmap file mymonmap monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) - setting min_mon_release = tentacle + setting min_mon_release = umbrella monmaptool: writing epoch 0 to mymonmap (1 monitors) $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)" @@ -19,7 +19,7 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) - min_mon_release 20 (tentacle) + min_mon_release 21 (umbrella) election_strategy: 1 0: v1:2.3.4.5:6789/0 mon.foo diff --git a/src/test/cli/monmaptool/rm.t b/src/test/cli/monmaptool/rm.t index b84d15ea23f1..9ce24034937a 100644 --- a/src/test/cli/monmaptool/rm.t +++ b/src/test/cli/monmaptool/rm.t @@ -1,7 +1,7 @@ $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap monmaptool: monmap file mymonmap monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) - setting min_mon_release = tentacle + setting min_mon_release = umbrella monmaptool: writing epoch 0 to mymonmap (1 monitors) $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)" @@ -17,7 +17,7 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re) - min_mon_release 20 (tentacle) + min_mon_release 21 (umbrella) election_strategy: 1 $ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)" diff --git a/src/tools/monmaptool.cc b/src/tools/monmaptool.cc index 4b85dbc39503..8e56b7c4fe73 100644 --- a/src/tools/monmaptool.cc +++ b/src/tools/monmaptool.cc @@ -362,7 +362,7 @@ int main(int argc, const char **argv) monmap.strategy = static_cast( g_conf().get_val("mon_election_default_strategy")); if (min_mon_release == ceph_release_t::unknown) { - min_mon_release = ceph_release_t::tentacle; + min_mon_release = ceph_release_t::umbrella; } // TODO: why do we not use build_initial in our normal path here!?!?! modified = true;