src/mon/PGMap: raise POOL_APP_NOT_ENABLED after some time for new pool

Fixes: https://tracker.ceph.com/issues/63192
Signed-off-by: junxiang Mu <1948535941@qq.com>

diff --git a/src/common/options/mgr.yaml.in b/src/common/options/mgr.yaml.in
index f29182930b27b782189a770c3b14e004f52ff157..773b0d3659153e78ca121587e503b9704efc3676 100644 (file)
--- a/src/common/options/mgr.yaml.in
+++ b/src/common/options/mgr.yaml.in
@@ -292,6 +292,15 @@ options:
   default: true
   services:
   - mgr
+- name: mon_warn_on_pool_no_app_grace
+  type: secs
+  level: dev
+  desc: time after which POOL_APP_NOT_ENABLED health warning is issued
+  default: 5_min
+  services:
+  - mgr
+  see_also:
+  - mon_warn_on_pool_no_app
 - name: mon_warn_on_too_few_osds
   type: bool
   level: advanced

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 16fa71c84c069b2eecb741b9767aa083879ea7f1..a1b414fefd6b2f9263c709b1412284e1c9bbb488 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -3348,9 +3348,13 @@ void PGMap::get_health_checks(
       // application metadata is not encoded until luminous is minimum
       // required release
       if (pool.application_metadata.empty() && !pool.is_tier()) {
-        stringstream ss;
-        ss << "application not enabled on pool '" << pool_name << "'";
-        detail.push_back(ss.str());
+        utime_t now(ceph::real_clock::now());
+        if ((now - pool.get_create_time()) >
+            g_conf().get_val<std::chrono::seconds>("mon_warn_on_pool_no_app_grace").count()) {
+          stringstream ss;
+          ss << "application not enabled on pool '" << pool_name << "'";
+          detail.push_back(ss.str());
+        }
       }
     }
     if (!detail.empty()) {