This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a commit to branch update_pinot_helm_for_custom_config_file in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit c3d3d20b59f5af7e190afdbaa32a8ff121bd4c26 Author: Xiang Fu <fx19880...@gmail.com> AuthorDate: Fri Sep 11 22:50:53 2020 -0700 Update pinot helm to adding custom configs and update the jvm default configs --- .../helm/pinot/templates/broker/configmap.yaml | 2 +- .../helm/pinot/templates/controller/configmap.yaml | 2 +- .../helm/pinot/templates/server/configmap.yaml | 2 +- kubernetes/helm/pinot/values.yaml | 21 ++++++++++++++++++--- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/kubernetes/helm/pinot/templates/broker/configmap.yaml b/kubernetes/helm/pinot/templates/broker/configmap.yaml index 9ed5dd5..525ae80 100644 --- a/kubernetes/helm/pinot/templates/broker/configmap.yaml +++ b/kubernetes/helm/pinot/templates/broker/configmap.yaml @@ -25,4 +25,4 @@ data: pinot-broker.conf: |- pinot.broker.client.queryPort={{ .Values.broker.port }} pinot.broker.routing.table.builder.class={{ .Values.broker.routingTable.builderClass }} - pinot.set.instance.id.to.hostname=true +{{ .Values.broker.extra.configs | indent 4 }} \ No newline at end of file diff --git a/kubernetes/helm/pinot/templates/controller/configmap.yaml b/kubernetes/helm/pinot/templates/controller/configmap.yaml index 69d24a8..3d40a27 100644 --- a/kubernetes/helm/pinot/templates/controller/configmap.yaml +++ b/kubernetes/helm/pinot/templates/controller/configmap.yaml @@ -29,4 +29,4 @@ data: controller.vip.port={{ .Values.controller.service.port }} controller.data.dir={{ .Values.controller.data.dir }} controller.zk.str={{ include "zookeeper.url" . }} - pinot.set.instance.id.to.hostname=true +{{ .Values.controller.extra.configs | indent 4 }} \ No newline at end of file diff --git a/kubernetes/helm/pinot/templates/server/configmap.yaml b/kubernetes/helm/pinot/templates/server/configmap.yaml index c99e173..f4320cf 100644 --- a/kubernetes/helm/pinot/templates/server/configmap.yaml +++ b/kubernetes/helm/pinot/templates/server/configmap.yaml @@ -27,4 +27,4 @@ data: pinot.server.adminapi.port={{ .Values.server.ports.admin }} pinot.server.instance.dataDir={{ .Values.server.dataDir }} pinot.server.instance.segmentTarDir={{ .Values.server.segmentTarDir }} - pinot.set.instance.id.to.hostname=true +{{ .Values.server.extra.configs | indent 4 }} \ No newline at end of file diff --git a/kubernetes/helm/pinot/values.yaml b/kubernetes/helm/pinot/values.yaml index 689a8f0..4e6c347 100644 --- a/kubernetes/helm/pinot/values.yaml +++ b/kubernetes/helm/pinot/values.yaml @@ -47,7 +47,7 @@ controller: host: pinot-controller port: 9000 - jvmOpts: "-Xms256M -Xmx1G" + jvmOpts: "-Xms256M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCApplicationConcurrentTime -Xloggc:/opt/pinot/gc-pinot-controller.log" log4j2ConfFile: /opt/pinot/conf/pinot-controller-log4j2.xml pluginsDir: /opt/pinot/plugins @@ -80,6 +80,11 @@ controller: updateStrategy: type: RollingUpdate + # Extra configs will be appended to pinot-controller.conf file + extra: + configs: |- + pinot.set.instance.id.to.hostname=true + broker: name: broker @@ -87,7 +92,7 @@ broker: replicaCount: 1 - jvmOpts: "-Xms256M -Xmx1G" + jvmOpts: "-Xms256M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCApplicationConcurrentTime -Xloggc:/opt/pinot/gc-pinot-broker.log" log4j2ConfFile: /opt/pinot/conf/pinot-broker-log4j2.xml pluginsDir: /opt/pinot/plugins @@ -123,6 +128,11 @@ broker: updateStrategy: type: RollingUpdate + # Extra configs will be appended to pinot-broker.conf file + extra: + configs: |- + pinot.set.instance.id.to.hostname=true + server: name: server @@ -143,7 +153,7 @@ server: storageClass: "" #storageClass: "ssd" - jvmOpts: "-Xms512M -Xmx1G" + jvmOpts: "-Xms512M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCApplicationConcurrentTime -Xloggc:/opt/pinot/gc-pinot-server.log" log4j2ConfFile: /opt/pinot/conf/pinot-server-log4j2.xml pluginsDir: /opt/pinot/plugins @@ -171,6 +181,11 @@ server: updateStrategy: type: RollingUpdate + # Extra configs will be appended to pinot-server.conf file + extra: + configs: |- + pinot.set.instance.id.to.hostname=true + pinot.server.instance.realtime.alloc.offheap=true # ------------------------------------------------------------------------------ # Zookeeper: # ------------------------------------------------------------------------------ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org