From cbb88da947b389db9b5cef717457e8fd7e5938db Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 27 Sep 2019 15:41:47 +0800 Subject: [PATCH] mon: do not remove FULL/NEARFULL flags from osdmap b4ca5ae462c6f12ca48b787529938862646282cd has dropped them since v13.0.1, so we don't need to do this in v15 anymore even if user upgrades an existing cluster from v13. Signed-off-by: Kefu Chai --- src/mon/OSDMonitor.cc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 6e1b66b8c04c2..119bad4f71c5d 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -1594,15 +1594,6 @@ void OSDMonitor::encode_pending(MonitorDBStore::TransactionRef t) } } - // remove any legacy osdmap nearfull/full flags - { - if (tmp.test_flag(CEPH_OSDMAP_FULL | CEPH_OSDMAP_NEARFULL)) { - dout(10) << __func__ << " clearing legacy osdmap nearfull/full flag" - << dendl; - remove_flag(CEPH_OSDMAP_NEARFULL); - remove_flag(CEPH_OSDMAP_FULL); - } - } // collect which pools are currently affected by // the near/backfill/full osd(s), // and set per-pool near/backfill/full flag instead -- 2.39.5