Skip to content
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

Jump to bottom

Replace bookie support downgrade to replace bookie with itself. #4013

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Replace bookie support downgrade to replace bookie with itself. #4013

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
10929b7
Support downgrade to pick replaced bookie self.
horizonzy Jul 1, 2023
4d4b770
Add test case.
horizonzy Jul 3, 2023
cc844f7
Add test case.
horizonzy Jul 3, 2023
792f0c5
Fix checkstyle.
horizonzy Jul 3, 2023
0545c11
Update doc.
horizonzy Jul 4, 2023
c669e80
Make downgrade to self as the default behavior.
horizonzy Jul 5, 2023
5792c65
Fix bugs.
horizonzy Jul 5, 2023
dafdf67
Fix ci.
horizonzy Jul 9, 2023
65e114d
Make downgrade to self only works in ReplicationWorker.
horizonzy Jul 15, 2023
adb2f24
Tune ci.
horizonzy Jul 15, 2023
8144fa8
Fix checkstyle.
horizonzy Jul 15, 2023
d56d187
Fix checkstyle.
horizonzy Jul 15, 2023
b5ed675
Fix ci.
horizonzy Jul 15, 2023
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
Prev Previous commit
Next Next commit
Add test case.
  • Loading branch information
@horizonzy
horizonzy committed Jul 3, 2023
commit 4d4b770609fae237b9821207c1d60e9af8475d01
71 changes: 71 additions & 0 deletions ...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 @@ -25,6 +25,7 @@
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;

import com.google.common.collect.Sets;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.netty.util.HashedWheelTimer;
import java.net.InetAddress;
Expand Down Expand Up @@ -68,6 +69,7 @@
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -636,6 +638,75 @@ public void testIsEnsembleAdheringToPlacementPolicy() throws Exception {
repp.isEnsembleAdheringToPlacementPolicy(ensemble, 3, 3));
}

@Test
public void testReplaceBookieWithNewEnsemble() throws Exception {
BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.1", 3181);
BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.2", 3181);
BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.3", 3181);
BookieSocketAddress addr4 = new BookieSocketAddress("127.0.0.4", 3181);
BookieSocketAddress addr5 = new BookieSocketAddress("127.0.0.5", 3181);
// update dns mapping
StaticDNSResolver.addNodeToRack(addr1.getHostName(), "/default-region/r1");
StaticDNSResolver.addNodeToRack(addr2.getHostName(), "/default-region/r1");
StaticDNSResolver.addNodeToRack(addr3.getHostName(), "/default-region/r1");
StaticDNSResolver.addNodeToRack(addr4.getHostName(), "/default-region/r2");
StaticDNSResolver.addNodeToRack(addr5.getHostName(), "/default-region/r3");

ClientConfiguration conf = (ClientConfiguration) this.conf.clone();
conf.setMinNumRacksPerWriteQuorum(3);

repp = new RackawareEnsemblePlacementPolicy();
repp.initialize(conf, Optional.<DNSToSwitchMapping> empty(), timer, DISABLE_ALL,
NullStatsLogger.INSTANCE, BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER);
repp.withDefaultRack(NetworkTopology.DEFAULT_REGION_AND_RACK);

// Update cluster
Set<BookieId> addrs = new HashSet<BookieId>();
addrs.add(addr1.toBookieId());
addrs.add(addr2.toBookieId());
addrs.add(addr3.toBookieId());
addrs.add(addr4.toBookieId());
addrs.add(addr5.toBookieId());
repp.onClusterChanged(addrs, new HashSet<>());

Set<Integer> bookieIndexesToRereplicate = new HashSet<>();
bookieIndexesToRereplicate.add(1);
bookieIndexesToRereplicate.add(2);

List<BookieId> ensemble = new ArrayList<>();
ensemble.add(addr1.toBookieId());
ensemble.add(addr2.toBookieId());
ensemble.add(addr3.toBookieId());

Set<BookieId> bookiesToExclude = Sets.newHashSet();

for (Integer bookieIndex : bookieIndexesToRereplicate) {
BookieId bookie = ensemble.get(bookieIndex);
bookiesToExclude.add(bookie);
}

List<BookieId> newEnsemble = new ArrayList<>(ensemble);

int i = 0;
for (Integer bookieIndex : bookieIndexesToRereplicate) {
BookieId oldBookie = newEnsemble.get(bookieIndex);
EnsemblePlacementPolicy.PlacementResult<BookieId> replaceBookieResponse = repp.replaceBookie(3, 3, 2,
Collections.emptyMap(), newEnsemble, oldBookie, bookiesToExclude);
BookieId newBookie = replaceBookieResponse.getResult();
PlacementPolicyAdherence isEnsembleAdheringToPlacementPolicy = replaceBookieResponse.getAdheringToPolicy();
if (i == 0) {
Assert.assertEquals(PlacementPolicyAdherence.FAIL, isEnsembleAdheringToPlacementPolicy);
}
if (i == 1) {
Assert.assertEquals(PlacementPolicyAdherence.MEETS_STRICT, isEnsembleAdheringToPlacementPolicy);
}
bookiesToExclude.add(newBookie);
//We should update ensemble after replace.
newEnsemble.set(bookieIndex, newBookie);
i++;
}
}

@Test
public void testReplaceBookieWithEnoughBookiesInSameRack() throws Exception {
BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181);
Expand Down