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 a0433aa9c6 support configuring broker tags even when cluster is
configured for single tenant (#14824)
a0433aa9c6 is described below
commit a0433aa9c655d195003d415f20478d3c8af1ff33
Author: dang-stripe <[email protected]>
AuthorDate: Wed Jan 15 17:54:07 2025 -0800
support configuring broker tags even when cluster is configured for single
tenant (#14824)
---
.../broker/broker/helix/BaseBrokerStarter.java | 25 +++++++++++-----------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git
a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
index fa40afb2db..e134d65b75 100644
---
a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
+++
b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
@@ -512,22 +512,21 @@ public abstract class BaseBrokerStarter implements
ServiceStartable {
boolean shouldUpdateBrokerResource = false;
List<String> instanceTags = instanceConfig.getTags();
if (instanceTags.isEmpty()) {
- // This is a new broker (first time joining the cluster)
- if (ZKMetadataProvider.getClusterTenantIsolationEnabled(_propertyStore))
{
+ // This is a new broker (first time joining the cluster). We allow
configuring initial broker tags regardless of
+ // tenant isolation mode since it defaults to true and is relatively
obscure.
+ String instanceTagsConfig =
_brokerConf.getProperty(Broker.CONFIG_OF_BROKER_INSTANCE_TAGS);
+ if (StringUtils.isNotEmpty(instanceTagsConfig)) {
+ for (String instanceTag : StringUtils.split(instanceTagsConfig, ',')) {
+ Preconditions.checkArgument(TagNameUtils.isBrokerTag(instanceTag),
"Illegal broker instance tag: %s",
+ instanceTag);
+ instanceConfig.addTag(instanceTag);
+ }
+ shouldUpdateBrokerResource = true;
+ } else if
(ZKMetadataProvider.getClusterTenantIsolationEnabled(_propertyStore)) {
instanceConfig.addTag(TagNameUtils.getBrokerTagForTenant(null));
shouldUpdateBrokerResource = true;
} else {
- String instanceTagsConfig =
_brokerConf.getProperty(Broker.CONFIG_OF_BROKER_INSTANCE_TAGS);
- if (StringUtils.isNotEmpty(instanceTagsConfig)) {
- for (String instanceTag : StringUtils.split(instanceTagsConfig,
',')) {
- Preconditions.checkArgument(TagNameUtils.isBrokerTag(instanceTag),
"Illegal broker instance tag: %s",
- instanceTag);
- instanceConfig.addTag(instanceTag);
- }
- shouldUpdateBrokerResource = true;
- } else {
- instanceConfig.addTag(Helix.UNTAGGED_BROKER_INSTANCE);
- }
+ instanceConfig.addTag(Helix.UNTAGGED_BROKER_INSTANCE);
}
instanceTags = instanceConfig.getTags();
updated = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
