qa,pybind/mgr: allow disabling .mgr pool

This is mostly for testing: a lot of tests assume that there are no
existing pools. These tests relied on a config to turn off creating the
"device_health_metrics" pool which generally exists for any new Ceph
cluster. It would be better to make these tests tolerant of the new .mgr
pool but clearly there's a lot of these. So just convert the config to
make it work.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index f0ba10f76a4b6bd50b40a5a608aa0679a5b3fc66..71201b3ee984aac3fbd33a355beaed905baa08b0 100755 (executable)
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -556,7 +556,7 @@ function run_mgr() {
     shift
     local data=$dir/$id
 
-    ceph config set mgr mgr/devicehealth/enable_monitoring off --force
+    ceph config set mgr mgr_pool false --force
     ceph-mgr \
         --id $id \
         $EXTRA_OPTS \

diff --git a/qa/suites/rados/multimon/no_pools.yaml b/qa/suites/rados/multimon/no_pools.yaml
index dc6c769ca0768d8d08193b3a4c0a23573a0d736c..32ef2439f4ba6b467784651494c9637809bec0bb 100644 (file)
--- a/qa/suites/rados/multimon/no_pools.yaml
+++ b/qa/suites/rados/multimon/no_pools.yaml
@@ -2,4 +2,4 @@ overrides:
   ceph:
     create_rbd_pool: false
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force

diff --git a/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml b/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml
index 04c40197a85625aa64f08942c040c3d9bfa6aee4..a9f8316172d6e38cf3db302d9baa4329c970c23b 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml
@@ -19,7 +19,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
 - rgw:
   - client.0
 - exec:

diff --git a/qa/suites/rados/singleton-nomsgr/all/balancer.yaml b/qa/suites/rados/singleton-nomsgr/all/balancer.yaml
index d4c6e3ca5dac07832cb4051bca1e5ec134406532..eb30c663a72ac09b2bea0a8345dcc3c6c81e5a2f 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/balancer.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/balancer.yaml
@@ -4,7 +4,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     fs: xfs
     log-ignorelist:
       - \(PG_AVAILABILITY\)

diff --git a/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml b/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml
index f998c51c9ecafde6eb0760796b494206fda5b21a..d7699d042c1018eb31899bda34e0d27a2c173acd 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/cache-fs-trunc.yaml
@@ -8,7 +8,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - overall HEALTH_
       - \(CACHE_POOL_NO_HIT_SET\)

diff --git a/qa/suites/rados/singleton-nomsgr/all/ceph-kvstore-tool.yaml b/qa/suites/rados/singleton-nomsgr/all/ceph-kvstore-tool.yaml
index e116b5ae0e884017475426cd666738ad79c7e5c5..a3085ad3d9c0cfe752d5077f8ee70c104df6fccd 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/ceph-kvstore-tool.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/ceph-kvstore-tool.yaml
@@ -8,7 +8,7 @@ roles:
 overrides:
   ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
     - but it is still running
     - overall HEALTH_

diff --git a/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml b/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml
index ee800e5a72c1083991d657629fad9c3289ab3891..7785f2453e6b61010dcb2a1b3c025b325e917793 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/export-after-evict.yaml
@@ -13,7 +13,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - overall HEALTH_
       - \(CACHE_POOL_NO_HIT_SET\)

diff --git a/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml b/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml
index 8d26cd32384aae8ae6288d38630c0f4cad8e1b5a..a3704069f9d25371059203e86b740a90464afa21 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/full-tiering.yaml
@@ -18,7 +18,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     conf:
       global:
         osd max object name len: 460

diff --git a/qa/suites/rados/singleton-nomsgr/all/health-warnings.yaml b/qa/suites/rados/singleton-nomsgr/all/health-warnings.yaml
index bc57a9cd926e21b54ca64be65c947e4828430e53..7b7bf592ff26cbc39463e423b993d04585559095 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/health-warnings.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/health-warnings.yaml
@@ -4,7 +4,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     conf:
       osd:
 # we may land on ext4

diff --git a/qa/suites/rados/singleton-nomsgr/all/large-omap-object-warnings.yaml b/qa/suites/rados/singleton-nomsgr/all/large-omap-object-warnings.yaml
index b08ab343f812f726ee3bafc6124798a83e3306a5..e1e9d34ef9f6dfdda8f3143aed239f7940049b03 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/large-omap-object-warnings.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/large-omap-object-warnings.yaml
@@ -7,7 +7,7 @@ roles:
 overrides:
   ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - \(OSDMAP_FLAGS\)
       - \(OSD_FULL\)

diff --git a/qa/suites/rados/singleton-nomsgr/all/lazy_omap_stats_output.yaml b/qa/suites/rados/singleton-nomsgr/all/lazy_omap_stats_output.yaml
index 7228522be05b2a0ceb0ce6dd277a0284038b7237..61c2fa66333a523c4b23d82efb0df0e1dbd323b9 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/lazy_omap_stats_output.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/lazy_omap_stats_output.yaml
@@ -12,7 +12,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
 - exec:
     client.0:
       - ceph_test_lazy_omap_stats

diff --git a/qa/suites/rados/singleton-nomsgr/all/librados_hello_world.yaml b/qa/suites/rados/singleton-nomsgr/all/librados_hello_world.yaml
index f670a0849e0bab95eecef5b9d1b8245a572463a8..0c0a071e9af7e6529471f0055fdec0d536c577c0 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/librados_hello_world.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/librados_hello_world.yaml
@@ -17,7 +17,7 @@ tasks:
         - libradospp-devel
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
 - workunit:
     clients:
       all:

diff --git a/qa/suites/rados/singleton-nomsgr/all/msgr.yaml b/qa/suites/rados/singleton-nomsgr/all/msgr.yaml
index d1852ae2bd3cc71417044481f187faaa433a5d5d..4eb376fcf62546a10b9067a1a89e3eba69eeebe5 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/msgr.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/msgr.yaml
@@ -17,7 +17,7 @@ openstack:
 overrides:
   ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     conf:
       client:
         debug ms: 20

diff --git a/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml b/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml
index a3ce46e6acab8c15957b7846ae181f17bb514685..8b95603d166693b608e56fe6959f4be77b99b072 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/multi-backfill-reject.yaml
@@ -16,7 +16,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - overall HEALTH_
       - \(PG_

diff --git a/qa/suites/rados/singleton-nomsgr/all/osd_stale_reads.yaml b/qa/suites/rados/singleton-nomsgr/all/osd_stale_reads.yaml
index 408268a0962e822eb52a5dc8d88bf6104080c579..5beb2015f800ccbeffc0a4598bd1b9c7a553d1aa 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/osd_stale_reads.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/osd_stale_reads.yaml
@@ -23,7 +23,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
 - exec:
     client.0:
       - ceph_test_osd_stale_read

diff --git a/qa/suites/rados/singleton-nomsgr/all/pool-access.yaml b/qa/suites/rados/singleton-nomsgr/all/pool-access.yaml
index 6485a6871791315e5cf78a14222e4e644e49be86..e79e1aaf5700d65e86c9855be3abde858d168c77 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/pool-access.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/pool-access.yaml
@@ -8,7 +8,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
 - workunit:
     clients:
       all:

diff --git a/qa/suites/rados/singleton-nomsgr/all/recovery-unfound-found.yaml b/qa/suites/rados/singleton-nomsgr/all/recovery-unfound-found.yaml
index 9cf4eec89a885de63d655c668a523e022b9bcd02..d949a5005d34c841637491fed78c0d6e401e5b33 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/recovery-unfound-found.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/recovery-unfound-found.yaml
@@ -13,7 +13,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     fs: xfs
     conf:
       osd:

diff --git a/qa/suites/rados/singleton-nomsgr/all/version-number-sanity.yaml b/qa/suites/rados/singleton-nomsgr/all/version-number-sanity.yaml
index 6d48796f03a28a36638b3c3ca3ad44217660d912..daeeeef4eba2cf01a90db1c69a8c45261c44566e 100644 (file)
--- a/qa/suites/rados/singleton-nomsgr/all/version-number-sanity.yaml
+++ b/qa/suites/rados/singleton-nomsgr/all/version-number-sanity.yaml
@@ -8,7 +8,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
 - workunit:
     clients:
       all:

diff --git a/qa/suites/rados/singleton/all/deduptool.yaml b/qa/suites/rados/singleton/all/deduptool.yaml
index 616a0b33cad87b2f8e1e43f44ff016280aaa08a0..3a34cb309a6708c74c14ba4b889b2a378b08766d 100644 (file)
--- a/qa/suites/rados/singleton/all/deduptool.yaml
+++ b/qa/suites/rados/singleton/all/deduptool.yaml
@@ -13,7 +13,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
     - but it is still running
     - had wrong client addr

diff --git a/qa/suites/rados/singleton/all/divergent_priors.yaml b/qa/suites/rados/singleton/all/divergent_priors.yaml
index 24b42557f9831aa82d37ccd0a034f81c21f3fc23..81d68654a95491dff2ccc4648d9d4f48a1946e74 100644 (file)
--- a/qa/suites/rados/singleton/all/divergent_priors.yaml
+++ b/qa/suites/rados/singleton/all/divergent_priors.yaml
@@ -24,5 +24,5 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
 - divergent_priors:

diff --git a/qa/suites/rados/singleton/all/divergent_priors2.yaml b/qa/suites/rados/singleton/all/divergent_priors2.yaml
index 6bef639582fd48421ac3bf6739814290e3a44977..baac3110cf1be821a0b03f379f6810a8d2ea0139 100644 (file)
--- a/qa/suites/rados/singleton/all/divergent_priors2.yaml
+++ b/qa/suites/rados/singleton/all/divergent_priors2.yaml
@@ -24,5 +24,5 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
 - divergent_priors2:

diff --git a/qa/suites/rados/singleton/all/dump-stuck.yaml b/qa/suites/rados/singleton/all/dump-stuck.yaml
index c1d28ee8e7254824204efa996f4508b3a63d03aa..eb70b70fff40ee48ee00cc68927ac984a3141d04 100644 (file)
--- a/qa/suites/rados/singleton/all/dump-stuck.yaml
+++ b/qa/suites/rados/singleton/all/dump-stuck.yaml
@@ -11,7 +11,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - but it is still running
       - overall HEALTH_

diff --git a/qa/suites/rados/singleton/all/ec-lost-unfound.yaml b/qa/suites/rados/singleton/all/ec-lost-unfound.yaml
index 9c423c8d879c726118e066aa02e0ad178e5878b1..050365ff4df0c41dc151062ccceefab5634a75dc 100644 (file)
--- a/qa/suites/rados/singleton/all/ec-lost-unfound.yaml
+++ b/qa/suites/rados/singleton/all/ec-lost-unfound.yaml
@@ -16,7 +16,7 @@ tasks:
 - ceph:
     create_rbd_pool: false
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - objects unfound and apparently lost
       - overall HEALTH_

diff --git a/qa/suites/rados/singleton/all/lost-unfound-delete.yaml b/qa/suites/rados/singleton/all/lost-unfound-delete.yaml
index bb170b5069a8aed966b4e041f92777c6ec1462c9..e4b7b11e2e1b408182be3cb6d6d3ba8e8576f57d 100644 (file)
--- a/qa/suites/rados/singleton/all/lost-unfound-delete.yaml
+++ b/qa/suites/rados/singleton/all/lost-unfound-delete.yaml
@@ -14,7 +14,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - objects unfound and apparently lost
       - overall HEALTH_

diff --git a/qa/suites/rados/singleton/all/lost-unfound.yaml b/qa/suites/rados/singleton/all/lost-unfound.yaml
index fceee20c04e98c8db77597eaeb9af80edc586c3b..280dac87b520416470e9e32c878773755d78ddc1 100644 (file)
--- a/qa/suites/rados/singleton/all/lost-unfound.yaml
+++ b/qa/suites/rados/singleton/all/lost-unfound.yaml
@@ -14,7 +14,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - objects unfound and apparently lost
       - overall HEALTH_

diff --git a/qa/suites/rados/singleton/all/max-pg-per-osd.from-mon.yaml b/qa/suites/rados/singleton/all/max-pg-per-osd.from-mon.yaml
index e5999bc9b9f03e9bbf31e00db4be00b77031a1c2..7ab94589893ca6614fad3a4468f30d3c5f0c0e6d 100644 (file)
--- a/qa/suites/rados/singleton/all/max-pg-per-osd.from-mon.yaml
+++ b/qa/suites/rados/singleton/all/max-pg-per-osd.from-mon.yaml
@@ -11,7 +11,7 @@ overrides:
   ceph:
     create_rbd_pool: False
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     conf:
       mon:
         osd pool default size: 2

diff --git a/qa/suites/rados/singleton/all/max-pg-per-osd.from-primary.yaml b/qa/suites/rados/singleton/all/max-pg-per-osd.from-primary.yaml
index 075d6be1f7a5d76139b5d4c29142dd5cd4b71d42..a51e8921f9268150d482c5a51142248635e7f50c 100644 (file)
--- a/qa/suites/rados/singleton/all/max-pg-per-osd.from-primary.yaml
+++ b/qa/suites/rados/singleton/all/max-pg-per-osd.from-primary.yaml
@@ -13,7 +13,7 @@ overrides:
   ceph:
     create_rbd_pool: False
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     conf:
       mon:
         osd pool default size: 2

diff --git a/qa/suites/rados/singleton/all/max-pg-per-osd.from-replica.yaml b/qa/suites/rados/singleton/all/max-pg-per-osd.from-replica.yaml
index db2856484ef72e067ca36541a0c248ae568d22d0..e3658ef77b6e89258d3cea14986a856f914f10af 100644 (file)
--- a/qa/suites/rados/singleton/all/max-pg-per-osd.from-replica.yaml
+++ b/qa/suites/rados/singleton/all/max-pg-per-osd.from-replica.yaml
@@ -13,7 +13,7 @@ overrides:
   ceph:
     create_rbd_pool: False
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     conf:
       mon:
         osd pool default size: 2

diff --git a/qa/suites/rados/singleton/all/mon-auth-caps.yaml b/qa/suites/rados/singleton/all/mon-auth-caps.yaml
index 8c23c0bc9dcd7371f7b4864bacea06c50b39bb96..f7c45d43fd42afb10ed8f992e3036841374a60be 100644 (file)
--- a/qa/suites/rados/singleton/all/mon-auth-caps.yaml
+++ b/qa/suites/rados/singleton/all/mon-auth-caps.yaml
@@ -9,7 +9,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
     - overall HEALTH_
     - \(AUTH_BAD_CAPS\)

diff --git a/qa/suites/rados/singleton/all/mon-config-key-caps.yaml b/qa/suites/rados/singleton/all/mon-config-key-caps.yaml
index f987f3c9898e92647de1e887973e8c855ce5131d..f254754e270c25522e91cd7ea72fef09e4a5f204 100644 (file)
--- a/qa/suites/rados/singleton/all/mon-config-key-caps.yaml
+++ b/qa/suites/rados/singleton/all/mon-config-key-caps.yaml
@@ -9,7 +9,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
     - overall HEALTH_
     - \(AUTH_BAD_CAPS\)

diff --git a/qa/suites/rados/singleton/all/mon-config-keys.yaml b/qa/suites/rados/singleton/all/mon-config-keys.yaml
index 7d8b920cb41d047dad156f9ce4c1bcc78b6b0719..117b6d0554968ad7ea0f03562367ea94cda3a61b 100644 (file)
--- a/qa/suites/rados/singleton/all/mon-config-keys.yaml
+++ b/qa/suites/rados/singleton/all/mon-config-keys.yaml
@@ -15,7 +15,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
 - workunit:
     clients:
       all:

diff --git a/qa/suites/rados/singleton/all/mon-config.yaml b/qa/suites/rados/singleton/all/mon-config.yaml
index 3627e17dfc08abd676531ef35fb138a588dbef07..15d48f2380f4b17e2e3ff19398b6ce6557b08908 100644 (file)
--- a/qa/suites/rados/singleton/all/mon-config.yaml
+++ b/qa/suites/rados/singleton/all/mon-config.yaml
@@ -15,7 +15,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
 - workunit:
     clients:
       all:

diff --git a/qa/suites/rados/singleton/all/mon-memory-target-compliance.yaml.disabled b/qa/suites/rados/singleton/all/mon-memory-target-compliance.yaml.disabled
index 120e073a723064290182ca44a02a6ac518cf5a95..e1f79c16811aee7c7deadf758d1174f2f10fdb58 100644 (file)
--- a/qa/suites/rados/singleton/all/mon-memory-target-compliance.yaml.disabled
+++ b/qa/suites/rados/singleton/all/mon-memory-target-compliance.yaml.disabled
@@ -43,7 +43,7 @@ tasks:
 - ceph:
     create_rbd_pool: false
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - overall HEALTH_
       - \(OSDMAP_FLAGS\)

diff --git a/qa/suites/rados/singleton/all/osd-backfill.yaml b/qa/suites/rados/singleton/all/osd-backfill.yaml
index bbbd9b4b3574a5869a8535f7b73352bb87884dbe..1a24f4a2938a0ca68409321e9cedfffc97180ee9 100644 (file)
--- a/qa/suites/rados/singleton/all/osd-backfill.yaml
+++ b/qa/suites/rados/singleton/all/osd-backfill.yaml
@@ -14,7 +14,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - but it is still running
       - overall HEALTH_

diff --git a/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml b/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml
index 15a0ea3424648a225aeb15dd9140f3cae7eb7511..7ade95c9ece0f28e402ba84b9f3db7bed1aa60e2 100644 (file)
--- a/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml
+++ b/qa/suites/rados/singleton/all/osd-recovery-incomplete.yaml
@@ -15,7 +15,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - but it is still running
       - overall HEALTH_

diff --git a/qa/suites/rados/singleton/all/osd-recovery.yaml b/qa/suites/rados/singleton/all/osd-recovery.yaml
index 75cea6a94b981fe6a6663438703271236c3f00c7..94ab85a778d2c89e7a4d132f136acbedfe50ff1d 100644 (file)
--- a/qa/suites/rados/singleton/all/osd-recovery.yaml
+++ b/qa/suites/rados/singleton/all/osd-recovery.yaml
@@ -14,7 +14,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - but it is still running
       - overall HEALTH_

diff --git a/qa/suites/rados/singleton/all/peer.yaml b/qa/suites/rados/singleton/all/peer.yaml
index 24fd74b82ed34d139488a7fe1339e574cf8e2b5a..99183c460f1d96c20858d7b179d71415eeb4e712 100644 (file)
--- a/qa/suites/rados/singleton/all/peer.yaml
+++ b/qa/suites/rados/singleton/all/peer.yaml
@@ -14,7 +14,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     config:
       global:
         osd pool default min size : 1

diff --git a/qa/suites/rados/singleton/all/pg-autoscaler-progress-off.yaml b/qa/suites/rados/singleton/all/pg-autoscaler-progress-off.yaml
index 042c3d78e7d7d54fbfaf745caab040acee0b96e6..90fb128f0b9cdf5454ec6633801ddf0f30f57f24 100644 (file)
--- a/qa/suites/rados/singleton/all/pg-autoscaler-progress-off.yaml
+++ b/qa/suites/rados/singleton/all/pg-autoscaler-progress-off.yaml
@@ -21,7 +21,7 @@ tasks:
 - ceph:
     create_rbd_pool: false
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - overall HEALTH_
       - \(OSDMAP_FLAGS\)

diff --git a/qa/suites/rados/singleton/all/pg-autoscaler.yaml b/qa/suites/rados/singleton/all/pg-autoscaler.yaml
index abc6f7bd1ab17eb57aa5e6e866c731bbf38835a4..c7c7e68e35501617d8ea6333090086cc7c728261 100644 (file)
--- a/qa/suites/rados/singleton/all/pg-autoscaler.yaml
+++ b/qa/suites/rados/singleton/all/pg-autoscaler.yaml
@@ -21,7 +21,7 @@ tasks:
 - ceph:
     create_rbd_pool: false
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - overall HEALTH_
       - \(OSDMAP_FLAGS\)

diff --git a/qa/suites/rados/singleton/all/pg-removal-interruption.yaml b/qa/suites/rados/singleton/all/pg-removal-interruption.yaml
index b3f11264fe79da6a4996a562bd74ade8458d8f7a..2c00192f137a8bb4caca7364fac2d37c3693ac83 100644 (file)
--- a/qa/suites/rados/singleton/all/pg-removal-interruption.yaml
+++ b/qa/suites/rados/singleton/all/pg-removal-interruption.yaml
@@ -13,7 +13,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - but it is still running
       - slow request

diff --git a/qa/suites/rados/singleton/all/radostool.yaml b/qa/suites/rados/singleton/all/radostool.yaml
index fa3a1b0f7e3dcffb3438083062718fde498b016f..6a3998ed26e0eacc6252030da12bcdf590f140dc 100644 (file)
--- a/qa/suites/rados/singleton/all/radostool.yaml
+++ b/qa/suites/rados/singleton/all/radostool.yaml
@@ -13,7 +13,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
     - but it is still running
     - had wrong client addr

diff --git a/qa/suites/rados/singleton/all/random-eio.yaml b/qa/suites/rados/singleton/all/random-eio.yaml
index 782b906d62a7c86c677a933c1ac35a9e6b90e1b5..258ae90edbf813914e6221099cb07755de89b14b 100644 (file)
--- a/qa/suites/rados/singleton/all/random-eio.yaml
+++ b/qa/suites/rados/singleton/all/random-eio.yaml
@@ -16,7 +16,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
     - missing primary copy of
     - objects unfound and apparently lost

diff --git a/qa/suites/rados/singleton/all/rebuild-mondb.yaml b/qa/suites/rados/singleton/all/rebuild-mondb.yaml
index f678d08ce98c1b1b2fbf0179aed7089e7d177581..a6c0b7839a1ab4263cdd0fa5cb4915b6c50612e3 100644 (file)
--- a/qa/suites/rados/singleton/all/rebuild-mondb.yaml
+++ b/qa/suites/rados/singleton/all/rebuild-mondb.yaml
@@ -15,7 +15,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - no reply from
       - overall HEALTH_

diff --git a/qa/suites/rados/singleton/all/recovery-preemption.yaml b/qa/suites/rados/singleton/all/recovery-preemption.yaml
index 7438f9e775cfa82955b06435ebacbc4021485417..ce51688e50a2b8ef1c2991d318271af87a6f8256 100644 (file)
--- a/qa/suites/rados/singleton/all/recovery-preemption.yaml
+++ b/qa/suites/rados/singleton/all/recovery-preemption.yaml
@@ -15,7 +15,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     conf:
       osd:
         osd recovery sleep: .1

diff --git a/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml b/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml
index 2756ebe8269fcfc34b5028619ff2829ad5a28e58..41a011bd468a24ef78ff648857a003e4c3c8b44b 100644 (file)
--- a/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml
+++ b/qa/suites/rados/singleton/all/resolve_stuck_peering.yaml
@@ -6,7 +6,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     fs: xfs
     log-ignorelist:
       - overall HEALTH_

diff --git a/qa/suites/rados/singleton/all/test-crash.yaml b/qa/suites/rados/singleton/all/test-crash.yaml
index beb83f0bb0bd42df0f658823241b72f6adc8a2c0..deab84a5a3206b5d49f187e4459af8735b274b7f 100644 (file)
--- a/qa/suites/rados/singleton/all/test-crash.yaml
+++ b/qa/suites/rados/singleton/all/test-crash.yaml
@@ -5,7 +5,7 @@ tasks:
   - install:
   - ceph:
       pre-mgr-commands:
-        - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+        - sudo ceph config set mgr mgr_pool false --force
       log-ignorelist:
         - Reduced data availability
         - OSD_.*DOWN

diff --git a/qa/suites/rados/singleton/all/test_envlibrados_for_rocksdb.yaml b/qa/suites/rados/singleton/all/test_envlibrados_for_rocksdb.yaml
index a76f6a8f03e4299a761d6e18a5cba912d21beca1..fcdd2f7f9f8f57dc51b616d0857ca6d2481833f0 100644 (file)
--- a/qa/suites/rados/singleton/all/test_envlibrados_for_rocksdb.yaml
+++ b/qa/suites/rados/singleton/all/test_envlibrados_for_rocksdb.yaml
@@ -12,7 +12,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - overall HEALTH_
       - \(POOL_APP_NOT_ENABLED\)

diff --git a/qa/suites/rados/singleton/all/thrash-backfill-full.yaml b/qa/suites/rados/singleton/all/thrash-backfill-full.yaml
index 0f2924db3f808180dd1caa8bfaaf3487d110bf3c..eb1d5eb83ba055f93bff84f4d08f936e23cecf3d 100644 (file)
--- a/qa/suites/rados/singleton/all/thrash-backfill-full.yaml
+++ b/qa/suites/rados/singleton/all/thrash-backfill-full.yaml
@@ -23,7 +23,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
     - but it is still running
     - missing primary copy of

diff --git a/qa/suites/rados/singleton/all/thrash-eio.yaml b/qa/suites/rados/singleton/all/thrash-eio.yaml
index 5d9770061d1fdeb6cdfbfaefe41ecb621bb0383a..5ae8e69635cb00e50a8d21b2e0252bf7e2dbd8b4 100644 (file)
--- a/qa/suites/rados/singleton/all/thrash-eio.yaml
+++ b/qa/suites/rados/singleton/all/thrash-eio.yaml
@@ -21,7 +21,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
     - but it is still running
     - missing primary copy of

diff --git a/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml b/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml
index ab210abd7773ecc9a638e8a21a3d06ff66dea254..d61ad0c421b3debea70987b7eef5db7360e282e4 100644 (file)
--- a/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml
+++ b/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml
@@ -16,7 +16,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     log-ignorelist:
       - but it is still running
       - slow request

diff --git a/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml b/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml
index eeb585c88fc3a05d75d49779e4519603cfd40fab..1ff69c300cc9f0419e4def693ca577fa85a73e75 100644 (file)
--- a/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml
+++ b/qa/suites/rados/singleton/all/watch-notify-same-primary.yaml
@@ -15,7 +15,7 @@ tasks:
 - install:
 - ceph:
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     config:
       global:
         osd pool default min size : 1

diff --git a/qa/suites/rados/thrash-erasure-code/thrashers/minsize_recovery.yaml b/qa/suites/rados/thrash-erasure-code/thrashers/minsize_recovery.yaml
index 8362b6b1d5a28722fd047afd0077330e83067aae..2e375c7aa954c0f3ca2787a6bf15436a644459d2 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code/thrashers/minsize_recovery.yaml
+++ b/qa/suites/rados/thrash-erasure-code/thrashers/minsize_recovery.yaml
@@ -5,7 +5,7 @@ overrides:
     - objects unfound and apparently lost
     create_rbd_pool: False
     pre-mgr-commands:
-      - sudo ceph config set mgr mgr/devicehealth/enable_monitoring false --force
+      - sudo ceph config set mgr mgr_pool false --force
     conf:
       osd:
         osd debug reject backfill probability: .3

diff --git a/src/common/options/mgr.yaml.in b/src/common/options/mgr.yaml.in
index ff120736db5a629888c52e35f2b9dea124002f65..6fc8cb2e1c69ab43eefe8b7a96e6a8262feb2bc9 100644 (file)
--- a/src/common/options/mgr.yaml.in
+++ b/src/common/options/mgr.yaml.in
@@ -12,6 +12,15 @@ options:
   - mgr
   flags:
   - no_mon_update
+- name: mgr_pool
+  type: bool
+  level: dev
+  desc: Allow use/creation of .mgr pool.
+  default: true
+  services:
+  - mgr
+  flags:
+  - startup
 - name: mgr_stats_period
   type: int
   level: basic

diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index 79f5aa8e66b3896d3e0446b08c1764f99fff43b8..610fb4eb911d6c7f16fcc78325a78047a684556c 100644 (file)
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -1127,6 +1127,9 @@ class MgrModule(ceph_module.BaseMgrModule, MgrModuleLoggingMixin):
         assert self._db_lock.locked()
         if self._db is not None:
             return self._db
+        db_allowed = self.get_ceph_option("mgr_pool")
+        if not db_allowed:
+            raise MgrDBNotReady();
         self._db = self.open_db()
         if self._db is None:
             raise MgrDBNotReady();