sijie closed pull request #1788: Fix bugs in DefaultEnsemblePlacementPolicy
URL: https://github.com/apache/bookkeeper/pull/1788
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java
index 28efe66154..917d18f717 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -58,6 +59,7 @@
private final ReentrantReadWriteLock rwLock;
DefaultEnsemblePlacementPolicy() {
+ bookieInfoMap = new HashMap<BookieSocketAddress, WeightedObject>();
rwLock = new ReentrantReadWriteLock();
}
@@ -92,6 +94,9 @@
}
newBookies.add(b);
--ensembleSize;
+ if (ensembleSize == 0) {
+ return newBookies;
+ }
}
} finally {
rwLock.readLock().unlock();
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/GenericEnsemblePlacementPolicyTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/GenericEnsemblePlacementPolicyTest.java
index bf369cf08b..8fbb009d24 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/GenericEnsemblePlacementPolicyTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/GenericEnsemblePlacementPolicyTest.java
@@ -24,6 +24,8 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,10 +35,14 @@
import org.apache.bookkeeper.test.BookKeeperClusterTestCase;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
/**
* Testing a generic ensemble placement policy.
*/
+@RunWith(Parameterized.class)
public class GenericEnsemblePlacementPolicyTest extends
BookKeeperClusterTestCase {
private BookKeeper.DigestType digestType = BookKeeper.DigestType.CRC32;
@@ -46,9 +52,15 @@
private static List<Map<String, byte[]>> customMetadataOnNewEnsembleStack
= new ArrayList<>();
private static List<Map<String, byte[]>>
customMetadataOnReplaceBookieStack = new ArrayList<>();
- public GenericEnsemblePlacementPolicyTest() {
+ @Parameters
+ public static Collection<Object[]> getDiskWeightBasedPlacementEnabled() {
+ return Arrays.asList(new Object[][] { { false }, { true } });
+ }
+
+ public GenericEnsemblePlacementPolicyTest(boolean
diskWeightBasedPlacementEnabled) {
super(0);
baseClientConf.setEnsemblePlacementPolicy(CustomEnsemblePlacementPolicy.class);
+
baseClientConf.setDiskWeightBasedPlacementEnabled(diskWeightBasedPlacementEnabled);
}
/**
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
