This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-helm-chart.git
commit 76b45b46a2b4eb57908a485ee6e22077ae069fef
Author: 冉小龙 <ranxiaolong...@gmail.com>
AuthorDate: Fri Dec 6 18:07:08 2019 +0800
[Issue:5687] Add prefix for new keys from Env (#5790)
Signed-off-by: xiaolong.ran <r...@apache.org>
Fixes #5687
### Motivation
When the user wants to add new keys for Env, adding fails if no prefix is
added.
Currently, add new keys for Env use the script of
[apply-config-from-env.py](https://github.com/apache/pulsar/commits/master/docker/pulsar/scripts/apply-config-from-env.py),
to ensure that the env set by the user can take effect, add the
prefix(**PULSAR_PREFIX_**) for all keys.
### Modifications
- Add prefix for new keys from Env
---
pulsar/values-mini.yaml | 20 ++++++++++----------
pulsar/values.yaml | 22 +++++++++++-----------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/pulsar/values-mini.yaml b/pulsar/values-mini.yaml
index 4ab8448..1ed8935 100644
--- a/pulsar/values-mini.yaml
+++ b/pulsar/values-mini.yaml
@@ -143,11 +143,11 @@ bookkeeper:
##
configData:
PULSAR_MEM: "\"-Xms128m -Xmx256m -XX:MaxDirectMemorySize=128m
-Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024
-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 -XX:+ExitOnOutOfMemoryError
-XX:+PerfDisableSharedMem -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX [...]
- dbStorage_writeCacheMaxSizeMb: "32"
- dbStorage_readAheadCacheMaxSizeMb: "32"
- journalMaxSizeMB: "2048"
- statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
- useHostNameAsBookieID: "true"
+ PULSAR_PREFIX_dbStorage_writeCacheMaxSizeMb: "32"
+ PULSAR_PREFIX_dbStorage_readAheadCacheMaxSizeMb: "32"
+ PULSAR_PREFIX_journalMaxSizeMB: "2048"
+ PULSAR_PREFIX_statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
+ PULSAR_PREFIX_useHostNameAsBookieID: "true"
## Bookkeeper configmap
## templates/bookkeeper-service.yaml
##
@@ -187,11 +187,11 @@ broker:
configData:
PULSAR_MEM: "\"-Xms128m -Xmx256m -XX:MaxDirectMemorySize=128m
-Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024
-XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions
-XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32
-XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC
-XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem\""
PULSAR_GC: "\"-XX:+UseG1GC -XX:MaxGCPauseMillis=10\""
- managedLedgerDefaultEnsembleSize: "2"
- managedLedgerDefaultWriteQuorum: "2"
- managedLedgerDefaultAckQuorum: "2"
- deduplicationEnabled: "false"
- exposeTopicLevelMetricsInPrometheus: "true"
+ PULSAR_PREFIX_managedLedgerDefaultEnsembleSize: "2"
+ PULSAR_PREFIX_managedLedgerDefaultWriteQuorum: "2"
+ PULSAR_PREFIX_managedLedgerDefaultAckQuorum: "2"
+ PULSAR_PREFIX_deduplicationEnabled: "false"
+ PULSAR_PREFIX_exposeTopicLevelMetricsInPrometheus: "true"
## Broker service
## templates/broker-service.yaml
##
diff --git a/pulsar/values.yaml b/pulsar/values.yaml
index 1a17fef..db57089 100644
--- a/pulsar/values.yaml
+++ b/pulsar/values.yaml
@@ -164,12 +164,12 @@ bookkeeper:
##
configData:
PULSAR_MEM: "\"-Xms15g -Xmx15g -XX:MaxDirectMemorySize=15g
-Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024
-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 -XX:+ExitOnOutOfMemoryError
-XX:+PerfDisableSharedMem -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+P
[...]
- dbStorage_writeCacheMaxSizeMb: "2048"
- dbStorage_readAheadCacheMaxSizeMb: "2048"
- dbStorage_rocksDB_blockCacheSize: "268435456"
- journalMaxSizeMB: "2048"
- statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
- useHostNameAsBookieID: "true"
+ PULSAR_PREFIX_dbStorage_writeCacheMaxSizeMb: "2048"
+ PULSAR_PREFIX_dbStorage_readAheadCacheMaxSizeMb: "2048"
+ PULSAR_PREFIX_dbStorage_rocksDB_blockCacheSize: "268435456"
+ PULSAR_PREFIX_journalMaxSizeMB: "2048"
+ PULSAR_PREFIX_statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
+ PULSAR_PREFIX_useHostNameAsBookieID: "true"
## Bookkeeper configmap
## templates/bookkeeper-service.yaml
##
@@ -209,11 +209,11 @@ broker:
configData:
PULSAR_MEM: "\"-Xms15g -Xmx15g -XX:MaxDirectMemorySize=15g
-Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024
-XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions
-XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32
-XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC
-XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem\""
PULSAR_GC: "\"-XX:+UseG1GC -XX:MaxGCPauseMillis=10\""
- managedLedgerDefaultEnsembleSize: "3"
- managedLedgerDefaultWriteQuorum: "3"
- managedLedgerDefaultAckQuorum: "2"
- deduplicationEnabled: "false"
- exposeTopicLevelMetricsInPrometheus: "true"
+ PULSAR_PREFIX_managedLedgerDefaultEnsembleSize: "3"
+ PULSAR_PREFIX_managedLedgerDefaultWriteQuorum: "3"
+ PULSAR_PREFIX_managedLedgerDefaultAckQuorum: "2"
+ PULSAR_PREFIX_deduplicationEnabled: "false"
+ PULSAR_PREFIX_exposeTopicLevelMetricsInPrometheus: "true"
## Broker service
## templates/broker-service.yaml
##
