From: Kefu Chai <kchai@redhat.com>
Date: Fri, 27 Sep 2019 07:47:43 +0000 (+0800)
Subject: osd/OSDMap: do not print FULL/NEARFULL flags
X-Git-Tag: v15.1.0~1333^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9010e259c4e7566701921e594422c99c28b42b9e;p=ceph.git

osd/OSDMap: do not print FULL/NEARFULL flags

these flags has been deprecated since
b4ca5ae462c6f12ca48b787529938862646282cd

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 4ce2cdc24dd8c..6b5930743a331 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -3621,10 +3621,6 @@ void OSDMap::generate_test_instances(list<OSDMap*>& o)
 string OSDMap::get_flag_string(unsigned f)
 {
   string s;
-  if ( f& CEPH_OSDMAP_NEARFULL)
-    s += ",nearfull";
-  if (f & CEPH_OSDMAP_FULL)
-    s += ",full";
   if (f & CEPH_OSDMAP_PAUSERD)
     s += ",pauserd";
   if (f & CEPH_OSDMAP_PAUSEWR)
@@ -5725,8 +5721,6 @@ void OSDMap::check_health(CephContext *cct,
   {
     // warn about flags
     uint64_t warn_flags =
-      CEPH_OSDMAP_NEARFULL |
-      CEPH_OSDMAP_FULL |
       CEPH_OSDMAP_PAUSERD |
       CEPH_OSDMAP_PAUSEWR |
       CEPH_OSDMAP_PAUSEREC |