t0mpere commented on code in PR #14235:
URL: https://github.com/apache/pinot/pull/14235#discussion_r1801628032


##########
pinot-spi/src/main/java/org/apache/pinot/spi/env/PinotConfiguration.java:
##########
@@ -170,8 +173,15 @@ public static List<Configuration> 
applyDynamicEnvConfig(List<Configuration> conf
       Map<String, String> environmentVariables) {
     return configurations.stream().peek(configuration -> {
       for (String dynamicEnvConfigVarName : 
configuration.getStringArray(ENV_DYNAMIC_CONFIG_KEY)) {
-        configuration.setProperty(dynamicEnvConfigVarName,
-            
environmentVariables.get(configuration.getString(dynamicEnvConfigVarName)));
+        //if the environment variable doesn't exist or the property is already 
checked do not add the property
+        //TODO: The configuration in controller, server iterating to check and 
add env variables twice. Need to solve
+        // this better.
+        Object envVar = 
environmentVariables.get(configuration.getString(dynamicEnvConfigVarName));
+        if (envVar != null) {

Review Comment:
   What about saving in the config whether the dynamic env was already applied 
or not with a property like:
   `templated=true`



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

Reply via email to