You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/12/12 05:58:04 UTC
[pulsar] branch branch-2.7 updated (e99777a -> 4f19b86)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a change to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git.
from e99777a [Broker] Fix producer getting incorrectly removed from topic's producers map (#12846)
new dda795d Upgrade TestContainers to 1.15.1 (#9120)
new 4f19b86 Upgrade Testcontainers version to 1.15.3 and switch to testcontainers-bom (#10321)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 40 +++++++++++++---------
tests/integration/pom.xml | 6 ++++
.../integration/containers/ChaosContainer.java | 10 +++---
.../containers/PrestoWorkerContainer.java | 4 +--
.../integration/containers/PulsarContainer.java | 8 ++---
.../integration/containers/WorkerContainer.java | 4 +--
.../tests/integration/containers/ZKContainer.java | 4 +--
7 files changed, 44 insertions(+), 32 deletions(-)
[pulsar] 01/02: Upgrade TestContainers to 1.15.1 (#9120)
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit dda795d3f8a1ffa766a10902295576afafca86ec
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Tue Jan 5 21:21:52 2021 -0800
Upgrade TestContainers to 1.15.1 (#9120)
* Upgrade TestContainers to 1.15.1
* Fixed testcontainers upgrade issues
(cherry picked from commit f817f3fb1cf6bb6ed47c06bb9ebbcbc3fdacc96d)
---
pom.xml | 9 ++++++++-
tests/integration/pom.xml | 6 ++++++
.../pulsar/tests/integration/containers/ChaosContainer.java | 10 +++++-----
.../tests/integration/containers/PrestoWorkerContainer.java | 4 ++--
.../pulsar/tests/integration/containers/PulsarContainer.java | 8 ++++----
.../pulsar/tests/integration/containers/WorkerContainer.java | 4 ++--
.../pulsar/tests/integration/containers/ZKContainer.java | 4 ++--
7 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 25dbc38..b4a7f5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,11 +180,12 @@ flexible messaging model and an intuitive client API.</description>
<jna.version>4.2.0</jna.version>
<kubernetesclient.version>9.0.2</kubernetesclient.version>
<nsq-client.version>1.0</nsq-client.version>
+ <docker-java.version>3.2.7</docker-java.version>
<!-- test dependencies -->
<cassandra.version>3.6.0</cassandra.version>
<disruptor.version>3.4.0</disruptor.version>
- <testcontainers.version>1.14.3</testcontainers.version>
+ <testcontainers.version>1.15.1</testcontainers.version>
<kerby.version>1.1.1</kerby.version>
<testng.version>7.3.0</testng.version>
<mockito.version>3.0.0</mockito.version>
@@ -594,6 +595,12 @@ flexible messaging model and an intuitive client API.</description>
<artifactId>jna</artifactId>
<version>${jna.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java-core</artifactId>
+ <version>${docker-java.version}</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index 6e9eb42..1a15a7e 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -121,6 +121,12 @@
</dependency>
<dependency>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-io-jdbc-postgres</artifactId>
<version>${project.version}</version>
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java
index a66f635..cf5a884 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ChaosContainer.java
@@ -47,14 +47,14 @@ public class ChaosContainer<SelfT extends ChaosContainer<SelfT>> extends Generic
}
protected void beforeStop() {
- if (null == containerId) {
+ if (null == getContainerId()) {
return;
}
// dump the container log
DockerUtils.dumpContainerLogToTarget(
getDockerClient(),
- containerId
+ getContainerId()
);
}
@@ -66,7 +66,7 @@ public class ChaosContainer<SelfT extends ChaosContainer<SelfT>> extends Generic
public void tailContainerLog() {
CompletableFuture.runAsync(() -> {
- while (null == containerId) {
+ while (null == getContainerId()) {
try {
TimeUnit.MILLISECONDS.sleep(100);
} catch (InterruptedException e) {
@@ -74,7 +74,7 @@ public class ChaosContainer<SelfT extends ChaosContainer<SelfT>> extends Generic
}
}
- LogContainerCmd logContainerCmd = this.dockerClient.logContainerCmd(containerId);
+ LogContainerCmd logContainerCmd = this.dockerClient.logContainerCmd(getContainerId());
logContainerCmd.withStdOut(true).withStdErr(true).withFollowStream(true);
logContainerCmd.exec(new LogContainerResultCallback() {
@Override
@@ -88,7 +88,7 @@ public class ChaosContainer<SelfT extends ChaosContainer<SelfT>> extends Generic
public String getContainerLog() {
StringBuilder sb = new StringBuilder();
- LogContainerCmd logContainerCmd = this.dockerClient.logContainerCmd(containerId);
+ LogContainerCmd logContainerCmd = this.dockerClient.logContainerCmd(getContainerId());
logContainerCmd.withStdOut(true).withStdErr(true);
try {
logContainerCmd.exec(new LogContainerResultCallback() {
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java
index 9462363..7c6c9d6 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PrestoWorkerContainer.java
@@ -52,10 +52,10 @@ public class PrestoWorkerContainer extends PulsarContainer<PrestoWorkerContainer
@Override
protected void beforeStop() {
super.beforeStop();
- if (null != containerId) {
+ if (null != getContainerId()) {
DockerUtils.dumpContainerDirToTargetCompressed(
getDockerClient(),
- containerId,
+ getContainerId(),
"/pulsar/lib/presto/var/log"
);
}
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java
index f13875a..8c6a5d8 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/PulsarContainer.java
@@ -100,10 +100,10 @@ public abstract class PulsarContainer<SelfT extends PulsarContainer<SelfT>> exte
@Override
protected void beforeStop() {
super.beforeStop();
- if (null != containerId) {
+ if (null != getContainerId()) {
DockerUtils.dumpContainerDirToTargetCompressed(
getDockerClient(),
- containerId,
+ getContainerId(),
"/var/log/pulsar"
);
}
@@ -159,13 +159,13 @@ public abstract class PulsarContainer<SelfT extends PulsarContainer<SelfT>> exte
}
PulsarContainer another = (PulsarContainer) o;
- return containerName.equals(another.containerName)
+ return getContainerId().equals(another.getContainerId())
&& super.equals(another);
}
@Override
public int hashCode() {
return 31 * super.hashCode() + Objects.hash(
- containerName);
+ getContainerId());
}
}
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java
index a5091b1..ac37acd 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/WorkerContainer.java
@@ -41,10 +41,10 @@ public class WorkerContainer extends PulsarContainer<WorkerContainer> {
@Override
protected void beforeStop() {
super.beforeStop();
- if (null != containerId) {
+ if (null != getContainerId()) {
DockerUtils.dumpContainerDirToTargetCompressed(
getDockerClient(),
- containerId,
+ getContainerId(),
"/pulsar/logs/functions"
);
}
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 cfdf82d..975ca18 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
@@ -61,10 +61,10 @@ public class ZKContainer<SelfT extends PulsarContainer<SelfT>> extends PulsarCon
@Override
protected void beforeStop() {
super.beforeStop();
- if (null != containerId && dumpZkDataBeforeStop) {
+ if (null != getContainerId() && dumpZkDataBeforeStop) {
DockerUtils.dumpContainerDirToTargetCompressed(
getDockerClient(),
- containerId,
+ getContainerId(),
"/pulsar/data/zookeeper"
);
}
[pulsar] 02/02: Upgrade Testcontainers version to 1.15.3 and switch to testcontainers-bom (#10321)
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 4f19b8622d5d0d17973399883e492b839fc30f0a
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Thu Apr 22 21:39:35 2021 +0300
Upgrade Testcontainers version to 1.15.3 and switch to testcontainers-bom (#10321)
(cherry picked from commit 8611d7da6aa59a04af50fd1883caea7e173ec518)
---
pom.xml | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index b4a7f5c..4e6dca5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,9 @@ flexible messaging model and an intuitive client API.</description>
<!-- test dependencies -->
<cassandra.version>3.6.0</cassandra.version>
<disruptor.version>3.4.0</disruptor.version>
- <testcontainers.version>1.15.1</testcontainers.version>
+ <testcontainers.version>1.15.3</testcontainers.version>
+ <!-- Set docker-java.version to the version of docker-java used in Testcontainers -->
+ <docker-java.version>3.2.8</docker-java.version>
<kerby.version>1.1.1</kerby.version>
<testng.version>7.3.0</testng.version>
<mockito.version>3.0.0</mockito.version>
@@ -601,6 +603,16 @@ flexible messaging model and an intuitive client API.</description>
<artifactId>docker-java-core</artifactId>
<version>${docker-java.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java-api</artifactId>
+ <version>${docker-java.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java-transport-zerodep</artifactId>
+ <version>${docker-java.version}</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
@@ -859,23 +871,10 @@ flexible messaging model and an intuitive client API.</description>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <version>${testcontainers.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>kafka</artifactId>
- <version>${testcontainers.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>mysql</artifactId>
- <version>${testcontainers.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
+ <artifactId>testcontainers-bom</artifactId>
<version>${testcontainers.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>