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/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 2f3db6e053 TLS Port for Minion (#12943)
2f3db6e053 is described below
commit 2f3db6e0539d5d3d514b3c0e609f2f1df7861144
Author: Prashant Pandey <[email protected]>
AuthorDate: Wed Apr 17 21:30:35 2024 +0530
TLS Port for Minion (#12943)
* Add tls port to minion
* Update BaseMinionStarter.java
* Update BaseMinionStarter.java
---------
Co-authored-by: Xiang Fu <[email protected]>
---
.../org/apache/pinot/minion/BaseMinionStarter.java | 27 +++++++++++++---------
1 file changed, 16 insertions(+), 11 deletions(-)
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 cc4e17219c..4f8bd79bd0 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
@@ -84,6 +84,7 @@ public abstract class BaseMinionStarter implements
ServiceStartable {
protected MinionConf _config;
protected String _hostname;
protected int _port;
+ protected int _tlsPort;
protected String _instanceId;
protected HelixManager _helixManager;
protected TaskExecutorFactoryRegistry _taskExecutorFactoryRegistry;
@@ -116,6 +117,7 @@ public abstract class BaseMinionStarter implements
ServiceStartable {
_instanceId = CommonConstants.Helix.PREFIX_OF_MINION_INSTANCE +
_hostname + "_" + _port;
}
_listenerConfigs = ListenerConfigUtil.buildMinionConfigs(_config);
+ _tlsPort = ListenerConfigUtil.findLastTlsPort(_listenerConfigs, -1);
_helixManager = new ZKHelixManager(helixClusterName, _instanceId,
InstanceType.PARTICIPANT, zkAddress);
MinionTaskZkMetadataManager minionTaskZkMetadataManager = new
MinionTaskZkMetadataManager(_helixManager);
_taskExecutorFactoryRegistry = new
TaskExecutorFactoryRegistry(minionTaskZkMetadataManager, _config);
@@ -125,6 +127,20 @@ public abstract class BaseMinionStarter implements
ServiceStartable {
MinionEventObservers.init(_config, _executorService);
}
+ private void updateInstanceConfigIfNeeded() {
+ InstanceConfig instanceConfig =
HelixHelper.getInstanceConfig(_helixManager, _instanceId);
+ boolean updated = HelixHelper.updateHostnamePort(instanceConfig,
_hostname, _port);
+ if (_tlsPort > 0) {
+ updated |= HelixHelper.updateTlsPort(instanceConfig, _tlsPort);
+ }
+ updated |= HelixHelper.addDefaultTags(instanceConfig,
+ () ->
Collections.singletonList(CommonConstants.Helix.UNTAGGED_MINION_INSTANCE));
+ updated |= HelixHelper.removeDisabledPartitions(instanceConfig);
+ if (updated) {
+ HelixHelper.updateInstanceConfig(_helixManager, instanceConfig);
+ }
+ }
+
private void setupHelixSystemProperties() {
// NOTE: Helix will disconnect the manager and disable the instance if it
detects flapping (too frequent disconnect
// from ZooKeeper). Setting flapping time window to a small value can
avoid this from happening. Helix ignores the
@@ -302,17 +318,6 @@ public abstract class BaseMinionStarter implements
ServiceStartable {
LOGGER.info("Pinot minion started");
}
- private void updateInstanceConfigIfNeeded() {
- InstanceConfig instanceConfig =
HelixHelper.getInstanceConfig(_helixManager, _instanceId);
- boolean updated = HelixHelper.updateHostnamePort(instanceConfig,
_hostname, _port);
- updated |= HelixHelper.addDefaultTags(instanceConfig,
- () ->
Collections.singletonList(CommonConstants.Helix.UNTAGGED_MINION_INSTANCE));
- updated |= HelixHelper.removeDisabledPartitions(instanceConfig);
- if (updated) {
- HelixHelper.updateInstanceConfig(_helixManager, instanceConfig);
- }
- }
-
/**
* Stops the Pinot Minion instance.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
