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 <pdonnell@ibm.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index e3807141877c380302007d2cc5c6404cd5b1b883..a5ad370a5b495da992f397c16f37a5ce719615b1 100644 (file)
--- 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 28f019aead694b8af03807fe66de9118f530dd74..d223f7bec8d62108d80596893ada9fdbe7dd24b9 100644 (file)
--- 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 4cd2ae74988fad97d3bc0dc5794d5bb890afb4fd..2f61888c9e9d5787cd2feb411f1516fbc107650f 100644 (file)
--- 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 7b40bfd594abcd69cf545c3d1e7c9a7d8bcdf591..963e1ebeda1c20ad465537ca47f9551628c5f78a 100644 (file)
--- 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 88531b0eb18d12cf988e5702bf323cda02ba6841..bf99d25899304ce95e1fa8f9f8659fa2ac0cfebb 100644 (file)
--- 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 1e364c318b11d9e0cba08d923afb98fea2ee463c..9aaaa7e6c8d354690bae1cb827adc8ac061a13ff 100644 (file)
--- 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 f0eacdf0baed040e9ac12b972e80e9962b97ba8d..9622af0f8e2611ca7bac43a758ac5a91af56116d 100644 (file)
--- 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 805c91f00a6d236dddbdf717bfb24a5bb566e5dd..c6709f934d0bb42cd4af4502fab2c8b534698d7e 100644 (file)
--- 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 3b2a27518e5334c6b6c709350cd3d3e384cb6b46..b84d15ea23f13a719ab080527af342c2fff5ecdb 100644 (file)
--- 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 1e9b41e436d6e214b6806ef8b86b84fb05275359..b09ddf16bbd4af5e5f993c4c3d321248e1638c7d 100644 (file)
--- 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<MonMap::election_strategy>(
                  g_conf().get_val<uint64_t>("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;