]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "osd/PG: avoid choose_acting picking want with > pool size items"
authorNathan Cutler <ncutler@suse.com>
Fri, 6 Dec 2019 12:50:19 +0000 (13:50 +0100)
committerNathan Cutler <ncutler@suse.com>
Fri, 6 Dec 2019 12:54:23 +0000 (13:54 +0100)
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>
src/osd/PG.cc

index cd52976ffcb810ade08002a4d4c2f78655b4af3c..a103c01c0eacdd4f9be50860ecb8897a44535f42 100644 (file)
@@ -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) {