Skip to content

Commit 82171ba

Browse files
horizonzylhotari
authored andcommitted
Improve auto-recovery noise log when some bookie down. (#4118)
* Improve auto-recovery noise log when some bookie down. * Address comment. (cherry picked from commit 54168b5)
1 parent 3795f55 commit 82171ba

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,13 +467,26 @@ public PlacementResult<BookieId> replaceBookie(int ensembleSize, int writeQuorum
467467
try {
468468
excludeBookies = addDefaultRackBookiesIfMinNumRacksIsEnforced(excludeBookies);
469469
excludeBookies.addAll(currentEnsemble);
470+
471+
Set<Node> ensembleNodes = new HashSet<>();
472+
Set<Node> excludeNodes = new HashSet<>();
470473
BookieNode bn = knownBookies.get(bookieToReplace);
471474
if (null == bn) {
472475
bn = createBookieNode(bookieToReplace);
473476
}
474-
475-
Set<Node> ensembleNodes = convertBookiesToNodes(currentEnsemble);
476-
Set<Node> excludeNodes = convertBookiesToNodes(excludeBookies);
477+
for (BookieId bookieId : currentEnsemble) {
478+
if (bookieId.equals(bookieToReplace)) {
479+
continue;
480+
}
481+
ensembleNodes.add(convertBookieToNode(bookieId));
482+
}
483+
for (BookieId bookieId : excludeBookies) {
484+
if (bookieId.equals(bookieToReplace)) {
485+
excludeNodes.add(bn);
486+
continue;
487+
}
488+
excludeNodes.add(convertBookieToNode(bookieId));
489+
}
477490

478491
excludeNodes.addAll(ensembleNodes);
479492
excludeNodes.add(bn);

0 commit comments

Comments
 (0)