This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new ab01b660fe3 [cleanup][test] CSContainer needs not to inherit from
ZKContainer (#20543)
ab01b660fe3 is described below
commit ab01b660fe36be5ffeca290b67cec448b069ef33
Author: tison <[email protected]>
AuthorDate: Tue Jun 13 13:15:41 2023 +0800
[cleanup][test] CSContainer needs not to inherit from ZKContainer (#20543)
Signed-off-by: tison <[email protected]>
---
.../token/PulsarTokenAuthenticationBaseSuite.java | 4 +--
.../tests/integration/cli/ClientToolTest.java | 2 +-
.../pulsar/tests/integration/cli/PerfToolTest.java | 6 ++--
.../tests/integration/containers/CSContainer.java | 7 +++-
.../tests/integration/containers/ZKContainer.java | 37 +---------------------
.../integration/topologies/PulsarCluster.java | 2 +-
6 files changed, 14 insertions(+), 44 deletions(-)
diff --git
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java
index e986c7e5c7b..d5421267ba2 100644
---
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java
+++
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java
@@ -68,7 +68,7 @@ public abstract class PulsarTokenAuthenticationBaseSuite
extends PulsarClusterTe
protected static final String PROXY_ROLE = "proxy";
protected static final String REGULAR_USER_ROLE = "client";
- protected ZKContainer<?> cmdContainer;
+ protected ZKContainer cmdContainer;
@BeforeClass(alwaysRun = true)
@Override
@@ -76,7 +76,7 @@ public abstract class PulsarTokenAuthenticationBaseSuite
extends PulsarClusterTe
incrementSetupNumber();
// Before starting the cluster, generate the secret key and the token
// Use Zk container to have 1 container available before starting the
cluster
- this.cmdContainer = new ZKContainer<>("cli-setup");
+ this.cmdContainer = new ZKContainer("cli-setup");
cmdContainer
.withNetwork(Network.newNetwork())
.withNetworkAliases(ZKContainer.NAME)
diff --git
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java
index c61411ad150..571948443b1 100644
---
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java
+++
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/ClientToolTest.java
@@ -59,7 +59,7 @@ public class ClientToolTest extends TopicMessagingBase {
private void testProduceConsume(String serviceUrl, String topicName)
throws Exception {
List<String> data = randomStrings();
// Using the ZK container as it is separate from brokers, so its
environment resembles real world usage more
- ZKContainer<?> clientToolContainer = pulsarCluster.getZooKeeper();
+ ZKContainer clientToolContainer = pulsarCluster.getZooKeeper();
produce(clientToolContainer, serviceUrl, topicName, data);
List<String> consumed = consume(clientToolContainer, serviceUrl,
topicName);
assertEquals(consumed, data);
diff --git
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PerfToolTest.java
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PerfToolTest.java
index 9a0865a0085..8c4f3a137aa 100644
---
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PerfToolTest.java
+++
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/PerfToolTest.java
@@ -38,7 +38,7 @@ public class PerfToolTest extends TopicMessagingBase {
String serviceUrl = "pulsar://" +
pulsarCluster.getProxy().getContainerName() + ":" + PulsarContainer.BROKER_PORT;
final String topicName = getNonPartitionedTopic("testProduce", true);
// Using the ZK container as it is separate from brokers, so its
environment resembles real world usage more
- ZKContainer<?> clientToolContainer = pulsarCluster.getZooKeeper();
+ ZKContainer clientToolContainer = pulsarCluster.getZooKeeper();
ContainerExecResult produceResult =
produceWithPerfTool(clientToolContainer, serviceUrl, topicName, MESSAGE_COUNT);
checkOutputForLogs(produceResult,"PerformanceProducer - Aggregated
throughput stats",
"PerformanceProducer - Aggregated latency stats");
@@ -49,7 +49,7 @@ public class PerfToolTest extends TopicMessagingBase {
String serviceUrl = "pulsar://" +
pulsarCluster.getProxy().getContainerName() + ":" + PulsarContainer.BROKER_PORT;
final String topicName = getNonPartitionedTopic("testConsume", true);
// Using the ZK container as it is separate from brokers, so its
environment resembles real world usage more
- ZKContainer<?> clientToolContainer = pulsarCluster.getZooKeeper();
+ ZKContainer clientToolContainer = pulsarCluster.getZooKeeper();
ContainerExecResult consumeResult =
consumeWithPerfTool(clientToolContainer, serviceUrl, topicName);
checkOutputForLogs(consumeResult,"PerformanceConsumer - Aggregated
throughput stats",
"PerformanceConsumer - Aggregated latency stats");
@@ -60,7 +60,7 @@ public class PerfToolTest extends TopicMessagingBase {
String serviceUrl = "pulsar://" +
pulsarCluster.getProxy().getContainerName() + ":" + PulsarContainer.BROKER_PORT;
final String topicName = getNonPartitionedTopic("testRead", true);
// Using the ZK container as it is separate from brokers, so its
environment resembles real world usage more
- ZKContainer<?> clientToolContainer = pulsarCluster.getZooKeeper();
+ ZKContainer clientToolContainer = pulsarCluster.getZooKeeper();
ContainerExecResult readResult = readWithPerfTool(clientToolContainer,
serviceUrl, topicName);
checkOutputForLogs(readResult,"PerformanceReader - Aggregated
throughput stats ",
"PerformanceReader - Aggregated latency stats");
diff --git
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CSContainer.java
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CSContainer.java
index 3642b6f1d84..de67d567233 100644
---
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CSContainer.java
+++
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/CSContainer.java
@@ -21,7 +21,7 @@ package org.apache.pulsar.tests.integration.containers;
/**
* A pulsar container that runs configuration store.
*/
-public class CSContainer extends ZKContainer<CSContainer> {
+public class CSContainer extends PulsarContainer<CSContainer> {
public static final String NAME = "configuration-store";
@@ -34,4 +34,9 @@ public class CSContainer extends ZKContainer<CSContainer> {
CS_PORT,
INVALID_PORT);
}
+
+ @Override
+ protected boolean isCodeCoverageEnabled() {
+ return false;
+ }
}
diff --git
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java
index da3fb05a518..c55eb3242b4 100644
---
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java
+++
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ZKContainer.java
@@ -18,17 +18,13 @@
*/
package org.apache.pulsar.tests.integration.containers;
-import org.apache.pulsar.tests.integration.utils.DockerUtils;
-
/**
* A pulsar container that runs zookeeper.
*/
-public class ZKContainer<SelfT extends PulsarContainer<SelfT>> extends
PulsarContainer<SelfT> {
+public class ZKContainer extends PulsarContainer<ZKContainer> {
public static final String NAME = "zookeeper";
- private volatile boolean dumpZkDataBeforeStop = false;
-
public ZKContainer(String clusterName) {
super(
clusterName,
@@ -39,37 +35,6 @@ public class ZKContainer<SelfT extends
PulsarContainer<SelfT>> extends PulsarCon
INVALID_PORT);
}
- public ZKContainer(String clusterName,
- String hostname,
- String serviceName,
- String serviceEntryPoint,
- int servicePort,
- int httpPort) {
- super(
- clusterName,
- hostname,
- serviceName,
- serviceEntryPoint,
- servicePort,
- httpPort);
- }
-
- public void enableDumpZkDataBeforeStop(boolean enabled) {
- this.dumpZkDataBeforeStop = enabled;
- }
-
- @Override
- protected void beforeStop() {
- super.beforeStop();
- if (null != getContainerId() && dumpZkDataBeforeStop) {
- DockerUtils.dumpContainerDirToTargetCompressed(
- getDockerClient(),
- getContainerId(),
- "/pulsar/data/zookeeper"
- );
- }
- }
-
@Override
protected boolean isCodeCoverageEnabled() {
return false;
diff --git
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
index bd11b7d3873..c4c7697e30f 100644
---
a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
+++
b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/topologies/PulsarCluster.java
@@ -85,7 +85,7 @@ public class PulsarCluster {
@Getter
private final String clusterName;
private final Network network;
- private final ZKContainer<?> zkContainer;
+ private final ZKContainer zkContainer;
private final CSContainer csContainer;
private final boolean sharedCsContainer;
private final Map<String, BKContainer> bookieContainers;
