This is an automated email from the ASF dual-hosted git repository.
jlli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new e8ef1de Explicitly enable lead controller resource (#6725)
e8ef1de is described below
commit e8ef1de18a9ffc0a1e4f82c4a4a570ed50522cee
Author: Jialiang Li <j...@linkedin.com>
AuthorDate: Wed Mar 31 09:38:25 2021 -0700
Explicitly enable lead controller resource (#6725)
* Explicitly enable lead controller resource
* Force to set it to true
Co-authored-by: Jack Li(Analytics Engineering) <j...@jlli-mn1.linkedin.biz>
---
.../apache/pinot/controller/helix/core/util/HelixSetupUtils.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
index be5d89d..baa094d 100644
---
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
+++
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
@@ -205,10 +205,10 @@ public class HelixSetupUtils {
if (resourceConfig == null) {
resourceConfig = new ResourceConfig(LEAD_CONTROLLER_RESOURCE_NAME);
}
- // Set RESOURCE_ENABLED to false if it's absent in resource config
- if (resourceConfig.getSimpleConfig(LEAD_CONTROLLER_RESOURCE_ENABLED_KEY)
== null) {
- resourceConfig.putSimpleConfig(LEAD_CONTROLLER_RESOURCE_ENABLED_KEY,
Boolean.FALSE.toString());
- }
+ // Explicitly set RESOURCE_ENABLED to true, so that the lead controller
resource is always enabled.
+ // This is to help keep the behavior consistent in all clusters for better
maintenance.
+ // TODO: remove the logic of handling this config in both controller and
server in the next official release.
+ resourceConfig.putSimpleConfig(LEAD_CONTROLLER_RESOURCE_ENABLED_KEY,
Boolean.TRUE.toString());
configAccessor.setResourceConfig(helixClusterName,
LEAD_CONTROLLER_RESOURCE_NAME, resourceConfig);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
