From: Kefu Chai <kchai@redhat.com>
Date: Fri, 19 Mar 2021 12:20:32 +0000 (+0800)
Subject: osd/PeeringState: remove unused variable
X-Git-Tag: v17.1.0~2529^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40239%2Fhead;p=ceph.git

osd/PeeringState: remove unused variable

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>
---

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index b42400aa942..570ebb8b86e 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -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;