From: Patrick Donnelly Date: Fri, 7 Feb 2025 16:13:57 +0000 (-0500) Subject: tools/monmaptool: bump new cluster version to X X-Git-Tag: v20.3.0~469^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e4fe061a629baa6f29a2a79ae2db01399941bc0;p=ceph.git tools/monmaptool: bump new cluster version to X I don't see a good reason to set this to X-2 for a new cluster so I've adjusted it to X and updated this missing item in the doc. Signed-off-by: Patrick Donnelly --- diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst index e3807141877c..a5ad370a5b49 100644 --- a/doc/dev/release-checklists.rst +++ b/doc/dev/release-checklists.rst @@ -73,6 +73,8 @@ Compatsets Mon --- +- [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 28f019aead69..d223f7bec8d6 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 = quincy + setting min_mon_release = tentacle 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 17 (quincy) + min_mon_release 20 (tentacle) 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 4cd2ae74988f..2f61888c9e9d 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 = quincy + setting min_mon_release = tentacle 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 17 (quincy) + min_mon_release 20 (tentacle) 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 7b40bfd594ab..963e1ebeda1c 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 = quincy + setting min_mon_release = tentacle 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 17 (quincy) + min_mon_release 20 (tentacle) 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 = quincy + setting min_mon_release = tentacle 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 17 (quincy) + min_mon_release 20 (tentacle) election_strategy: 1 diff --git a/src/test/cli/monmaptool/create-print.t b/src/test/cli/monmaptool/create-print.t index 88531b0eb18d..bf99d2589930 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 = quincy + setting min_mon_release = tentacle 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 17 (quincy) + min_mon_release 20 (tentacle) 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 17 (quincy) + min_mon_release 20 (tentacle) election_strategy: 1 diff --git a/src/test/cli/monmaptool/create-with-add.t b/src/test/cli/monmaptool/create-with-add.t index 1e364c318b11..9aaaa7e6c8d3 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 = quincy + setting min_mon_release = tentacle 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 17 (quincy) + min_mon_release 20 (tentacle) election_strategy: 1 0: v1:2.3.4.5:6789/0 mon.foo diff --git a/src/test/cli/monmaptool/feature-set-unset-list.t b/src/test/cli/monmaptool/feature-set-unset-list.t index f0eacdf0baed..9622af0f8e26 100644 --- a/src/test/cli/monmaptool/feature-set-unset-list.t +++ b/src/test/cli/monmaptool/feature-set-unset-list.t @@ -1,7 +1,7 @@ $ monmaptool --create --add a 10.10.10.10:1234 /tmp/test.monmap.1234 monmaptool: monmap file /tmp/test.monmap.1234 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 = quincy + setting min_mon_release = tentacle monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors) $ monmaptool --feature-list --feature-list plain --feature-list parseable /tmp/test.monmap.1234 diff --git a/src/test/cli/monmaptool/rm-nonexistent.t b/src/test/cli/monmaptool/rm-nonexistent.t index 805c91f00a6d..c6709f934d0b 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 = quincy + setting min_mon_release = tentacle 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 17 (quincy) + min_mon_release 20 (tentacle) 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 3b2a27518e53..b84d15ea23f1 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 = quincy + setting min_mon_release = tentacle 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 17 (quincy) + min_mon_release 20 (tentacle) election_strategy: 1 $ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)" diff --git a/src/tools/monmaptool.cc b/src/tools/monmaptool.cc index 1e9b41e436d6..b09ddf16bbd4 100644 --- a/src/tools/monmaptool.cc +++ b/src/tools/monmaptool.cc @@ -361,7 +361,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::quincy; + min_mon_release = ceph_release_t::tentacle; } // TODO: why do we not use build_initial in our normal path here!?!?! modified = true;