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 70308f8 Fixing pinot k8s helm for jdk11 (#7118)
70308f8 is described below
commit 70308f816cf5843084aff4f0b08097f2a8781e27
Author: Xiang Fu <xiangfu.1...@gmail.com>
AuthorDate: Thu Jul 1 20:01:16 2021 -0700
Fixing pinot k8s helm for jdk11 (#7118)
* Fixing pinot k8s helm
* Update PluginManager.java
---
kubernetes/helm/pinot/templates/controller/configmap.yaml | 2 +-
kubernetes/helm/pinot/templates/minion/configmap.yaml | 2 +-
kubernetes/helm/pinot/values.yaml | 10 +++++-----
.../main/java/org/apache/pinot/spi/plugin/PluginManager.java | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/kubernetes/helm/pinot/templates/controller/configmap.yaml
b/kubernetes/helm/pinot/templates/controller/configmap.yaml
index ada7145..bac1d82 100644
--- a/kubernetes/helm/pinot/templates/controller/configmap.yaml
+++ b/kubernetes/helm/pinot/templates/controller/configmap.yaml
@@ -24,7 +24,7 @@ metadata:
data:
pinot-controller.conf: |-
controller.helix.cluster.name={{ .Values.cluster.name }}
- controller.port={{ .Values.controller.port }}
+ controller.port={{ .Values.controller.service.port }}
{{- if .Values.controller.vip.enabled }}
controller.vip.host={{ .Values.controller.vip.host }}
controller.vip.port={{ .Values.controller.vip.port }}
diff --git a/kubernetes/helm/pinot/templates/minion/configmap.yaml
b/kubernetes/helm/pinot/templates/minion/configmap.yaml
index 137839a..116c573 100644
--- a/kubernetes/helm/pinot/templates/minion/configmap.yaml
+++ b/kubernetes/helm/pinot/templates/minion/configmap.yaml
@@ -23,7 +23,7 @@ metadata:
name: {{ include "pinot.minion.config" . }}
data:
pinot-minion.conf: |-
- pinot.minion.port={{ .Values.minion.port }}
+ pinot.minion.port={{ .Values.minion.service.port }}
{{- if .Values.minion.dataDir }}
dataDir={{ .Values.minion.dataDir }}
{{- end }}
diff --git a/kubernetes/helm/pinot/values.yaml
b/kubernetes/helm/pinot/values.yaml
index 3791a10..2bf6480 100644
--- a/kubernetes/helm/pinot/values.yaml
+++ b/kubernetes/helm/pinot/values.yaml
@@ -21,7 +21,7 @@
image:
repository: apachepinot/pinot
- tag: latest # release-0.7.1
+ tag: latest-jdk11 # release-0.7.1
pullPolicy: IfNotPresent
cluster:
@@ -83,7 +83,7 @@ controller:
host: pinot-controller
port: 9000
- jvmOpts: "-Xms256M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200
-XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime
-XX:+PrintGCApplicationConcurrentTime -Xlog:gc*,safepoint:gc.log:time,uptime
-Xlog:gc:/opt/pinot/gc-pinot-controller.log"
+ jvmOpts: "-Xms256M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200
-Xlog:gc*:file=/opt/pinot/gc-pinot-controller.log"
log4j2ConfFile: /opt/pinot/conf/log4j2.xml
pluginsDir: /opt/pinot/plugins
@@ -152,7 +152,7 @@ broker:
# fsGroup: 2000
securityContext: {}
- jvmOpts: "-Xms256M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200
-XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime
-XX:+PrintGCApplicationConcurrentTime -Xlog:gc*,safepoint:gc.log:time,uptime
-Xlog:gc:/opt/pinot/gc-pinot-broker.log"
+ jvmOpts: "-Xms256M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200
-Xlog:gc*:file=/opt/pinot/gc-pinot-broker.log"
log4j2ConfFile: /opt/pinot/conf/log4j2.xml
pluginsDir: /opt/pinot/plugins
@@ -244,7 +244,7 @@ server:
storageClass: ""
#storageClass: "ssd"
- jvmOpts: "-Xms512M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200
-XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime
-XX:+PrintGCApplicationConcurrentTime -Xlog:gc*,safepoint:gc.log:time,uptime
-Xlog:gc:/opt/pinot/gc-pinot-server.log"
+ jvmOpts: "-Xms512M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200
-Xlog:gc*:file=/opt/pinot/gc-pinot-server.log"
log4j2ConfFile: /opt/pinot/conf/log4j2.xml
pluginsDir: /opt/pinot/plugins
@@ -317,7 +317,7 @@ minion:
readinessEnabled: false
dataDir: /var/pinot/minion/data
- jvmOpts: "-Xms256M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200
-XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime
-XX:+PrintGCApplicationConcurrentTime -Xlog:gc*,safepoint:gc.log:time,uptime
-Xlog:gc:/opt/pinot/gc-pinot-minion.log"
+ jvmOpts: "-Xms256M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200
-Xlog:gc*:file=/opt/pinot/gc-pinot-minion.log"
log4j2ConfFile: /opt/pinot/conf/log4j2.xml
pluginsDir: /opt/pinot/plugins
diff --git
a/pinot-spi/src/main/java/org/apache/pinot/spi/plugin/PluginManager.java
b/pinot-spi/src/main/java/org/apache/pinot/spi/plugin/PluginManager.java
index 00429a1..14921c9 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/plugin/PluginManager.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/plugin/PluginManager.java
@@ -143,7 +143,7 @@ public class PluginManager {
pluginsToLoad = Arrays.asList(pluginsInclude.split(","));
LOGGER.info("Trying to load plugins: [{}]",
Arrays.toString(pluginsToLoad.toArray()));
} else {
- LOGGER.info("Loading all plugins. Please use env variable '{}' to
customize.", PLUGINS_INCLUDE_PROPERTY_NAME,
+ LOGGER.info("Please use env variable '{}' to customize plugins to load.
Loading all plugins: {}", PLUGINS_INCLUDE_PROPERTY_NAME,
Arrays.toString(jarFiles.toArray()));
}
for (File jarFile : jarFiles) {
@@ -180,12 +180,12 @@ public class PluginManager {
for (File jarFile : jarFiles) {
try {
urlList.add(jarFile.toURI().toURL());
- LOGGER.info("Successfully loaded plugin [{}] from jar file [{}]",
pluginName, jarFile);
} catch (MalformedURLException e) {
LOGGER.error("Unable to load plugin [{}] jar file [{}]", pluginName,
jarFile, e);
}
}
PluginClassLoader classLoader = createClassLoader(urlList);
+ LOGGER.info("Successfully loaded plugin [{}] from jar files: {}",
pluginName, Arrays.toString(urlList.toArray()));
_registry.put(new Plugin(pluginName), classLoader);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
