]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PeeringState: remove unused variable 40239/head
authorKefu Chai <kchai@redhat.com>
Fri, 19 Mar 2021 12:20:32 +0000 (20:20 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 19 Mar 2021 12:22:26 +0000 (20:22 +0800)
recovery_ec_pool_below_min_size was used to verify if the osd in clsuter
are octopus and up, but since we are now quincy and up, there is no need
to verify this. so drop it for better readability and for silencing
the -Wunused-variable warning in Release build.

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

index b42400aa942f88ebb435e51bcf2a4a07cc0838a6..570ebb8b86ec2d7d9fbadb29537afcd161fec5d4 100644 (file)
@@ -2116,9 +2116,6 @@ bool PeeringState::recoverable(const vector<int> &want) const
   }
 
   if (num_want_acting < pool.info.min_size) {
-    const bool recovery_ec_pool_below_min_size =
-      HAVE_FEATURE(get_osdmap()->get_up_osd_features(), SERVER_OCTOPUS);
-    assert(recovery_ec_pool_below_min_size);
     if (!cct->_conf.get_val<bool>("osd_allow_recovery_below_min_size")) {
       psdout(10) << __func__ << " failed, recovery below min size not enabled" << dendl;
       return false;