mgr/PGMap: drop REQUEST_{SLOW,STUCK} HEALTH_WARNs in mimic

SLOW_OPS unifies both of them since mimic

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/doc/rados/operations/health-checks.rst b/doc/rados/operations/health-checks.rst
index 40b886f93f556fc98e3c65efd06f4d167df45457..99621323d3a6a7074449bfa270fd19fd61b7e831 100644 (file)
--- a/doc/rados/operations/health-checks.rst
+++ b/doc/rados/operations/health-checks.rst
@@ -463,8 +463,8 @@ If the latest copy of the object is not available, the cluster can be
 told to roll back to a previous version of the object. See
 :ref:`failures-osd-unfound` for more information.
 
-REQUEST_SLOW
-____________
+SLOW_OPS
+________
 
 One or more OSD requests is taking a long time to process.  This can
 be an indication of extreme load, a slow storage device, or a software
@@ -483,15 +483,6 @@ The location of an OSD can be found with::
 
   ceph osd find osd.<id>
 
-REQUEST_STUCK
-_____________
-
-One or more OSD requests has been blocked for an extremely long time.
-This is an indication that either the cluster has been unhealthy for
-an extended period of time (e.g., not enough running OSDs) or there is
-some internal problem with the OSD.  See the dicussion of
-*REQUEST_SLOW* above.
-
 PG_NOT_SCRUBBED
 _______________
 

diff --git a/qa/suites/rados/monthrash/workloads/rados_api_tests.yaml b/qa/suites/rados/monthrash/workloads/rados_api_tests.yaml
index 8af6e7faa4ce3ecfc38d98b357ecfb1c5faa74eb..ac6491ebde7be199f9a5195d9186030fd3720343 100644 (file)
--- a/qa/suites/rados/monthrash/workloads/rados_api_tests.yaml
+++ b/qa/suites/rados/monthrash/workloads/rados_api_tests.yaml
@@ -6,7 +6,6 @@ overrides:
       - \(CACHE_POOL_NO_HIT_SET\)
       - \(CACHE_POOL_NEAR_FULL\)
       - \(POOL_FULL\)
