From 0e7778ca685b001dd6c12f55d550cc6c97935678 Mon Sep 17 00:00:00 2001 From: Sijie Guo Date: Thu, 13 Aug 2020 01:53:54 -0700 Subject: [PATCH 1/2] Bump bk version to 4.11.0 --- .../server/src/assemble/LICENSE.bin.txt | 52 +++++++++---------- .../test/BookKeeperClusterTestCase.java | 7 ++- pom.xml | 2 +- .../apache/pulsar/PulsarBrokerStarter.java | 4 +- .../pulsar/broker/service/RackAwareTest.java | 3 +- .../transaction/TransactionTestBase.java | 2 +- pulsar-sql/presto-distribution/LICENSE | 22 ++++---- .../zookeeper/LocalBookkeeperEnsemble.java | 9 ++-- 8 files changed, 54 insertions(+), 47 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 13d63e4f73038..dd608e0392d07 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -384,32 +384,32 @@ The Apache Software License, Version 2.0 - org.apache.logging.log4j-log4j-web-2.10.0.jar * Java Native Access JNA -- net.java.dev.jna-jna-4.2.0.jar * BookKeeper - - org.apache.bookkeeper-bookkeeper-common-4.10.0.jar - - org.apache.bookkeeper-bookkeeper-common-allocator-4.10.0.jar - - org.apache.bookkeeper-bookkeeper-proto-4.10.0.jar - - org.apache.bookkeeper-bookkeeper-server-4.10.0.jar - - org.apache.bookkeeper-bookkeeper-tools-framework-4.10.0.jar - - org.apache.bookkeeper-circe-checksum-4.10.0.jar - - org.apache.bookkeeper-cpu-affinity-4.10.0.jar - - org.apache.bookkeeper-statelib-4.10.0.jar - - org.apache.bookkeeper-stream-storage-api-4.10.0.jar - - org.apache.bookkeeper-stream-storage-common-4.10.0.jar - - org.apache.bookkeeper-stream-storage-java-client-4.10.0.jar - - org.apache.bookkeeper-stream-storage-java-client-base-4.10.0.jar - - org.apache.bookkeeper-stream-storage-proto-4.10.0.jar - - org.apache.bookkeeper-stream-storage-server-4.10.0.jar - - org.apache.bookkeeper-stream-storage-service-api-4.10.0.jar - - org.apache.bookkeeper-stream-storage-service-impl-4.10.0.jar - - org.apache.bookkeeper.http-http-server-4.10.0.jar - - org.apache.bookkeeper.http-vertx-http-server-4.10.0.jar - - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.10.0.jar - - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.10.0.jar - - org.apache.bookkeeper.tests-stream-storage-tests-common-4.10.0.jar - - org.apache.distributedlog-distributedlog-common-4.10.0.jar - - org.apache.distributedlog-distributedlog-core-4.10.0-tests.jar - - org.apache.distributedlog-distributedlog-core-4.10.0.jar - - org.apache.distributedlog-distributedlog-protocol-4.10.0.jar - - org.apache.bookkeeper.stats-codahale-metrics-provider-4.10.0.jar + - org.apache.bookkeeper-bookkeeper-common-4.11.0.jar + - org.apache.bookkeeper-bookkeeper-common-allocator-4.11.0.jar + - org.apache.bookkeeper-bookkeeper-proto-4.11.0.jar + - org.apache.bookkeeper-bookkeeper-server-4.11.0.jar + - org.apache.bookkeeper-bookkeeper-tools-framework-4.11.0.jar + - org.apache.bookkeeper-circe-checksum-4.11.0.jar + - org.apache.bookkeeper-cpu-affinity-4.11.0.jar + - org.apache.bookkeeper-statelib-4.11.0.jar + - org.apache.bookkeeper-stream-storage-api-4.11.0.jar + - org.apache.bookkeeper-stream-storage-common-4.11.0.jar + - org.apache.bookkeeper-stream-storage-java-client-4.11.0.jar + - org.apache.bookkeeper-stream-storage-java-client-base-4.11.0.jar + - org.apache.bookkeeper-stream-storage-proto-4.11.0.jar + - org.apache.bookkeeper-stream-storage-server-4.11.0.jar + - org.apache.bookkeeper-stream-storage-service-api-4.11.0.jar + - org.apache.bookkeeper-stream-storage-service-impl-4.11.0.jar + - org.apache.bookkeeper.http-http-server-4.11.0.jar + - org.apache.bookkeeper.http-vertx-http-server-4.11.0.jar + - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.11.0.jar + - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.11.0.jar + - org.apache.bookkeeper.tests-stream-storage-tests-common-4.11.0.jar + - org.apache.distributedlog-distributedlog-common-4.11.0.jar + - org.apache.distributedlog-distributedlog-core-4.11.0-tests.jar + - org.apache.distributedlog-distributedlog-core-4.11.0.jar + - org.apache.distributedlog-distributedlog-protocol-4.11.0.jar + - org.apache.bookkeeper.stats-codahale-metrics-provider-4.11.0.jar * AirCompressor - io.airlift-aircompressor-0.16.jar * AsyncHttpClient diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java b/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java index 96aaff8d4d163..50cd4886e0a90 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/test/BookKeeperClusterTestCase.java @@ -38,6 +38,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.function.Supplier; import org.apache.bookkeeper.bookie.Bookie; import org.apache.bookkeeper.bookie.BookieException; import org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorage; @@ -46,6 +47,7 @@ import org.apache.bookkeeper.conf.AbstractConfiguration; import org.apache.bookkeeper.conf.ClientConfiguration; import org.apache.bookkeeper.conf.ServerConfiguration; +import org.apache.bookkeeper.discover.BookieServiceInfo; import org.apache.bookkeeper.metastore.InMemoryMetaStore; import org.apache.bookkeeper.net.BookieSocketAddress; import org.apache.bookkeeper.proto.BookieServer; @@ -470,11 +472,12 @@ protected BookieServer startBookie(ServerConfiguration conf) throws Exception { */ protected BookieServer startBookie(ServerConfiguration conf, final Bookie b) throws Exception { BookieServer server = new BookieServer(conf) { + @Override - protected Bookie newBookie(ServerConfiguration conf, ByteBufAllocator allocator) - throws IOException, KeeperException, InterruptedException, BookieException { + protected Bookie newBookie(ServerConfiguration conf, ByteBufAllocator allocator, Supplier bookieServiceInfoProvider) throws IOException, KeeperException, InterruptedException, BookieException { return b; } + }; server.start(); diff --git a/pom.xml b/pom.xml index d8176364cf515..c056ec4751c89 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ flexible messaging model and an intuitive client API. 1.19 - 4.10.0 + 4.11.0 3.5.7 4.1.48.Final 2.0.30.Final diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java index 165b616a5356b..0a6ae3d8c2947 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java @@ -40,6 +40,7 @@ import java.text.SimpleDateFormat; import org.apache.bookkeeper.conf.ServerConfiguration; +import org.apache.bookkeeper.discover.BookieServiceInfo; import org.apache.bookkeeper.proto.BookieServer; import org.apache.bookkeeper.replication.AutoRecoveryMain; import org.apache.bookkeeper.stats.StatsProvider; @@ -248,7 +249,8 @@ && isBlank(starterArguments.bookieConfigFile)) { if (starterArguments.runBookie) { checkNotNull(bookieConfig, "No ServerConfiguration for Bookie"); checkNotNull(bookieStatsProvider, "No Stats Provider for Bookie"); - bookieServer = new BookieServer(bookieConfig, bookieStatsProvider.getStatsLogger("")); + bookieServer = new BookieServer( + bookieConfig, bookieStatsProvider.getStatsLogger(""), BookieServiceInfo.NO_INFO); } else { bookieServer = null; } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java index bcca644a3064c..026afc25d9b4a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/RackAwareTest.java @@ -29,6 +29,7 @@ import org.apache.bookkeeper.client.BookKeeper.DigestType; import org.apache.bookkeeper.client.LedgerHandle; import org.apache.bookkeeper.conf.ServerConfiguration; +import org.apache.bookkeeper.discover.BookieServiceInfo; import org.apache.bookkeeper.net.BookieSocketAddress; import org.apache.bookkeeper.proto.BookieServer; import org.apache.bookkeeper.stats.NullStatsLogger; @@ -70,7 +71,7 @@ protected void setup() throws Exception { String addr = String.format("10.0.0.%d", i + 1); conf.setAdvertisedAddress(addr); - BookieServer bs = new BookieServer(conf, NullStatsLogger.INSTANCE); + BookieServer bs = new BookieServer(conf, NullStatsLogger.INSTANCE, BookieServiceInfo.NO_INFO); bs.start(); bookies.add(bs); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java index b8ecf5bfb12cc..d24afec272ebe 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTestBase.java @@ -40,7 +40,7 @@ import org.apache.bookkeeper.client.EnsemblePlacementPolicy; import org.apache.bookkeeper.client.PulsarMockBookKeeper; import org.apache.bookkeeper.stats.StatsLogger; -import org.apache.bookkeeper.test.PortManager; +import org.apache.bookkeeper.util.PortManager; import org.apache.bookkeeper.util.ZkUtils; import org.apache.pulsar.broker.BookKeeperClientFactory; import org.apache.pulsar.broker.PulsarService; diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index b1fd389177879..468bbef6111db 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -415,17 +415,17 @@ The Apache Software License, Version 2.0 - async-http-client-2.12.1.jar - async-http-client-netty-utils-2.12.1.jar * Apache Bookkeeper - - bookkeeper-common-4.10.0.jar - - bookkeeper-common-allocator-4.10.0.jar - - bookkeeper-proto-4.10.0.jar - - bookkeeper-server-4.10.0.jar - - bookkeeper-stats-api-4.10.0.jar - - bookkeeper-tools-framework-4.10.0.jar - - circe-checksum-4.10.0.jar - - codahale-metrics-provider-4.10.0.jar - - cpu-affinity-4.10.0.jar - - http-server-4.10.0.jar - - prometheus-metrics-provider-4.10.0.jar + - bookkeeper-common-4.11.0.jar + - bookkeeper-common-allocator-4.11.0.jar + - bookkeeper-proto-4.11.0.jar + - bookkeeper-server-4.11.0.jar + - bookkeeper-stats-api-4.11.0.jar + - bookkeeper-tools-framework-4.11.0.jar + - circe-checksum-4.11.0.jar + - codahale-metrics-provider-4.11.0.jar + - cpu-affinity-4.11.0.jar + - http-server-4.11.0.jar + - prometheus-metrics-provider-4.11.0.jar * Apache Commons - commons-cli-1.2.jar - commons-codec-1.10.jar diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java index 2658035a1ba26..629755e541054 100644 --- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java +++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java @@ -54,6 +54,7 @@ import org.apache.bookkeeper.common.util.Backoff; import org.apache.bookkeeper.common.util.Backoff.Jitter.Type; import org.apache.bookkeeper.conf.ServerConfiguration; +import org.apache.bookkeeper.discover.BookieServiceInfo; import org.apache.bookkeeper.proto.BookieServer; import org.apache.bookkeeper.replication.ReplicationException; import org.apache.bookkeeper.server.conf.BookieConfiguration; @@ -275,7 +276,7 @@ private void runBookies(ServerConfiguration baseConf) throws Exception { bsConfs[i].setAllowEphemeralPorts(true); try { - bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE); + bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE, BookieServiceInfo.NO_INFO); } catch (InvalidCookieException e) { // InvalidCookieException can happen if the machine IP has changed // Since we are running here a local bookie that is always accessed @@ -288,7 +289,7 @@ private void runBookies(ServerConfiguration baseConf) throws Exception { new File(new File(bkDataDir, "current"), "VERSION").delete(); // Retry to start the bookie after cleaning the old left cookie - bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE); + bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE, BookieServiceInfo.NO_INFO); } bs[i].start(); LOG.debug("Local BK[{}] started (port: {}, data_directory: {})", i, bookiePort, @@ -420,7 +421,7 @@ public void startBK() throws Exception { for (int i = 0; i < numberOfBookies; i++) { try { - bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE); + bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE, BookieServiceInfo.NO_INFO); } catch (InvalidCookieException e) { // InvalidCookieException can happen if the machine IP has changed // Since we are running here a local bookie that is always accessed @@ -433,7 +434,7 @@ public void startBK() throws Exception { new File(new File(bsConfs[i].getJournalDirNames()[0], "current"), "VERSION").delete(); // Retry to start the bookie after cleaning the old left cookie - bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE); + bs[i] = new BookieServer(bsConfs[i], NullStatsLogger.INSTANCE, BookieServiceInfo.NO_INFO); } bs[i].start(); From 78c3be23843bdae19c37f89e89fbc5a10b109059 Mon Sep 17 00:00:00 2001 From: "xiaolong.ran" Date: Tue, 25 Aug 2020 13:16:20 +0800 Subject: [PATCH 2/2] fix ci error Signed-off-by: xiaolong.ran --- distribution/server/src/assemble/LICENSE.bin.txt | 9 +++++++++ pulsar-sql/presto-distribution/LICENSE | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index dd608e0392d07..c93b0a9305fa5 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -345,6 +345,15 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-collections4-4.1.jar - org.apache.commons-commons-compress-1.19.jar - org.apache.commons-commons-lang3-3.6.jar + * Apache Http Components + - org.apache.httpcomponents-httpclient-4.5.5.jar + - org.apache.httpcomponents-httpcore-4.4.1.jar + * Apache Thrift + - org.apache.thrift-libthrift-0.12.0.jar + * Bouncy Castle + - org.bouncycastle-bcpkix-jdk15on-1.60.jar + - org.bouncycastle-bcprov-ext-jdk15on-1.60.jar + - org.bouncycastle-bcprov-jdk15on-1.60.jar * Netty - io.netty-netty-buffer-4.1.48.Final.jar - io.netty-netty-codec-4.1.48.Final.jar diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 468bbef6111db..e42ec38c6c9cc 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -231,6 +231,9 @@ The Apache Software License, Version 2.0 - commons-beanutils-core-1.8.3.jar - commons-compress-1.19.jar - commons-lang3-3.6.jar + * Http + - httpcore-4.4.9.jar + - httpclient-4.5.5.jar * Netty - netty-3.10.6.Final.jar - netty-buffer-4.1.48.Final.jar @@ -246,7 +249,6 @@ The Apache Software License, Version 2.0 - netty-resolver-dns-4.1.48.Final.jar - netty-tcnative-boringssl-static-2.0.30.Final.jar - netty-transport-4.1.48.Final.jar - - netty-transport-native-epoll-4.1.48.Final.jar - netty-transport-native-epoll-4.1.48.Final-linux-x86_64.jar - netty-transport-native-kqueue-4.1.48.Final-osx-x86_64.jar - netty-transport-native-unix-common-4.1.48.Final.jar @@ -433,7 +435,7 @@ The Apache Software License, Version 2.0 - commons-configuration-1.10.jar - commons-io-2.5.jar - commons-lang-2.6.jar - - commons-logging-1.1.1.jar + - commons-logging-1.2.jar * GSON - gson-2.8.2.jar * Jackson @@ -567,5 +569,9 @@ Creative Commons Attribution License - jcip-annotations-1.0.jar Bouncy Castle License + * Bouncy Castle + - bcprov-jdk15on-1.60.jar + - bcprov-ext-jdk15on-1.60.jar + - bcpkix-jdk15on-1.60.jar * Bouncy Castle -- licenses/LICENSE-bouncycastle.txt - bouncy-castle-bc-shaded-2.7.0-SNAPSHOT.jar