You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by mm...@apache.org on 2022/04/03 16:09:57 UTC
[bookkeeper] branch master updated: [netty] remove no longer used properties io.netty.recycler.linkCapacity and io.netty.recycler.maxCapacity.default (#3172)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new daf5264 [netty] remove no longer used properties io.netty.recycler.linkCapacity and io.netty.recycler.maxCapacity.default (#3172)
daf5264 is described below
commit daf52648f210c65d96326a8b9a4f66a72551deef
Author: Nicolò Boschi <bo...@gmail.com>
AuthorDate: Sun Apr 3 18:09:49 2022 +0200
[netty] remove no longer used properties io.netty.recycler.linkCapacity and io.netty.recycler.maxCapacity.default (#3172)
* [netty] remove no longer used properties io.netty.recycler.linkCapacity and io.netty.recycler.maxCapacity.default
* gradle
---
bin/common.sh | 6 +-----
bin/common_gradle.sh | 6 +-----
stream/conf/streamstorage_cli_env.sh | 2 +-
stream/conf/streamstorage_env.sh | 2 +-
tests/scripts/src/test/bash/bk_test_bin_common.sh | 4 +---
tests/scripts/src/test/bash/gradle/bk_test_bin_common.sh | 4 +---
6 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/bin/common.sh b/bin/common.sh
index a61edcf..7949cf9 100755
--- a/bin/common.sh
+++ b/bin/common.sh
@@ -82,8 +82,6 @@ detect_jdk8() {
# default netty settings
NETTY_LEAK_DETECTION_LEVEL=${NETTY_LEAK_DETECTION_LEVEL:-"disabled"}
-NETTY_RECYCLER_MAXCAPACITY=${NETTY_RECYCLER_MAXCAPACITY:-"1000"}
-NETTY_RECYCLER_LINKCAPACITY=${NETTY_RECYCLER_LINKCAPACITY:-"1024"}
USING_JDK8=$(detect_jdk8)
@@ -286,9 +284,7 @@ build_cli_jvm_opts() {
}
build_netty_opts() {
- echo "-Dio.netty.leakDetectionLevel=${NETTY_LEAK_DETECTION_LEVEL} \
- -Dio.netty.recycler.maxCapacity.default=${NETTY_RECYCLER_MAXCAPACITY} \
- -Dio.netty.recycler.linkCapacity=${NETTY_RECYCLER_LINKCAPACITY}"
+ echo "-Dio.netty.leakDetectionLevel=${NETTY_LEAK_DETECTION_LEVEL}"
}
build_logging_opts() {
diff --git a/bin/common_gradle.sh b/bin/common_gradle.sh
index ec70449..82d8fdb 100755
--- a/bin/common_gradle.sh
+++ b/bin/common_gradle.sh
@@ -82,8 +82,6 @@ detect_jdk8() {
# default netty settings
NETTY_LEAK_DETECTION_LEVEL=${NETTY_LEAK_DETECTION_LEVEL:-"disabled"}
-NETTY_RECYCLER_MAXCAPACITY=${NETTY_RECYCLER_MAXCAPACITY:-"1000"}
-NETTY_RECYCLER_LINKCAPACITY=${NETTY_RECYCLER_LINKCAPACITY:-"1024"}
USING_JDK8=$(detect_jdk8)
@@ -268,9 +266,7 @@ build_cli_jvm_opts() {
}
build_netty_opts() {
- echo "-Dio.netty.leakDetectionLevel=${NETTY_LEAK_DETECTION_LEVEL} \
- -Dio.netty.recycler.maxCapacity.default=${NETTY_RECYCLER_MAXCAPACITY} \
- -Dio.netty.recycler.linkCapacity=${NETTY_RECYCLER_LINKCAPACITY}"
+ echo "-Dio.netty.leakDetectionLevel=${NETTY_LEAK_DETECTION_LEVEL}"
}
build_logging_opts() {
diff --git a/stream/conf/streamstorage_cli_env.sh b/stream/conf/streamstorage_cli_env.sh
index cd1a846..504a25b 100644
--- a/stream/conf/streamstorage_cli_env.sh
+++ b/stream/conf/streamstorage_cli_env.sh
@@ -48,7 +48,7 @@ SS_MEM=" -Xms2g -Xmx2g -XX:MaxDirectMemorySize=4g"
SS_GC=" -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB"
# Extra options to be passed to the jvm
-SS_EXTRA_OPTS="${SS_EXTRA_OPTS} ${SS_MEM} ${SS_GC} -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.maxCapacity.default=1000 -Dio.netty.recycler.linkCapacity=1024"
+SS_EXTRA_OPTS="${SS_EXTRA_OPTS} ${SS_MEM} ${SS_GC} -Dio.netty.leakDetectionLevel=disabled"
# Add extra paths to the bookkeeper classpath
# SS_EXTRA_CLASSPATH=
diff --git a/stream/conf/streamstorage_env.sh b/stream/conf/streamstorage_env.sh
index cd1a846..504a25b 100644
--- a/stream/conf/streamstorage_env.sh
+++ b/stream/conf/streamstorage_env.sh
@@ -48,7 +48,7 @@ SS_MEM=" -Xms2g -Xmx2g -XX:MaxDirectMemorySize=4g"
SS_GC=" -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB"
# Extra options to be passed to the jvm
-SS_EXTRA_OPTS="${SS_EXTRA_OPTS} ${SS_MEM} ${SS_GC} -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.maxCapacity.default=1000 -Dio.netty.recycler.linkCapacity=1024"
+SS_EXTRA_OPTS="${SS_EXTRA_OPTS} ${SS_MEM} ${SS_GC} -Dio.netty.leakDetectionLevel=disabled"
# Add extra paths to the bookkeeper classpath
# SS_EXTRA_CLASSPATH=
diff --git a/tests/scripts/src/test/bash/bk_test_bin_common.sh b/tests/scripts/src/test/bash/bk_test_bin_common.sh
index e41455c..f95b3da 100644
--- a/tests/scripts/src/test/bash/bk_test_bin_common.sh
+++ b/tests/scripts/src/test/bash/bk_test_bin_common.sh
@@ -228,9 +228,7 @@ testBuildNettyOpts() {
source ${BK_BINDIR}/common.sh
ACTUAL_NETTY_OPTS=$(build_netty_opts)
- EXPECTED_NETTY_OPTS="-Dio.netty.leakDetectionLevel=disabled \
- -Dio.netty.recycler.maxCapacity.default=1000 \
- -Dio.netty.recycler.linkCapacity=1024"
+ EXPECTED_NETTY_OPTS="-Dio.netty.leakDetectionLevel=disabled"
assertEquals "Netty OPTS is not set correctly" "${EXPECTED_NETTY_OPTS}" "${ACTUAL_NETTY_OPTS}"
}
diff --git a/tests/scripts/src/test/bash/gradle/bk_test_bin_common.sh b/tests/scripts/src/test/bash/gradle/bk_test_bin_common.sh
index c20165f..152298b 100644
--- a/tests/scripts/src/test/bash/gradle/bk_test_bin_common.sh
+++ b/tests/scripts/src/test/bash/gradle/bk_test_bin_common.sh
@@ -205,9 +205,7 @@ testBuildNettyOpts() {
source ${BK_BINDIR}/common_gradle.sh
ACTUAL_NETTY_OPTS=$(build_netty_opts)
- EXPECTED_NETTY_OPTS="-Dio.netty.leakDetectionLevel=disabled \
- -Dio.netty.recycler.maxCapacity.default=1000 \
- -Dio.netty.recycler.linkCapacity=1024"
+ EXPECTED_NETTY_OPTS="-Dio.netty.leakDetectionLevel=disabled"
assertEquals "Netty OPTS is not set correctly" "${EXPECTED_NETTY_OPTS}" "${ACTUAL_NETTY_OPTS}"
}