]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSDMap: do not print FULL/NEARFULL flags
authorKefu Chai <kchai@redhat.com>
Fri, 27 Sep 2019 07:47:43 +0000 (15:47 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 28 Sep 2019 08:09:58 +0000 (16:09 +0800)
these flags has been deprecated since
b4ca5ae462c6f12ca48b787529938862646282cd

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/osd/OSDMap.cc

index 4ce2cdc24dd8c2393aa837e3a66c9e9d6bb1cbf5..6b5930743a331e56bc091c57995a0dd7393f9b3d 100644 (file)
@@ -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 |