]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "osd/PG: avoid choose_acting picking want with > pool size items" 33324/head
authorNathan Cutler <ncutler@suse.com>
Fri, 14 Feb 2020 12:42:25 +0000 (13:42 +0100)
committerNathan Cutler <ncutler@suse.com>
Fri, 14 Feb 2020 12:43:09 +0000 (13:43 +0100)
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>
src/osd/PG.cc

index c4da5cf502244a32366ecc64aa7625736b8041c5..89d135a11399d51c08ce6ceea43bfef3db58cab0 100644 (file)
@@ -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) {