This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 5f309cf Update pinot helm to adding custom configs and update the jvm
default configs (#6011)
5f309cf is described below
commit 5f309cff34da802616d92ed361284d95b35ed9b9
Author: Xiang Fu <fx19880...@gmail.com>
AuthorDate: Sun Sep 13 15:53:28 2020 -0700
Update pinot helm to adding custom configs and update the jvm default
configs (#6011)
---
kubernetes/helm/pinot/README.md | 9 ++++++---
.../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 ++++++++++++++++++---
5 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/kubernetes/helm/pinot/README.md b/kubernetes/helm/pinot/README.md
index 12e7ab7..24ea06a 100644
--- a/kubernetes/helm/pinot/README.md
+++ b/kubernetes/helm/pinot/README.md
@@ -307,7 +307,7 @@ following configurable parameters:
| `controller.persistence.size` | Size of data volume
| `1G`
|
| `controller.persistence.mountPath` | Mount path of controller
data volume
|
`/var/pinot/controller/data` |
| `controller.persistence.storageClass` | Storage class of backing
PVC
| `""`
|
-| `controller.jvmOpts` | Pinot Controller JVM
Options
|
`-Xms256M -Xmx1G` |
+| `controller.jvmOpts` | Pinot Controller JVM
Options
|
`-Xms256M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDetails
-XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime
-XX:+PrintGCApplicationConcurrentTime
-Xloggc:/opt/pinot/gc-pinot-controller.log`
|
| `controller.log4j2ConfFile` | Pinot Controller log4j2
configuration file
|
`/opt/pinot/conf/pinot-controller-log4j2.xml` |
| `controller.pluginsDir` | Pinot Controller plugins
directory
|
`/opt/pinot/plugins` |
| `controller.service.port` | Service Port
| `9000`
|
@@ -320,11 +320,12 @@ following configurable parameters:
| `controller.tolerations` | List of node tolerations
for the pods.
<https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/>
| `[]`
|
| `controller.podAnnotations` | Annotations to be added to
controller pod
| `{}`
|
| `controller.updateStrategy.type` | StatefulSet update strategy
to use.
|
`RollingUpdate` |
+| `controller.extra.configs` | Extra configs append to
'pinot-controller.conf' file to start Pinot Controller
|
`pinot.set.instance.id.to.hostname=true` |
|------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------|
| `broker.name` | Name of Pinot Broker
| `broker`
|
| `broker.port` | Pinot broker port
| `8099`
|
| `broker.replicaCount` | Pinot broker replicas
| `1`
|
-| `broker.jvmOpts` | Pinot Broker JVM Options
| `-Xms256M
-Xmx1G` |
+| `broker.jvmOpts` | Pinot Broker JVM Options
| `-Xms256M
-Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDetails
-XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime
-XX:+PrintGCApplicationConcurrentTime -Xloggc:/opt/pinot/gc-pinot-broker.log`
|
| `broker.log4j2ConfFile` | Pinot Broker log4j2
configuration file
|
`/opt/pinot/conf/pinot-broker-log4j2.xml` |
| `broker.pluginsDir` | Pinot Broker plugins
directory
|
`/opt/pinot/plugins` |
| `broker.service.port` | Service Port
| `8099`
|
@@ -338,6 +339,7 @@ following configurable parameters:
| `broker.tolerations` | List of node tolerations
for the pods.
<https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/>
| `[]`
|
| `broker.podAnnotations` | Annotations to be added to
broker pod
| `{}`
|
| `broker.updateStrategy.type` | StatefulSet update strategy
to use.
|
`RollingUpdate` |
+| `broker.extra.configs` | Extra configs append to
'pinot-broker.conf' file to start Pinot Broker
|
`pinot.set.instance.id.to.hostname=true` |
|------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------|
| `server.name` | Name of Pinot Server
| `server`
|
| `server.port.netty` | Pinot server netty port
| `8098`
|
@@ -350,7 +352,7 @@ following configurable parameters:
| `server.persistence.size` | Size of data volume
| `4G`
|
| `server.persistence.mountPath` | Mount path of server data
volume
|
`/var/pinot/server/data` |
| `server.persistence.storageClass` | Storage class of backing
PVC
| `""`
|
-| `server.jvmOpts` | Pinot Server JVM Options
| `-Xms512M
-Xmx1G` |
+| `server.jvmOpts` | Pinot Server JVM Options
| `-Xms512M
-Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDetails
-XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime
-XX:+PrintGCApplicationConcurrentTime -Xloggc:/opt/pinot/gc-pinot-server.log` |
| `server.log4j2ConfFile` | Pinot Server log4j2
configuration file
|
`/opt/pinot/conf/pinot-server-log4j2.xml` |
| `server.pluginsDir` | Pinot Server plugins
directory
|
`/opt/pinot/plugins` |
| `server.service.port` | Service Port
| `8098`
|
@@ -360,6 +362,7 @@ following configurable parameters:
| `server.tolerations` | List of node tolerations
for the pods.
<https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/>
| `[]`
|
| `server.podAnnotations` | Annotations to be added to
server pod
| `{}`
|
| `server.updateStrategy.type` | StatefulSet update strategy
to use.
|
`RollingUpdate` |
+| `server.extra.configs` | Extra configs append to
'pinot-server.conf' file to start Pinot Server
|
`pinot.set.instance.id.to.hostname=true` |
|------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------|
| `zookeeper.enabled` | If True, installs Zookeeper
Chart
| `true`
|
| `zookeeper.resources` | Zookeeper resource requests
and limits
| `{}`
|
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
