This is an automated email from the ASF dual-hosted git repository.
rongr 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 c4ae332df9 Add pinot prefix to config namespace (#10059)
c4ae332df9 is described below
commit c4ae332df95162d741cb8bde4a64b28cfd651264
Author: Ankit Sultana <ankitsult...@uber.com>
AuthorDate: Thu Jan 5 23:04:32 2023 +0530
Add pinot prefix to config namespace (#10059)
---
.../pinot/controller/util/ListenerConfigUtilTest.java | 4 ++--
.../org/apache/pinot/core/util/ListenerConfigUtil.java | 15 ++++++++-------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/util/ListenerConfigUtilTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/util/ListenerConfigUtilTest.java
index dae4c5f4e7..f88e87fb76 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/util/ListenerConfigUtilTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/util/ListenerConfigUtilTest.java
@@ -67,8 +67,8 @@ public class ListenerConfigUtilTest {
listenerConfigs.get(0).getThreadPoolConfig().getMaxPoolSize());
// Set server thread pool configs and assert that they are set
-
controllerConf.setProperty("controller.http.server.thread.pool.corePoolSize",
7);
-
controllerConf.setProperty("controller.http.server.thread.pool.maxPoolSize", 9);
+
controllerConf.setProperty("pinot.controller.http.server.thread.pool.corePoolSize",
7);
+
controllerConf.setProperty("pinot.controller.http.server.thread.pool.maxPoolSize",
9);
listenerConfigs =
ListenerConfigUtil.buildControllerConfigs(controllerConf);
Assert.assertEquals(listenerConfigs.size(), 1);
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 1ce41e52cc..93b729845a 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
@@ -98,7 +98,8 @@ public final class ListenerConfigUtil {
String portString = controllerConf.getProperty("controller.port");
if (portString != null) {
listeners.add(new ListenerConfig(CommonConstants.HTTP_PROTOCOL,
DEFAULT_HOST, Integer.parseInt(portString),
- CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(controllerConf, "controller")));
+ CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(controllerConf,
+ "pinot.controller")));
}
TlsConfig tlsDefaults = TlsUtils.extractTlsConfig(controllerConf,
"controller.tls");
@@ -115,7 +116,7 @@ public final class ListenerConfigUtil {
String queryPortString =
brokerConf.getProperty(CommonConstants.Helix.KEY_OF_BROKER_QUERY_PORT);
if (queryPortString != null) {
listeners.add(new ListenerConfig(CommonConstants.HTTP_PROTOCOL,
DEFAULT_HOST, Integer.parseInt(queryPortString),
- CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(brokerConf, "broker")));
+ CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(brokerConf, "pinot.broker")));
}
TlsConfig tlsDefaults = TlsUtils.extractTlsConfig(brokerConf,
CommonConstants.Broker.BROKER_TLS_PREFIX);
@@ -126,7 +127,7 @@ public final class ListenerConfigUtil {
if (listeners.isEmpty()) {
listeners.add(new ListenerConfig(CommonConstants.HTTP_PROTOCOL,
DEFAULT_HOST,
CommonConstants.Helix.DEFAULT_BROKER_QUERY_PORT,
CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
- buildServerThreadPoolConfig(brokerConf, "broker")));
+ buildServerThreadPoolConfig(brokerConf, "pinot.broker")));
}
return listeners;
@@ -139,7 +140,7 @@ public final class ListenerConfigUtil {
if (adminApiPortString != null) {
listeners.add(
new ListenerConfig(CommonConstants.HTTP_PROTOCOL, DEFAULT_HOST,
Integer.parseInt(adminApiPortString),
- CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(serverConf, "server")));
+ CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(serverConf, "pinot.server")));
}
TlsConfig tlsDefaults = TlsUtils.extractTlsConfig(serverConf,
CommonConstants.Server.SERVER_TLS_PREFIX);
@@ -150,7 +151,7 @@ public final class ListenerConfigUtil {
if (listeners.isEmpty()) {
listeners.add(
new ListenerConfig(CommonConstants.HTTP_PROTOCOL, DEFAULT_HOST,
CommonConstants.Server.DEFAULT_ADMIN_API_PORT,
- CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(serverConf, "server")));
+ CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(serverConf, "pinot.server")));
}
return listeners;
@@ -162,7 +163,7 @@ public final class ListenerConfigUtil {
String portString =
minionConf.getProperty(CommonConstants.Helix.KEY_OF_MINION_PORT);
if (portString != null) {
listeners.add(new ListenerConfig(CommonConstants.HTTP_PROTOCOL,
DEFAULT_HOST, Integer.parseInt(portString),
- CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(minionConf, "minion")));
+ CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(minionConf, "pinot.minion")));
}
TlsConfig tlsDefaults = TlsUtils.extractTlsConfig(minionConf,
CommonConstants.Minion.MINION_TLS_PREFIX);
@@ -172,7 +173,7 @@ public final class ListenerConfigUtil {
if (listeners.isEmpty()) {
listeners.add(
new ListenerConfig(CommonConstants.HTTP_PROTOCOL, DEFAULT_HOST,
CommonConstants.Minion.DEFAULT_HELIX_PORT,
- CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(minionConf, "minion")));
+ CommonConstants.HTTP_PROTOCOL, new TlsConfig(),
buildServerThreadPoolConfig(minionConf, "pinot.minion")));
}
return listeners;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