-      - \(REQUEST_SLOW\)
       - \(SLOW_OPS\)
       - \(MON_DOWN\)
       - \(PG_

diff --git a/qa/suites/rados/singleton/all/thrash-eio.yaml b/qa/suites/rados/singleton/all/thrash-eio.yaml
index 3f6ee66ace5225272d4d51d1f22ebdbc2b2e1fc1..88870c0892e7f1d3310f880a08a15ea0fa3aa91f 100644 (file)
--- a/qa/suites/rados/singleton/all/thrash-eio.yaml
+++ b/qa/suites/rados/singleton/all/thrash-eio.yaml
@@ -26,7 +26,6 @@ tasks:
     - objects unfound and apparently lost
     - overall HEALTH_
     - \(OSDMAP_FLAGS\)
-    - \(REQUEST_SLOW\)
     - \(SLOW_OPS\)
     - \(PG_
     - \(OSD_

diff --git a/qa/suites/rados/verify/tasks/rados_api_tests.yaml b/qa/suites/rados/verify/tasks/rados_api_tests.yaml
index 0d6b28bdb9d9e97d74239a3ec078b5ab35194beb..d1e2c971cf831a40f651106053647d9ee368e069 100644 (file)
--- a/qa/suites/rados/verify/tasks/rados_api_tests.yaml
+++ b/qa/suites/rados/verify/tasks/rados_api_tests.yaml
@@ -6,7 +6,6 @@ overrides:
       - \(CACHE_POOL_NO_HIT_SET\)
       - \(POOL_FULL\)
       - \(SMALLER_PGP_NUM\)
-      - \(REQUEST_SLOW\)
       - \(SLOW_OPS\)
       - \(CACHE_POOL_NEAR_FULL\)
       - \(POOL_APP_NOT_ENABLED\)

diff --git a/qa/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml b/qa/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml
index 7ab3185ec10e5a21af0c365cfefb4fd5ea95631c..573aff3b6099378cf2ed3da0aebd8bfa78ce72f6 100644 (file)
--- a/qa/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml
+++ b/qa/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml
@@ -1,7 +1,7 @@
 overrides:
   ceph:
     log-whitelist:
-      - \(REQUEST_SLOW\)
+      - \(SLOW_OPS\)
 tasks:
 - workunit:
     clients:

diff --git a/qa/suites/smoke/basic/tasks/mon_thrash.yaml b/qa/suites/smoke/basic/tasks/mon_thrash.yaml
index 5bb30fb259420c6a95ebd64411493d0588e88ec8..595ef667d645d63d6a094fb34238eb6e55a1fc2d 100644 (file)
--- a/qa/suites/smoke/basic/tasks/mon_thrash.yaml
+++ b/qa/suites/smoke/basic/tasks/mon_thrash.yaml
@@ -11,7 +11,6 @@ overrides:
       - \(CACHE_POOL_
       - \(SMALLER_PGP_NUM\)
       - \(OBJECT_
-      - \(REQUEST_SLOW\)
       - \(SLOW_OPS\)
       - \(TOO_FEW_PGS\)
     conf:

diff --git a/qa/suites/smoke/basic/tasks/rados_api_tests.yaml b/qa/suites/smoke/basic/tasks/rados_api_tests.yaml
index 38bbeb3a59076592cad97bcf9fff6957ef642a4e..ef4c50fc0b0b31e76b0958a954f5c941552af540 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_api_tests.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_api_tests.yaml
@@ -11,7 +11,7 @@ tasks:
       - \(CACHE_POOL_
       - \(SMALLER_PGP_NUM\)
       - \(OBJECT_
-      - \(REQUEST_SLOW\)
+      - \(SLOW_OPS\)
       - \(TOO_FEW_PGS\)
       - reached quota
       - but it is still running

diff --git a/qa/suites/smoke/basic/tasks/rados_bench.yaml b/qa/suites/smoke/basic/tasks/rados_bench.yaml
index 08f69c9591c238531ac5f7447df1604d1a762086..0c77640f9b3212761d0e894e43e1b9e91f54c428 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_bench.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_bench.yaml
@@ -20,7 +20,6 @@ tasks:
       - \(CACHE_POOL_
       - \(SMALLER_PGP_NUM\)
       - \(OBJECT_
-      - \(REQUEST_SLOW\)
       - \(SLOW_OPS\)
       - \(TOO_FEW_PGS\)
 - thrashosds:

diff --git a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml b/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
index 0054e96d8e78ced825461a0e8d9c479b54a56cd0..38a04979d05dcb35cde2daa12050c8370281b2fd 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
@@ -10,7 +10,6 @@ tasks:
       - \(CACHE_POOL_
       - \(SMALLER_PGP_NUM\)
       - \(OBJECT_
-      - \(REQUEST_SLOW\)
       - \(SLOW_OPS\)
       - \(TOO_FEW_PGS\)
 - thrashosds:

diff --git a/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml b/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml
index f0c58286330d9a339103809f3c09539745a02197..32c9c767393fe4d264652447d1a161e0af5e68e0 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml
@@ -11,7 +11,6 @@ tasks:
       - \(CACHE_POOL_
       - \(SMALLER_PGP_NUM\)
       - \(OBJECT_
-      - \(REQUEST_SLOW\)
       - \(SLOW_OPS\)
       - \(TOO_FEW_PGS\)
 - thrashosds:

diff --git a/qa/suites/smoke/basic/tasks/rbd_fsx.yaml b/qa/suites/smoke/basic/tasks/rbd_fsx.yaml
index 770b2c3a2c1b5a4ac863e492fa8e934a6efa624b..8440c80c0a698c3684df6686ccfd1e90968058f2 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rbd_fsx.yaml
+++ b/qa/suites/smoke/basic/tasks/rbd_fsx.yaml
@@ -9,7 +9,6 @@ overrides:
       - \(CACHE_POOL_
       - \(SMALLER_PGP_NUM\)
       - \(OBJECT_
-      - \(REQUEST_SLOW\)
       - \(SLOW_OPS\)
       - \(TOO_FEW_PGS\)
     conf:

diff --git a/qa/tasks/thrashosds-health.yaml b/qa/tasks/thrashosds-health.yaml
index 4fddb05b8796ef9067240250354eb12231214c1c..0f4e6aa176f8c2e41b722e42e89d6c12897ba3de 100644 (file)
--- a/qa/tasks/thrashosds-health.yaml
+++ b/qa/tasks/thrashosds-health.yaml
@@ -9,6 +9,5 @@ overrides:
       - \(CACHE_POOL_
       - \(SMALLER_PGP_NUM\)
       - \(OBJECT_
-      - \(REQUEST_SLOW\)
       - \(SLOW_OPS\)
       - \(TOO_FEW_PGS\)

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 5045337a5e70d698fcbc2cb8251164d86dd843e0..441071c32b686252d0b47a3c50053712e0c71a90 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -2621,7 +2621,9 @@ void PGMap::get_health_checks(
 
   // REQUEST_SLOW
   // REQUEST_STUCK
-  if (cct->_conf->mon_osd_warn_op_age > 0 &&
+  // SLOW_OPS unifies them in mimic.
+  if (osdmap.require_osd_release < CEPH_RELEASE_MIMIC &&
+      cct->_conf->mon_osd_warn_op_age > 0 &&
       !osd_sum.op_queue_age_hist.h.empty() &&
       osd_sum.op_queue_age_hist.upper_bound() / 1000.0 >
       cct->_conf->mon_osd_warn_op_age) {