You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by sh...@apache.org on 2022/06/21 13:22:36 UTC
[pulsar] branch master updated: [improve][pom] Remove redundant pulsar-zookeeper-utils module (#16109)
This is an automated email from the ASF dual-hosted git repository.
shoothzj 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 b0828aa0d51 [improve][pom] Remove redundant pulsar-zookeeper-utils module (#16109)
b0828aa0d51 is described below
commit b0828aa0d51fd9fd718fac601b3ade7c4059aefa
Author: tison <wa...@gmail.com>
AuthorDate: Tue Jun 21 21:22:27 2022 +0800
[improve][pom] Remove redundant pulsar-zookeeper-utils module (#16109)
### Motivation
As PIP-45 moved forward, pulsar-zookeeper-utils is redundant to be a dedicated module. Move the remaining classes to pulsar-broker.
### Modifications
Remove pulsar-zookeeper-utils module and move remaining utils to pulsar-broker module.
### Verifying this change
- [x] Make sure that the change passes the CI checks.
This change is a trivial rework / code cleanup without any test coverage.
### Does this pull request potentially affect one of the following parts:
*If `yes` was chosen, please highlight the changes*
- Dependencies (does it add or upgrade a dependency): **yes**
This change will remove the pulsar-zookeeper-utils module. Since we release pulsar modules simultaneously, I suggest it won't be a big deal.
- The public API: (no)
- The schema: (no)
- The default values of configurations: (no)
- The wire protocol: (no)
- The rest endpoints: (no)
- The admin cli options: (no)
- Anything that affects deployment: (no)
### Documentation
Check the box below or label this PR directly.
Need to update docs?
- [ ] `doc-required`
(Your PR needs to update docs and you will update later)
- [x] `doc-not-needed`
(Please explain why)
- [ ] `doc`
(Your PR contains doc changes)
- [ ] `doc-complete`
(Docs have been already added)
---
pom.xml | 2 -
pulsar-broker-common/pom.xml | 19 ++-
pulsar-broker/pom.xml | 51 ++++--
.../apache/pulsar/stats/CacheMetricsCollector.java | 5 +-
.../java/org/apache/pulsar/stats/package-info.java | 0
.../pulsar/zookeeper/LocalBookkeeperEnsemble.java | 11 +-
.../org/apache/pulsar/zookeeper/package-info.java | 0
.../zookeeper/LocalBookkeeperEnsembleTest.java | 0
.../pulsar/zookeeper/ZookeeperServerTest.java | 0
pulsar-proxy/pom.xml | 6 -
pulsar-websocket/pom.xml | 6 -
pulsar-zookeeper-utils/pom.xml | 189 ---------------------
.../src/test/resources/conf/default_rocksdb.conf | 30 ----
.../resources/conf/entry_location_rocksdb.conf | 70 --------
.../resources/conf/ledger_metadata_rocksdb.conf | 30 ----
src/owasp-dependency-check-false-positives.xml | 5 -
16 files changed, 58 insertions(+), 366 deletions(-)
diff --git a/pom.xml b/pom.xml
index 97dd542804a..c9c4b88980a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2083,7 +2083,6 @@ flexible messaging model and an intuitive client API.</description>
<module>pulsar-client-all</module>
<module>pulsar-websocket</module>
<module>pulsar-proxy</module>
- <module>pulsar-zookeeper-utils</module>
<module>pulsar-testclient</module>
<module>pulsar-broker-auth-athenz</module>
<module>pulsar-client-auth-athenz</module>
@@ -2146,7 +2145,6 @@ flexible messaging model and an intuitive client API.</description>
<module>pulsar-client-tools-test</module>
<module>pulsar-websocket</module>
<module>pulsar-proxy</module>
- <module>pulsar-zookeeper-utils</module>
<module>pulsar-testclient</module>
<module>pulsar-broker-auth-sasl</module>
<module>pulsar-client-auth-sasl</module>
diff --git a/pulsar-broker-common/pom.xml b/pulsar-broker-common/pom.xml
index a59613ba229..ccebe3f6906 100644
--- a/pulsar-broker-common/pom.xml
+++ b/pulsar-broker-common/pom.xml
@@ -33,12 +33,6 @@
<description>Common classes used in multiple broker modules</description>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-metadata</artifactId>
@@ -50,6 +44,11 @@
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_jetty</artifactId>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -70,6 +69,14 @@
<artifactId>jjwt-jackson</artifactId>
</dependency>
+ <!-- test -->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bc-fips</artifactId>
+ <version>${bouncycastlefips.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 94702e2427c..e56eb6fa533 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -88,6 +88,38 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+ <artifactId>stream-storage-server</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-all</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.bookkeeper.tests</groupId>
+ <artifactId>stream-storage-tests-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.inferred</groupId>
+ <artifactId>freebuilder</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-tools-framework</artifactId>
@@ -119,12 +151,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- zookeeper server -->
<dependency>
<groupId>io.dropwizard.metrics</groupId>
@@ -281,6 +307,11 @@
<artifactId>simpleclient_hotspot</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_caffeine</artifactId>
+ </dependency>
+
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
@@ -616,14 +647,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-package-core</artifactId>
diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java b/pulsar-broker/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java
similarity index 91%
rename from pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java
rename to pulsar-broker/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java
index 5df9d3a4ca9..b298db12087 100644
--- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/stats/CacheMetricsCollector.java
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.pulsar.stats;
import lombok.experimental.UtilityClass;
@UtilityClass
public class CacheMetricsCollector {
-
public static final io.prometheus.client.cache.caffeine.CacheMetricsCollector CAFFEINE =
- new io.prometheus.client.cache.caffeine.CacheMetricsCollector()
- .register();
+ new io.prometheus.client.cache.caffeine.CacheMetricsCollector().register();
}
diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/stats/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/stats/package-info.java
similarity index 100%
rename from pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/stats/package-info.java
rename to pulsar-broker/src/main/java/org/apache/pulsar/stats/package-info.java
diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
similarity index 98%
rename from pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
rename to pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
index af01b98f64d..d9ca282e782 100644
--- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
@@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-/**
+
+/*
* This file is derived from LocalBookkeeperEnsemble from Apache BookKeeper
* http://bookkeeper.apache.org
*/
@@ -169,11 +170,11 @@ public class LocalBookkeeperEnsemble {
// BookKeeper variables
String bkDataDirName;
LifecycleComponentStack[] bookieComponents;
- ServerConfiguration bsConfs[];
+ ServerConfiguration[] bsConfs;
// Stream/Table Storage
StreamStorageLifecycleComponent streamStorage;
- Integer streamStoragePort = 4181;
+ int streamStoragePort;
// directories created by this instance
// it is safe to drop them on stop
@@ -231,7 +232,7 @@ public class LocalBookkeeperEnsemble {
ServerCnxn serverCnxn = getZookeeperServerConnection(zooKeeper);
try {
LOG.info("disconnect ZK server side connection {}", serverCnxn);
- Class disconnectReasonClass = Class.forName("org.apache.zookeeper.server.ServerCnxn$DisconnectReason");
+ Class<?> disconnectReasonClass = Class.forName("org.apache.zookeeper.server.ServerCnxn$DisconnectReason");
Method method = serverCnxn.getClass().getMethod("close", disconnectReasonClass);
method.invoke(serverCnxn, Stream.of(disconnectReasonClass.getEnumConstants()).filter(s ->
s.toString().equals("CONNECTION_CLOSE_FORCED")).findFirst().get());
@@ -289,7 +290,7 @@ public class LocalBookkeeperEnsemble {
File bkDataDir = isNotBlank(bkDataDirName)
? Files.createDirectories(Paths.get(bkDataDirName + i)).toFile()
- : createTempDirectory("bk" + Integer.toString(i) + "test");
+ : createTempDirectory("bk" + i + "test");
if (this.clearOldData) {
cleanDirectory(bkDataDir);
diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/package-info.java b/pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/package-info.java
similarity index 100%
rename from pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/package-info.java
rename to pulsar-broker/src/main/java/org/apache/pulsar/zookeeper/package-info.java
diff --git a/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
similarity index 100%
rename from pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
rename to pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsembleTest.java
diff --git a/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
similarity index 100%
rename from pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
rename to pulsar-broker/src/test/java/org/apache/pulsar/zookeeper/ZookeeperServerTest.java
diff --git a/pulsar-proxy/pom.xml b/pulsar-proxy/pom.xml
index 7a80ec83f43..060d4c45f21 100644
--- a/pulsar-proxy/pom.xml
+++ b/pulsar-proxy/pom.xml
@@ -37,12 +37,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pulsar-broker-common</artifactId>
diff --git a/pulsar-websocket/pom.xml b/pulsar-websocket/pom.xml
index 40245300844..cf9d9865bcd 100644
--- a/pulsar-websocket/pom.xml
+++ b/pulsar-websocket/pom.xml
@@ -52,12 +52,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
diff --git a/pulsar-zookeeper-utils/pom.xml b/pulsar-zookeeper-utils/pom.xml
deleted file mode 100644
index dbb836adfe4..00000000000
--- a/pulsar-zookeeper-utils/pom.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar</artifactId>
- <version>2.11.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>pulsar-zookeeper-utils</artifactId>
- <name>Pulsar ZooKeeper Utils</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>bookkeeper-server</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>stream-storage-server</artifactId>
- <exclusions>
- <exclusion>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.curator</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.bookkeeper.tests</groupId>
- <artifactId>stream-storage-tests-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.inferred</groupId>
- <artifactId>freebuilder</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- </dependency>
-
- <!-- `grpc-all` is excluded from `stream-storage-server` at root pom file -->
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-all</artifactId>
- </dependency>
-
- <dependency>
- <groupId>io.perfmark</groupId>
- <artifactId>perfmark-api</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.bookkeeper.stats</groupId>
- <artifactId>prometheus-metrics-provider</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>testmocks</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>pulsar-common</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_caffeine</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>checkstyle</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/pulsar-zookeeper-utils/src/test/resources/conf/default_rocksdb.conf b/pulsar-zookeeper-utils/src/test/resources/conf/default_rocksdb.conf
deleted file mode 100644
index e1a21bb8452..00000000000
--- a/pulsar-zookeeper-utils/src/test/resources/conf/default_rocksdb.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-[DBOptions]
- # set by jni: options.setCreateIfMissing
- create_if_missing=true
- # set by jni: options.setInfoLogLevel
- info_log_level=INFO_LEVEL
- # set by jni: options.setKeepLogFileNum
- keep_log_file_num=30
-
-[CFOptions "default"]
- # set by jni: options.setLogFileTimeToRoll
- log_file_time_to_roll=86400
\ No newline at end of file
diff --git a/pulsar-zookeeper-utils/src/test/resources/conf/entry_location_rocksdb.conf b/pulsar-zookeeper-utils/src/test/resources/conf/entry_location_rocksdb.conf
deleted file mode 100644
index 31bd58506ef..00000000000
--- a/pulsar-zookeeper-utils/src/test/resources/conf/entry_location_rocksdb.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-[DBOptions]
- # set by jni: options.setCreateIfMissing
- create_if_missing=true
- # set by jni: options.setInfoLogLevel
- info_log_level=INFO_LEVEL
- # set by jni: options.setKeepLogFileNum
- keep_log_file_num=30
- # set by jni: options.setLogFileTimeToRoll
- log_file_time_to_roll=86400
- # set by jni: options.setMaxBackgroundJobs or options.setIncreaseParallelism
- max_background_jobs=2
- # set by jni: options.setMaxSubcompactions
- max_subcompactions=1
- # set by jni: options.setMaxTotalWalSize
- max_total_wal_size=536870912
- # set by jni: options.setMaxOpenFiles
- max_open_files=-1
- # set by jni: options.setDeleteObsoleteFilesPeriodMicros
- delete_obsolete_files_period_micros=3600000000
-
-[CFOptions "default"]
- # set by jni: options.setCompressionType
- compression=kLZ4Compression
- # set by jni: options.setWriteBufferSize
- write_buffer_size=67108864
- # set by jni: options.setMaxWriteBufferNumber
- max_write_buffer_number=4
- # set by jni: options.setNumLevels
- num_levels=7
- # set by jni: options.setLevelZeroFileNumCompactionTrigger
- level0_file_num_compaction_trigger=4
- # set by jni: options.setMaxBytesForLevelBase
- max_bytes_for_level_base=268435456
- # set by jni: options.setTargetFileSizeBase
- target_file_size_base=67108864
-
-[TableOptions/BlockBasedTable "default"]
- # set by jni: tableOptions.setBlockSize
- block_size=65536
- # set by jni: tableOptions.setBlockCache
- block_cache=206150041
- # set by jni: tableOptions.setFormatVersion
- format_version=2
- # set by jni: tableOptions.setChecksumType
- checksum=kxxHash
- # set by jni: tableOptions.setFilterPolicy, bloomfilter:[bits_per_key]:[use_block_based_builder]
- filter_policy=rocksdb.BloomFilter:10:false
- # set by jni: tableOptions.setCacheIndexAndFilterBlocks
- cache_index_and_filter_blocks=true
- # set by jni: options.setLevelCompactionDynamicLevelBytes
- level_compaction_dynamic_level_bytes=true
\ No newline at end of file
diff --git a/pulsar-zookeeper-utils/src/test/resources/conf/ledger_metadata_rocksdb.conf b/pulsar-zookeeper-utils/src/test/resources/conf/ledger_metadata_rocksdb.conf
deleted file mode 100644
index e1a21bb8452..00000000000
--- a/pulsar-zookeeper-utils/src/test/resources/conf/ledger_metadata_rocksdb.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-[DBOptions]
- # set by jni: options.setCreateIfMissing
- create_if_missing=true
- # set by jni: options.setInfoLogLevel
- info_log_level=INFO_LEVEL
- # set by jni: options.setKeepLogFileNum
- keep_log_file_num=30
-
-[CFOptions "default"]
- # set by jni: options.setLogFileTimeToRoll
- log_file_time_to_roll=86400
\ No newline at end of file
diff --git a/src/owasp-dependency-check-false-positives.xml b/src/owasp-dependency-check-false-positives.xml
index 7cf6d0ca5d8..54b703f0108 100644
--- a/src/owasp-dependency-check-false-positives.xml
+++ b/src/owasp-dependency-check-false-positives.xml
@@ -27,11 +27,6 @@
</notes>
<cpe>cpe:/a:apache:http_server</cpe>
</suppress>
- <suppress>
- <notes>pulsar-zookeeper-utils gets mixed with zookeeper.</notes>
- <gav regex="true">org\.apache\.pulsar:.*</gav>
- <cpe>cpe:/a:apache:zookeeper</cpe>
- </suppress>
<suppress>
<notes>pulsar-package-bookkeeper-storage gets mixed with bookkeeper.</notes>
<gav regex="true">org\.apache\.pulsar:.*</gav>