You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ap...@apache.org on 2021/01/07 05:08:23 UTC
[incubator-pinot] branch pinot-internode-tls updated: strings to
constants
This is an automated email from the ASF dual-hosted git repository.
apucher pushed a commit to branch pinot-internode-tls
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/pinot-internode-tls by this push:
new 8c40963 strings to constants
8c40963 is described below
commit 8c4096312a73565696774db5ed6fa6063fc45426
Author: Alexander Pucher <al...@alexpucher.com>
AuthorDate: Wed Jan 6 21:08:02 2021 -0800
strings to constants
---
.../apache/pinot/broker/broker/BrokerAdminApiApplication.java | 2 +-
.../apache/pinot/broker/broker/helix/HelixBrokerStarter.java | 2 +-
.../java/org/apache/pinot/common/utils/CommonConstants.java | 11 +++++------
.../main/java/org/apache/pinot/controller/ControllerConf.java | 1 +
.../java/org/apache/pinot/controller/ControllerStarter.java | 2 +-
.../org/apache/pinot/controller/util/ListenerConfigUtil.java | 3 ++-
.../java/org/apache/pinot/server/starter/ServerInstance.java | 3 ++-
7 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
index 5d4b13a..af6336d 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/BrokerAdminApiApplication.java
@@ -82,7 +82,7 @@ public class BrokerAdminApiApplication extends ResourceConfig {
private HttpServer buildHttpsServer(PinotConfiguration brokerConf) {
boolean isSecure = CommonConstants.HTTPS_PROTOCOL.equals(getBrokerClientProtocol(brokerConf));
- TlsConfig tlsConfig = TlsUtils.extractTlsConfig(brokerConf, "pinot.broker.client");
+ TlsConfig tlsConfig = TlsUtils.extractTlsConfig(brokerConf, CommonConstants.Broker.BROKER_CLIENT_PREFIX);
tlsConfig.setEnabled(isSecure);
if (isSecure) {
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/HelixBrokerStarter.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/HelixBrokerStarter.java
index c31c3b7..6dc6bc2 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/HelixBrokerStarter.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/HelixBrokerStarter.java
@@ -241,7 +241,7 @@ public class HelixBrokerStarter implements ServiceStartable {
FunctionRegistry.init();
TableCache tableCache = new TableCache(_propertyStore, caseInsensitive);
// Configure TLS
- TlsConfig tlsConfig = TlsUtils.extractTlsConfig(_brokerConf, "pinot.broker.netty");
+ TlsConfig tlsConfig = TlsUtils.extractTlsConfig(_brokerConf, Broker.BROKER_NETTY_PREFIX);
_brokerRequestHandler =
new SingleConnectionBrokerRequestHandler(_brokerConf, _routingManager, _accessControlFactory, queryQuotaManager,
tableCache, _brokerMetrics, tlsConfig);
diff --git a/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java b/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java
index db8c63c..e9b6602 100644
--- a/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java
+++ b/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java
@@ -178,12 +178,9 @@ public class CommonConstants {
public static final int DEFAULT_BROKER_GROUPBY_TRIM_THRESHOLD = 1_000_000;
public static final String CONFIG_OF_BROKER_CLIENT_PROTOCOL = "pinot.broker.client.protocol";
- public static final String CONFIG_OF_BROKER_CLIENT_TLS_KEYSTORE_PATH = "pinot.broker.client.tls.keystore.path";
- public static final String CONFIG_OF_BROKER_CLIENT_TLS_KEYSTORE_PASSWORD = "pinot.broker.client.tls.keystore.password";
- public static final String CONFIG_OF_BROKER_CLIENT_TLS_TRUSTSTORE_PATH = "pinot.broker.client.tls.truststore.path";
- public static final String CONFIG_OF_BROKER_CLIENT_TLS_TRUSTSTORE_PASSWORD = "pinot.broker.client.tls.truststore.password";
- public static final String CONFIG_OF_BROKER_CLIENT_TLS_CLIENT_AUTH = "pinot.broker.client.tls.client.auth";
- public static final boolean DEFAULT_BROKER_CLIENT_TLS_CLIENT_AUTH = false;
+
+ public static final String BROKER_CLIENT_PREFIX = "pinot.broker.client";
+ public static final String BROKER_NETTY_PREFIX = "pinot.broker.netty";
public static class Request {
public static final String PQL = "pql";
@@ -292,6 +289,8 @@ public class CommonConstants {
public static final String PINOT_SERVER_METRICS_PREFIX = "pinot.server.metrics.prefix";
+ public static final String SERVER_NETTY_PREFIX = "pinot.server.netty";
+
public static class SegmentCompletionProtocol {
public static final String PREFIX_OF_CONFIG_OF_SEGMENT_UPLOADER = "pinot.server.segment.uploader";
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
index 5d308d9..8a1ec84 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
@@ -46,6 +46,7 @@ public class ControllerConf extends PinotConfiguration {
public static final String CONTROLLER_VIP_PORT = "controller.vip.port";
public static final String CONTROLLER_VIP_PROTOCOL = "controller.vip.protocol";
public static final String CONTROLLER_BROKER_PROTOCOL = "controller.broker.protocol";
+ public static final String CONTROLLER_BROKER_PREFIX = "controller.broker";
public static final String CONTROLLER_HOST = "controller.host";
public static final String CONTROLLER_PORT = "controller.port";
public static final String CONTROLLER_ACCESS_PROTOCOLS = "controller.access.protocols";
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java
index c1e1efc..0cdfbfd 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerStarter.java
@@ -417,7 +417,7 @@ public class ControllerStarter implements ServiceStartable {
// install default SSL context if necessary
if (CommonConstants.HTTPS_PROTOCOL.equals(_config.getProperty(ControllerConf.CONTROLLER_BROKER_PROTOCOL))) {
LOGGER.info("Installing default SSL context for broker relay requests");
- TlsUtils.installDefaultSSLSocketFactory(TlsUtils.extractTlsConfig(_config, "controller.broker"));
+ TlsUtils.installDefaultSSLSocketFactory(TlsUtils.extractTlsConfig(_config, ControllerConf.CONTROLLER_BROKER_PREFIX));
}
_adminApp.start(_listenerConfigs);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/util/ListenerConfigUtil.java b/pinot-controller/src/main/java/org/apache/pinot/controller/util/ListenerConfigUtil.java
index f33f523..da08172 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/util/ListenerConfigUtil.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/util/ListenerConfigUtil.java
@@ -62,7 +62,8 @@ public abstract class ListenerConfigUtil {
}
private static ListenerConfig buildListenerConfig(String protocol, ControllerConf controllerConf) {
- TlsConfig tlsConfig = TlsUtils.extractTlsConfig(controllerConf, "controller.access.protocols." + protocol);
+ TlsConfig tlsConfig = TlsUtils.extractTlsConfig(controllerConf,
+ ControllerConf.CONTROLLER_ACCESS_PROTOCOLS + "." + protocol);
tlsConfig.setEnabled(CommonConstants.HTTPS_PROTOCOL.equals(protocol));
return new ListenerConfig(protocol,
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerInstance.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerInstance.java
index 2c0188b..a5dde12 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerInstance.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/ServerInstance.java
@@ -27,6 +27,7 @@ import org.apache.helix.HelixManager;
import org.apache.pinot.common.function.FunctionRegistry;
import org.apache.pinot.common.metrics.MetricsHelper;
import org.apache.pinot.common.metrics.ServerMetrics;
+import org.apache.pinot.common.utils.CommonConstants;
import org.apache.pinot.core.data.manager.InstanceDataManager;
import org.apache.pinot.core.operator.transform.function.TransformFunction;
import org.apache.pinot.core.operator.transform.function.TransformFunctionFactory;
@@ -92,7 +93,7 @@ public class ServerInstance {
QuerySchedulerFactory.create(serverConf.getSchedulerConfig(), _queryExecutor, _serverMetrics, _latestQueryTime);
int nettyPort = serverConf.getNettyPort();
- TlsConfig tlsConfig = TlsUtils.extractTlsConfig(serverConf.getPinotConfig(), "pinot.server.netty");
+ TlsConfig tlsConfig = TlsUtils.extractTlsConfig(serverConf.getPinotConfig(), CommonConstants.Server.SERVER_NETTY_PREFIX);
LOGGER.info("Initializing Netty query server on port: {} with tls: {}", nettyPort, tlsConfig.isEnabled());
_nettyQueryServer = new QueryServer(nettyPort, _queryScheduler, _serverMetrics, tlsConfig);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org