Skip to content

Issue 4735: Preserve dead bookies when stabilize slave is active #4889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arimu1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue 4735: Preserve dead bookies when stabilize slave is active #4889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...r-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package org.apache.bookkeeper.client;

import com.google.common.collect.Sets;
import io.netty.util.HashedWheelTimer;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -110,7 +111,8 @@ public Set<BookieId> onClusterChanged(Set<BookieId> writableBookies,
Set<BookieId> readOnlyBookies) {
Set<BookieId> deadBookies = super.onClusterChanged(writableBookies, readOnlyBookies);
if (null != slave) {
deadBookies = slave.onClusterChanged(writableBookies, readOnlyBookies);
deadBookies = Sets.union(deadBookies,
slave.onClusterChanged(writableBookies, readOnlyBookies));
}
return deadBookies;
}
Expand Down
2 changes: 1 addition & 1 deletion ...rver/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2481,7 +2481,7 @@ public void testPlacementOnStabilizeNetworkTopology() throws Exception {
// addr4 left
addrs.remove(addr4.toBookieId());
Set<BookieId> deadBookies = repp.onClusterChanged(addrs, new HashSet<BookieId>());
assertTrue(deadBookies.isEmpty());
assertTrue(deadBookies.contains(addr4.toBookieId()));

// we will never use addr4 even it is in the stabilized network topology
for (int i = 0; i < 5; i++) {
Expand Down