[incubator-pinot] 01/01: Fixing the issue for realtime table creation with env variables in stream configs

[xiangfu]

This is an automated email from the ASF dual-hosted git repository.

xiangfu pushed a commit to branch 
fixing_table_config_with_env_var_during_table_creation
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git

commit 6db99ddc5da2116c4bb1c4cde59166be6858f82c
Author: Xiang Fu <fx19880...@gmail.com>
AuthorDate: Sun Dec 20 20:03:16 2020 -0800

    Fixing the issue for realtime table creation with env variables in stream 
configs
---
 .../pinot/controller/helix/core/PinotHelixResourceManager.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
 
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
index 6d46a9f..5f78c9a 100644
--- 
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
+++ 
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
@@ -110,6 +110,7 @@ import 
org.apache.pinot.controller.helix.core.rebalance.TableRebalancer;
 import org.apache.pinot.controller.helix.core.util.ZKMetadataUtils;
 import org.apache.pinot.controller.helix.starter.HelixConfig;
 import org.apache.pinot.core.segment.index.metadata.SegmentMetadata;
+import org.apache.pinot.spi.config.ConfigUtils;
 import org.apache.pinot.spi.config.instance.Instance;
 import org.apache.pinot.spi.config.table.IndexingConfig;
 import org.apache.pinot.spi.config.table.SegmentsValidationAndRetentionConfig;
@@ -1116,8 +1117,9 @@ public class PinotHelixResourceManager {
    * @throws InvalidTableConfigException if validations fail
    * @throws TableAlreadyExistsException for offline tables only if the table 
already exists
    */
-  public void addTable(TableConfig tableConfig)
+  public void addTable(TableConfig rawTableConfig)
       throws IOException {
+    TableConfig tableConfig = 
ConfigUtils.applyConfigWithEnvVariables(rawTableConfig);
     validateTableTenantConfig(tableConfig);
     String tableNameWithType = tableConfig.getTableName();
     SegmentsValidationAndRetentionConfig segmentsConfig = 
tableConfig.getValidationConfig();
@@ -1140,7 +1142,7 @@ public class PinotHelixResourceManager {
 
         // lets add table configs
         ZKMetadataProvider
-            .setOfflineTableConfig(_propertyStore, tableNameWithType, 
TableConfigUtils.toZNRecord(tableConfig));
+            .setOfflineTableConfig(_propertyStore, tableNameWithType, 
TableConfigUtils.toZNRecord(rawTableConfig));
 
         // Assign instances
         assignInstances(tableConfig, true);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org