[incubator-gobblin] branch master updated: [GOBBLIN-828] Make dynamic config override job config

[hu...@apache.org]

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

hutran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new 86c3a91  [GOBBLIN-828] Make dynamic config override job config
86c3a91 is described below

commit 86c3a910dbcb15702bbb538444d548268fe19d03
Author: Jack Moseley <jm...@linkedin.com>
AuthorDate: Thu Jul 18 14:55:08 2019 -0700

    [GOBBLIN-828] Make dynamic config override job config
    
    Closes #2689 from jack-moseley/dynamic-config
---
 .../java/org/apache/gobblin/service/modules/spec/JobExecutionPlan.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/spec/JobExecutionPlan.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/spec/JobExecutionPlan.java
index d0ec901..485f555 100644
--- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/spec/JobExecutionPlan.java
+++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/spec/JobExecutionPlan.java
@@ -129,7 +129,7 @@ public class JobExecutionPlan {
       // Add dynamic config to jobSpec if a dynamic config generator is specified in sysConfig
       DynamicConfigGenerator dynamicConfigGenerator = DynamicConfigGeneratorFactory.createDynamicConfigGenerator(sysConfig);
       Config dynamicConfig = dynamicConfigGenerator.generateDynamicConfig(jobSpec.getConfig().withFallback(sysConfig));
-      jobSpec.setConfig(jobSpec.getConfig().withFallback(dynamicConfig));
+      jobSpec.setConfig(dynamicConfig.withFallback(jobSpec.getConfig()));
 
       // Reset properties in Spec from Config
       jobSpec.setConfigAsProperties(ConfigUtils.configToProperties(jobSpec.getConfig()));