From b75f0a9900b3ca3de16750483909f8a22e37bb23 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 3 Nov 2016 15:37:58 -0700 Subject: [PATCH] OSDMonitor: remove duplicate jewel/kraken flag warning Since 6244755a7051abe2e89d9f1ff75a10c4b76ee3b5 and 12e508313dbd5d1d38c76859cb7de2ce22404e12, the original check added in ae0d6eb1c01aa74a2c44c017c0c5b06697348d2d (perhaps by a bad rebase/merge?) is duplicated and doubles the warning messages. Signed-off-by: Josh Durgin --- src/mon/OSDMonitor.cc | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index ef0d87a9be4e3..ef6f3152b91e4 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3100,26 +3100,6 @@ void OSDMonitor::get_health(list >& summary, } } - // warn about upgrade flags that can be set but are not. - if ((osdmap.get_up_osd_features() & CEPH_FEATURE_SERVER_JEWEL) && - !osdmap.test_flag(CEPH_OSDMAP_REQUIRE_JEWEL)) { - string msg = "all OSDs are running jewel or later but the" - " 'require_jewel_osds' osdmap flag is not set"; - summary.push_back(make_pair(HEALTH_WARN, msg)); - if (detail) { - detail->push_back(make_pair(HEALTH_WARN, msg)); - } - } - if ((osdmap.get_up_osd_features() & CEPH_FEATURE_SERVER_KRAKEN) && - !osdmap.test_flag(CEPH_OSDMAP_REQUIRE_KRAKEN)) { - string msg = "all OSDs are running kraken or later but the" - " 'require_kraken_osds' osdmap flag is not set"; - summary.push_back(make_pair(HEALTH_WARN, msg)); - if (detail) { - detail->push_back(make_pair(HEALTH_WARN, msg)); - } - } - get_pools_health(summary, detail); } } -- 2.39.5