doc, qa:remove invalid option mon_pg_warn_max_per_osd

The older mon_pg_warn_max_per_osd option has been removed in v12.2.1 Luminous
https://ceph.com/releases/v12-2-1-luminous-released/

Fixes: https://tracker.ceph.com/issues/42221
Signed-off-by: zhang daolong <zhangdaolong@fiberhome.com>
(cherry picked from commit e5d91c9872fd4b7746e7e0a777ac2c38c758c5e6)

diff --git a/doc/rados/configuration/pool-pg-config-ref.rst b/doc/rados/configuration/pool-pg-config-ref.rst
index f49bac40bad8c10ed5b486cd6b309e0874af0b93..12502ccb4607ed96b236d67e1c6351d18bfc1ac2 100644 (file)
--- a/doc/rados/configuration/pool-pg-config-ref.rst
+++ b/doc/rados/configuration/pool-pg-config-ref.rst
@@ -60,15 +60,6 @@ Ceph configuration file.
 :Default: ``30``
 
 
-``mon pg warn max per osd``
-
-:Description: Issue a ``HEALTH_WARN`` in cluster log if the average number
-              of PGs per (in) OSD is above this number. (a non-positive number
-              disables this)
-:Type: Integer
-:Default: ``300``
-
-
 ``mon pg warn min objects``
 
 :Description: Do not warn if the total number of objects in cluster is below

diff --git a/qa/tasks/ceph.conf.template b/qa/tasks/ceph.conf.template
index 93363cddd94d2baf1f897e7e71df8b2a9deb6146..e30470cb260ec6ad9e4b212db47d653216e01611 100644 (file)
--- a/qa/tasks/ceph.conf.template
+++ b/qa/tasks/ceph.conf.template
@@ -13,7 +13,6 @@
        ms die on old message = true
 
        mon pg warn min per osd = 1
-       mon pg warn max per osd = 10000   # <= luminous
        mon max pg per osd = 10000        # >= luminous
        mon pg warn max object skew = 0