From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 6 Dec 2019 12:50:19 +0000 (+0100)
Subject: Revert "osd/PG: avoid choose_acting picking want with > pool size items"
X-Git-Tag: v14.2.8~20^2~76^2~2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5402f2961764e465acadefd489cb35b0dc803ec0;p=ceph.git

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

This reverts commit c3e2990c39952a1fc4593076c5b2f0dea6cdcdd3.

This commit is not cherry-picked from master because the corresponding
master commit - 82bb83f0ba930d7f83bea5a5397629b3e334bae2 - reverted changes
in a file - src/osd/PeeringState.cc - that doesn't exist in nautilus.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index cd52976ffcb..a103c01c0ea 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1423,9 +1423,6 @@ void PG::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) {