This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new df29b81c27 Change minion's default port, enable minion health and
readiness probe via helm chart (#8669)
df29b81c27 is described below
commit df29b81c2719d532ecf002c7bce8e19d2c466c09
Author: Saurabh Dubey <saurabhd...@gmail.com>
AuthorDate: Thu May 12 22:42:13 2022 +0530
Change minion's default port, enable minion health and readiness probe via
helm chart (#8669)
---
kubernetes/helm/pinot/values.yaml | 4 ++--
.../apache/pinot/core/util/ListenerConfigUtil.java | 19 +++++--------------
.../org/apache/pinot/minion/BaseMinionStarter.java | 2 +-
.../org/apache/pinot/spi/utils/CommonConstants.java | 2 --
pinot-tools/src/main/resources/conf/pinot-minion.conf | 5 +----
5 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/kubernetes/helm/pinot/values.yaml
b/kubernetes/helm/pinot/values.yaml
index ab9b1b9e70..31b362bad6 100644
--- a/kubernetes/helm/pinot/values.yaml
+++ b/kubernetes/helm/pinot/values.yaml
@@ -341,8 +341,8 @@ minion:
probes:
endpoint: "/health"
- livenessEnabled: false
- readinessEnabled: false
+ livenessEnabled: true
+ readinessEnabled: true
dataDir: /var/pinot/minion/data
jvmOpts: "-Xms256M -Xmx1G -XX:+UseG1GC -XX:MaxGCPauseMillis=200
-Xlog:gc*:file=/opt/pinot/gc-pinot-minion.log"
diff --git
a/pinot-core/src/main/java/org/apache/pinot/core/util/ListenerConfigUtil.java
b/pinot-core/src/main/java/org/apache/pinot/core/util/ListenerConfigUtil.java
index 7de05962af..0ae2bf6fbd 100644
---
a/pinot-core/src/main/java/org/apache/pinot/core/util/ListenerConfigUtil.java
+++
b/pinot-core/src/main/java/org/apache/pinot/core/util/ListenerConfigUtil.java
@@ -152,26 +152,17 @@ public final class ListenerConfigUtil {
return listeners;
}
- public static List<ListenerConfig>
buildMinionAdminConfigs(PinotConfiguration minionConf) {
+ public static List<ListenerConfig> buildMinionConfigs(PinotConfiguration
minionConf) {
List<ListenerConfig> listeners = new ArrayList<>();
- String adminApiPortString =
minionConf.getProperty(CommonConstants.Minion.CONFIG_OF_ADMIN_API_PORT);
- if (adminApiPortString != null) {
- listeners.add(
- new ListenerConfig(CommonConstants.HTTP_PROTOCOL, DEFAULT_HOST,
Integer.parseInt(adminApiPortString),
- CommonConstants.HTTP_PROTOCOL, new TlsConfig()));
- }
+ int port = minionConf.getProperty(CommonConstants.Helix.KEY_OF_MINION_PORT,
+ CommonConstants.Minion.DEFAULT_HELIX_PORT);
+ listeners.add(new ListenerConfig(CommonConstants.HTTP_PROTOCOL,
DEFAULT_HOST, port,
+ CommonConstants.HTTP_PROTOCOL, new TlsConfig()));
TlsConfig tlsDefaults = TlsUtils.extractTlsConfig(minionConf,
CommonConstants.Minion.MINION_TLS_PREFIX);
listeners.addAll(buildListenerConfigs(minionConf, "pinot.minion.adminapi",
tlsDefaults));
- // support legacy behavior < 0.7.0
- if (listeners.isEmpty()) {
- listeners.add(
- new ListenerConfig(CommonConstants.HTTP_PROTOCOL, DEFAULT_HOST,
CommonConstants.Minion.DEFAULT_ADMIN_API_PORT,
- CommonConstants.HTTP_PROTOCOL, new TlsConfig()));
- }
-
return listeners;
}
diff --git
a/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java
b/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java
index 44608e67f5..486a05ac68 100644
--- a/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java
+++ b/pinot-minion/src/main/java/org/apache/pinot/minion/BaseMinionStarter.java
@@ -101,7 +101,7 @@ public abstract class BaseMinionStarter implements
ServiceStartable {
} else {
_instanceId = CommonConstants.Helix.PREFIX_OF_MINION_INSTANCE +
_hostname + "_" + _port;
}
- _listenerConfigs = ListenerConfigUtil.buildMinionAdminConfigs(_config);
+ _listenerConfigs = ListenerConfigUtil.buildMinionConfigs(_config);
_helixManager = new ZKHelixManager(helixClusterName, _instanceId,
InstanceType.PARTICIPANT, zkAddress);
MinionTaskZkMetadataManager minionTaskZkMetadataManager = new
MinionTaskZkMetadataManager(_helixManager);
_taskExecutorFactoryRegistry = new
TaskExecutorFactoryRegistry(minionTaskZkMetadataManager, _config);
diff --git
a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
index f004e5644c..24f1d93a1f 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
@@ -525,9 +525,7 @@ public class CommonConstants {
* E.g. null (auth disabled), "Basic abcdef..." (basic auth), "Bearer
123def..." (oauth2)
*/
public static final String CONFIG_OF_TASK_AUTH_TOKEN = "task.auth.token";
- public static final String CONFIG_OF_ADMIN_API_PORT =
"pinot.minion.adminapi.port";
public static final String MINION_TLS_PREFIX = "pinot.minion.tls";
- public static final int DEFAULT_ADMIN_API_PORT = 6500;
public static final String CONFIG_OF_MINION_QUERY_REWRITER_CLASS_NAMES =
"pinot.minion.query.rewriter.class.names";
}
diff --git a/pinot-tools/src/main/resources/conf/pinot-minion.conf
b/pinot-tools/src/main/resources/conf/pinot-minion.conf
index d8e58181a0..5a5a884ba0 100644
--- a/pinot-tools/src/main/resources/conf/pinot-minion.conf
+++ b/pinot-tools/src/main/resources/conf/pinot-minion.conf
@@ -33,7 +33,4 @@ pinot.set.instance.id.to.hostname=true
# pinot.minion.host=localhost
# Pinot Minion Port
-pinot.minion.port=8098
-
-# Pinot Minion Admin API Port
-pinot.minion.adminapi.port=6500
+pinot.minion.port=9514
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
