You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/01/31 06:34:25 UTC
[GitHub] merlimat closed pull request #1132: Explicitly set zookeeper version in broker
merlimat closed pull request #1132: Explicitly set zookeeper version in broker
URL: https://github.com/apache/incubator-pulsar/pull/1132
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/pom.xml b/pom.xml
index 11797a49c..e07318899 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,6 @@ flexible messaging model and an intuitive client API.</description>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <classifier>tests</classifier>
<version>${zookeeper.version}</version>
<exclusions>
<exclusion>
@@ -179,9 +178,22 @@ flexible messaging model and an intuitive client API.</description>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <classifier>tests</classifier>
+ <version>${zookeeper.version}</version>
+ <exclusions>
<exclusion>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
</exclusion>
</exclusions>
</dependency>
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
index ec0bf1f54..fc135f9a6 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.pulsar.broker.loadbalance;
+import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.assertTrue;
@@ -69,8 +70,6 @@
import com.google.common.collect.Sets;
import com.google.common.hash.Hashing;
-import junit.framework.Assert;
-
public class AntiAffinityNamespaceGroupTest {
private LocalBookkeeperEnsemble bkEnsemble;
@@ -240,7 +239,7 @@ public void testAntiAffinityNamespaceFilteringWithDomain() throws Exception {
Set<String> candidate = Sets.newHashSet();
Map<String, Map<String, Set<String>>> brokerToNamespaceToBundleRange = Maps.newHashMap();
- Assert.assertEquals(brokers.size(), totalBrokers);
+ assertEquals(brokers.size(), totalBrokers);
String assignedNamespace = namespace + "0" + bundle;
candidate.addAll(brokers);
@@ -248,7 +247,7 @@ public void testAntiAffinityNamespaceFilteringWithDomain() throws Exception {
// for namespace-0 all brokers available
LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, brokers,
brokerToNamespaceToBundleRange, brokerToDomainMap);
- Assert.assertEquals(brokers.size(), totalBrokers);
+ assertEquals(brokers.size(), totalBrokers);
// add namespace-0 to broker-0 of domain-0 => state: n0->b0
selectBrokerForNamespace(brokerToNamespaceToBundleRange, "brokerName-0", namespace + "0", assignedNamespace);
@@ -257,8 +256,8 @@ public void testAntiAffinityNamespaceFilteringWithDomain() throws Exception {
assignedNamespace = namespace + "1" + bundle;
LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, brokerToDomainMap);
- Assert.assertEquals(candidate.size(), 2);
- candidate.forEach(broker -> Assert.assertEquals(brokerToDomainMap.get(broker), "domain-1"));
+ assertEquals(candidate.size(), 2);
+ candidate.forEach(broker -> assertEquals(brokerToDomainMap.get(broker), "domain-1"));
// add namespace-1 to broker-2 of domain-1 => state: n0->b0, n1->b2
selectBrokerForNamespace(brokerToNamespaceToBundleRange, "brokerName-2", namespace + "1", assignedNamespace);
@@ -267,9 +266,9 @@ public void testAntiAffinityNamespaceFilteringWithDomain() throws Exception {
assignedNamespace = namespace + "2" + bundle;
LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, brokerToDomainMap);
- Assert.assertEquals(candidate.size(), 2);
- Assert.assertTrue(candidate.contains("brokerName-1"));
- Assert.assertTrue(candidate.contains("brokerName-3"));
+ assertEquals(candidate.size(), 2);
+ assertTrue(candidate.contains("brokerName-1"));
+ assertTrue(candidate.contains("brokerName-3"));
// add namespace-2 to broker-1 of domain-0 => state: n0->b0, n1->b2, n2->b1
selectBrokerForNamespace(brokerToNamespaceToBundleRange, "brokerName-1", namespace + "2", assignedNamespace);
@@ -278,8 +277,8 @@ public void testAntiAffinityNamespaceFilteringWithDomain() throws Exception {
assignedNamespace = namespace + "3" + bundle;
LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, brokerToDomainMap);
- Assert.assertEquals(candidate.size(), 1);
- Assert.assertTrue(candidate.contains("brokerName-3"));
+ assertEquals(candidate.size(), 1);
+ assertTrue(candidate.contains("brokerName-3"));
// add namespace-3 to broker-3 of domain-1 => state: n0->b0, n1->b2, n2->b1, n3->b3
selectBrokerForNamespace(brokerToNamespaceToBundleRange, "brokerName-3", namespace + "3", assignedNamespace);
candidate.addAll(brokers);
@@ -287,7 +286,7 @@ public void testAntiAffinityNamespaceFilteringWithDomain() throws Exception {
assignedNamespace = namespace + "4" + bundle;
LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, brokerToDomainMap);
- Assert.assertEquals(candidate.size(), 4);
+ assertEquals(candidate.size(), 4);
}
/**
@@ -335,7 +334,7 @@ public void testAntiAffinityNamespaceFilteringWithoutDomain() throws Exception {
candidate.addAll(brokers);
LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, brokers,
brokerToNamespaceToBundleRange, null);
- Assert.assertEquals(brokers.size(), 3);
+ assertEquals(brokers.size(), 3);
// add ns-0 to broker-0
selectBrokerForNamespace(brokerToNamespaceToBundleRange, "broker-0", namespace + "0", assignedNamespace);
@@ -344,9 +343,9 @@ public void testAntiAffinityNamespaceFilteringWithoutDomain() throws Exception {
// available brokers for ns-1 => broker-1, broker-2
LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, null);
- Assert.assertEquals(candidate.size(), 2);
- Assert.assertTrue(candidate.contains("broker-1"));
- Assert.assertTrue(candidate.contains("broker-2"));
+ assertEquals(candidate.size(), 2);
+ assertTrue(candidate.contains("broker-1"));
+ assertTrue(candidate.contains("broker-2"));
// add ns-1 to broker-1
selectBrokerForNamespace(brokerToNamespaceToBundleRange, "broker-1", namespace + "1", assignedNamespace);
@@ -355,8 +354,8 @@ public void testAntiAffinityNamespaceFilteringWithoutDomain() throws Exception {
assignedNamespace = namespace + "2" + bundle;
LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, null);
- Assert.assertEquals(candidate.size(), 1);
- Assert.assertTrue(candidate.contains("broker-2"));
+ assertEquals(candidate.size(), 1);
+ assertTrue(candidate.contains("broker-2"));
// add ns-2 to broker-2
selectBrokerForNamespace(brokerToNamespaceToBundleRange, "broker-2", namespace + "2", assignedNamespace);
@@ -365,7 +364,7 @@ public void testAntiAffinityNamespaceFilteringWithoutDomain() throws Exception {
assignedNamespace = namespace + "3" + bundle;
LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, null);
- Assert.assertEquals(candidate.size(), 3);
+ assertEquals(candidate.size(), 3);
}
private void selectBrokerForNamespace(Map<String, Map<String, Set<String>>> brokerToNamespaceToBundleRange,
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services