From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 14 Feb 2020 12:42:25 +0000 (+0100)
Subject: Revert "osd/PG: avoid choose_acting picking want with > pool size items"
X-Git-Tag: v13.2.9~56^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95267d72b32956cf0c0a38212669ba511e8ccfd7;p=ceph.git

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

This reverts commit a0d49cf83ae3b845f2724aec28234d8796c66747.

c3e2990c39952a1fc4593076c5b2f0dea6cdcdd3 was backported to mimic by a0d49cf83ae3b845f2724aec28234d8796c66747.
In master, c3e2990c39952a1fc4593076c5b2f0dea6cdcdd3 was reverted by 82bb83f0ba930d7f83bea5a5397629b3e334bae2.

The revert is not cherry-picked from master because it's better to
revert the mimic backport directly.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index c4da5cf5022..89d135a1139 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1362,9 +1362,6 @@ void PG::calc_replicated_acting(
       usable++;
       ss << " osd." << *i << " (up) accepted " << cur_info << std::endl;
     }
-    if (want->size() >= size) {
-      break;
-    }
   }
 
   if (usable >= size) {