From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 20 Nov 2019 00:30:27 +0000 (+0800)
Subject: Revert "osd/PG: avoid choose_acting picking want with > pool size items"
X-Git-Tag: v15.1.0~775^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82bb83f0ba930d7f83bea5a5397629b3e334bae2;p=ceph.git

Revert "osd/PG: avoid choose_acting picking want with > pool size items"

This reverts commit c3e2990c39952a1fc4593076c5b2f0dea6cdcdd3.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 04e3a87debd..17030737506 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -1703,9 +1703,6 @@ void PeeringState::calc_replicated_acting(
       acting_backfill->insert(up_cand);
       ss << " osd." << i << " (up) accepted " << cur_info << std::endl;
     }
-    if (want->size() >= size) {
-      break;
-    }
   }
 
   if (want->size() >= size) {