Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apache/pulsar
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ec4a1d4beb7f5569c9b9811ce219e519e9302a80
Choose a base ref
..
head repository: apache/pulsar
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d8d689d2fcf877dbe0fa94ddac444639658e03ca
Choose a head ref
4 changes: 2 additions & 2 deletions ...gration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java
View file
Original file line number Diff line number Diff line change
@@ -323,10 +323,10 @@ public String getHttpsServiceUrl() {
}

public String getInternalBrokerServiceUrl() {
return "pulsar://" + getHostname() + ":" + servicePort;
return "pulsar://" + getNetworkAliases().get(0) + ":" + servicePort;
}

public String getInternalHttpServiceUrl() {
return "http://" + getHostname() + ":" + httpPort;
return "http://" + getNetworkAliases().get(0) + ":" + httpPort;
}
}
7 changes: 5 additions & 2 deletions ...st/java/org/apache/pulsar/tests/integration/messaging/GeoReplicationOnTopicLevelTest.java
View file
Original file line number Diff line number Diff line change
@@ -73,8 +73,11 @@ public final void tearDownAfterMethod() throws Exception {
cleanup();
}

@Test(timeOut = 1000 * 30, dataProvider = "TopicDomain")
public void testTopicReplication(String domain) throws Exception {
@Test(timeOut = 1000 * 60)
public void testTopicReplication() throws Exception {
// TODO: Disable non-persistent test due to `admin1.topics().setReplicationClusters` throws TopicNotFound.

String domain = "persistent";
String cluster1Name = getGeoCluster().getClusters()[0].getClusterName();
PulsarCluster cluster2 = getGeoCluster().getClusters()[1];
String cluster2Name = cluster2.getClusterName();
3 changes: 1 addition & 2 deletions ...tegration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@
import static org.apache.pulsar.tests.integration.containers.PulsarContainer.CS_PORT;
import static org.apache.pulsar.tests.integration.containers.PulsarContainer.PULSAR_CONTAINERS_LEAVE_RUNNING;
import static org.apache.pulsar.tests.integration.containers.PulsarContainer.ZK_PORT;
import static org.apache.pulsar.tests.integration.topologies.PulsarTestBase.randomName;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.ArrayList;
@@ -134,7 +133,7 @@ private PulsarCluster(PulsarClusterSpec spec, CSContainer csContainer, boolean s
this.brokerContainers = Maps.newTreeMap();
this.workerContainers = Maps.newTreeMap();

this.proxyContainer = new ProxyContainer(appendClusterName("pulsar-proxy"), ProxyContainer.NAME + randomName(5), spec.enableTls)
this.proxyContainer = new ProxyContainer(appendClusterName("pulsar-proxy"), ProxyContainer.NAME, spec.enableTls)
.withNetwork(network)
.withNetworkAliases(appendClusterName("pulsar-proxy"))
.withEnv("zkServers", appendClusterName(ZKContainer.NAME))