This is an automated email from the ASF dual-hosted git repository.
yubiao pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 77d20857911 [feat][meta] Upgrade to jetcd to 0.7.5 (#20339)
77d20857911 is described below
commit 77d20857911fcfc5f8414845b994716d0859b1a7
Author: Michael Marshall <[email protected]>
AuthorDate: Wed May 17 04:14:44 2023 -0500
[feat][meta] Upgrade to jetcd to 0.7.5 (#20339)
(cherry picked from commit c7a4060763b905925ffe8e9690ea983d863aa52f)
---
distribution/server/src/assemble/LICENSE.bin.txt | 7 +++++--
pom.xml | 2 +-
.../apache/pulsar/metadata/BaseMetadataStoreTest.java | 7 ++++---
.../coordination/impl/LeaderElectionImplTest.java | 2 +-
.../pulsar/metadata/impl/EtcdMetadataStoreTest.java | 17 ++++++++++-------
pulsar-sql/presto-distribution/LICENSE | 12 ++++++++----
6 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index de724732e4a..7a993e00615 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -479,6 +479,7 @@ The Apache Software License, Version 2.0
- io.vertx-vertx-core-4.3.8.jar
- io.vertx-vertx-web-4.3.8.jar
- io.vertx-vertx-web-common-4.3.8.jar
+ - io.vertx-vertx-grpc-4.3.8.jar
* Apache ZooKeeper
- org.apache.zookeeper-zookeeper-3.8.3.jar
- org.apache.zookeeper-zookeeper-jute-3.8.3.jar
@@ -491,8 +492,10 @@ The Apache Software License, Version 2.0
- com.google.auto.value-auto-value-annotations-1.9.jar
- com.google.re2j-re2j-1.6.jar
* Jetcd
- - io.etcd-jetcd-common-0.5.11.jar
- - io.etcd-jetcd-core-0.5.11.jar
+ - io.etcd-jetcd-api-0.7.5.jar
+ - io.etcd-jetcd-common-0.7.5.jar
+ - io.etcd-jetcd-core-0.7.5.jar
+ - io.etcd-jetcd-grpc-0.7.5.jar
* IPAddress
- com.github.seancfoley-ipaddress-5.3.3.jar
* RxJava
diff --git a/pom.xml b/pom.xml
index 386be8cb6ea..f25f1428c1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,7 +242,7 @@ flexible messaging model and an intuitive client
API.</description>
<spring.version>5.3.27</spring.version>
<apache-http-client.version>4.5.13</apache-http-client.version>
<apache-httpcomponents.version>4.4.15</apache-httpcomponents.version>
- <jetcd.version>0.5.11</jetcd.version>
+ <jetcd.version>0.7.5</jetcd.version>
<snakeyaml.version>2.0</snakeyaml.version>
<ant.version>1.10.12</ant.version>
<seancfoley.ipaddress.version>5.3.3</seancfoley.ipaddress.version>
diff --git
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
index 57a4e388572..ec6e6e03eae 100644
---
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
+++
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
@@ -21,7 +21,7 @@ package org.apache.pulsar.metadata;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import io.etcd.jetcd.launcher.EtcdCluster;
-import io.etcd.jetcd.launcher.EtcdClusterFactory;
+import io.etcd.jetcd.test.EtcdClusterExtension;
import java.io.File;
import java.net.URI;
import java.util.UUID;
@@ -84,10 +84,11 @@ public abstract class BaseMetadataStoreTest extends
TestRetrySupport {
private synchronized String getEtcdClusterConnectString() {
if (etcdCluster == null) {
- etcdCluster = EtcdClusterFactory.buildCluster("test", 1, false);
+ etcdCluster =
EtcdClusterExtension.builder().withClusterName("test").withNodes(1).withSsl(false).build()
+ .cluster();
etcdCluster.start();
}
- return
etcdCluster.getClientEndpoints().stream().map(URI::toString).collect(Collectors.joining(","));
+ return
etcdCluster.clientEndpoints().stream().map(URI::toString).collect(Collectors.joining(","));
}
public static Supplier<String> stringSupplier(Supplier<String> supplier) {
diff --git
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java
index 027521d2ffc..09c9d71c41a 100644
---
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java
+++
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/coordination/impl/LeaderElectionImplTest.java
@@ -29,7 +29,7 @@ import org.testng.annotations.Test;
public class LeaderElectionImplTest extends BaseMetadataStoreTest {
- @Test(dataProvider = "impl", timeOut = 10000)
+ @Test(dataProvider = "impl", timeOut = 20000)
public void validateDeadLock(String provider, Supplier<String> urlSupplier)
throws Exception {
if (provider.equals("Memory") || provider.equals("RocksDB")) {
diff --git
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/EtcdMetadataStoreTest.java
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/EtcdMetadataStoreTest.java
index f1a1b5626ac..bdcd0614d03 100644
---
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/EtcdMetadataStoreTest.java
+++
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/EtcdMetadataStoreTest.java
@@ -23,8 +23,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.google.common.io.Resources;
import io.etcd.jetcd.launcher.EtcdCluster;
-import io.etcd.jetcd.launcher.EtcdClusterFactory;
+import io.etcd.jetcd.test.EtcdClusterExtension;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -44,7 +44,8 @@ public class EtcdMetadataStoreTest {
@Test
public void testCluster() throws Exception {
@Cleanup
- EtcdCluster etcdCluster =
EtcdClusterFactory.buildCluster("test-cluster", 3, false);
+ EtcdCluster etcdCluster =
EtcdClusterExtension.builder().withClusterName("test-cluster").withNodes(3)
+ .withSsl(false).build().cluster();
etcdCluster.start();
EtcdConfig etcdConfig = EtcdConfig.builder().useTls(false)
@@ -56,7 +57,7 @@ public class EtcdMetadataStoreTest {
new ObjectMapper(new
YAMLFactory()).writeValue(etcdConfigPath.toFile(), etcdConfig);
String metadataURL =
- "etcd:" +
etcdCluster.getClientEndpoints().stream().map(URI::toString).collect(Collectors.joining(","));
+ "etcd:" +
etcdCluster.clientEndpoints().stream().map(URI::toString).collect(Collectors.joining(","));
@Cleanup
MetadataStore store = MetadataStoreFactory.create(metadataURL,
@@ -71,7 +72,8 @@ public class EtcdMetadataStoreTest {
@Test
public void testClusterWithTls() throws Exception {
@Cleanup
- EtcdCluster etcdCluster =
EtcdClusterFactory.buildCluster("test-cluster", 3, true);
+ EtcdCluster etcdCluster =
EtcdClusterExtension.builder().withClusterName("test-cluster").withNodes(3)
+ .withSsl(true).build().cluster();
etcdCluster.start();
EtcdConfig etcdConfig = EtcdConfig.builder().useTls(true)
@@ -86,7 +88,7 @@ public class EtcdMetadataStoreTest {
new ObjectMapper(new
YAMLFactory()).writeValue(etcdConfigPath.toFile(), etcdConfig);
String metadataURL =
- "etcd:" +
etcdCluster.getClientEndpoints().stream().map(URI::toString).collect(Collectors.joining(","));
+ "etcd:" +
etcdCluster.clientEndpoints().stream().map(URI::toString).collect(Collectors.joining(","));
@Cleanup
MetadataStore store = MetadataStoreFactory.create(metadataURL,
@@ -101,7 +103,8 @@ public class EtcdMetadataStoreTest {
@Test
public void testTlsInstance() throws Exception {
@Cleanup
- EtcdCluster etcdCluster = EtcdClusterFactory.buildCluster("test-tls",
1, true);
+ EtcdCluster etcdCluster =
EtcdClusterExtension.builder().withClusterName("test-tls").withNodes(1)
+ .withSsl(true).build().cluster();
etcdCluster.start();
EtcdConfig etcdConfig = EtcdConfig.builder().useTls(true)
@@ -115,7 +118,7 @@ public class EtcdMetadataStoreTest {
new ObjectMapper(new
YAMLFactory()).writeValue(etcdConfigPath.toFile(), etcdConfig);
String metadataURL =
- "etcd:" +
etcdCluster.getClientEndpoints().stream().map(URI::toString).collect(Collectors.joining(","));
+ "etcd:" +
etcdCluster.clientEndpoints().stream().map(URI::toString).collect(Collectors.joining(","));
@Cleanup
MetadataStore store = MetadataStoreFactory.create(metadataURL,
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index e8e9aa0e708..11ba45b2bc7 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -272,9 +272,13 @@ The Apache Software License, Version 2.0
- grpc-protobuf-lite-1.55.3.jar
- grpc-stub-1.55.3.jar
* JEtcd
- - jetcd-common-0.5.11.jar
- - jetcd-core-0.5.11.jar
-
+ - jetcd-api-0.7.5.jar
+ - jetcd-common-0.7.5.jar
+ - jetcd-core-0.7.5.jar
+ - jetcd-grpc-0.7.5.jar
+ * Vertx
+ - vertx-core-4.3.8.jar
+ - vertx-grpc-4.3.5.jar
* Joda Time
- joda-time-2.10.10.jar
- failsafe-2.4.4.jar
@@ -521,7 +525,7 @@ MIT License
* Checker Qual
- checker-qual-3.33.0.jar
* Annotations
- - animal-sniffer-annotations-1.19.jar
+ - animal-sniffer-annotations-1.21.jar
- annotations-4.1.1.4.jar
* ScribeJava
- scribejava-apis-6.9.0.jar
