Repository: incubator-gobblin Updated Branches: refs/heads/master 261fce33c -> d6e51f59f
[GOBBLIN-208] Make the application config the fallback for job configs Fallback to original config Closes #2060 from kadaan/Fallback_to_system_config Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/d6e51f59 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/d6e51f59 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/d6e51f59 Branch: refs/heads/master Commit: d6e51f59f39e438c66aa51c492e7c2aac5ee9774 Parents: 261fce3 Author: Joel Baranick <[email protected]> Authored: Tue Aug 15 12:40:17 2017 -0700 Committer: Abhishek Tiwari <[email protected]> Committed: Tue Aug 15 12:40:17 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/gobblin/aws/AWSJobConfigurationManager.java | 3 ++- .../java/org/apache/gobblin/cluster/GobblinClusterManager.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/d6e51f59/gobblin-aws/src/main/java/org/apache/gobblin/aws/AWSJobConfigurationManager.java ---------------------------------------------------------------------- diff --git a/gobblin-aws/src/main/java/org/apache/gobblin/aws/AWSJobConfigurationManager.java b/gobblin-aws/src/main/java/org/apache/gobblin/aws/AWSJobConfigurationManager.java index 58f4c9f..0e45064 100644 --- a/gobblin-aws/src/main/java/org/apache/gobblin/aws/AWSJobConfigurationManager.java +++ b/gobblin-aws/src/main/java/org/apache/gobblin/aws/AWSJobConfigurationManager.java @@ -50,6 +50,7 @@ import org.apache.gobblin.cluster.GobblinHelixJobScheduler; import org.apache.gobblin.cluster.JobConfigurationManager; import org.apache.gobblin.cluster.event.NewJobConfigArrivalEvent; import org.apache.gobblin.configuration.ConfigurationKeys; +import org.apache.gobblin.util.ConfigUtils; import org.apache.gobblin.util.ExecutorsUtils; import org.apache.gobblin.util.SchedulerUtils; @@ -151,7 +152,7 @@ public class AWSJobConfigurationManager extends JobConfigurationManager { final File jobConfigDir = new File(extractedPullFilesPath); if (jobConfigDir.exists()) { LOGGER.info("Loading job configurations from " + jobConfigDir); - final Properties properties = new Properties(); + final Properties properties = ConfigUtils.configToProperties(this.config); properties.setProperty(ConfigurationKeys.JOB_CONFIG_FILE_GENERAL_PATH_KEY, jobConfigDir.getAbsolutePath()); final List<Properties> jobConfigs = SchedulerUtils.loadGenericJobConfigs(properties); http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/d6e51f59/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterManager.java ---------------------------------------------------------------------- diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterManager.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterManager.java index 22e0480..9b26aca 100644 --- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterManager.java +++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterManager.java @@ -184,8 +184,9 @@ public class GobblinClusterManager implements ApplicationLauncher { this.jobCatalog = (MutableJobCatalog) GobblinConstructorUtils.invokeFirstConstructor(Class.forName(jobCatalogClassName), - ImmutableList.<Object>of(config.getConfig( - StringUtils.removeEnd(GobblinClusterConfigurationKeys.GOBBLIN_CLUSTER_PREFIX, ".")))); + ImmutableList.<Object>of(config + .getConfig(StringUtils.removeEnd(GobblinClusterConfigurationKeys.GOBBLIN_CLUSTER_PREFIX, ".")) + .withFallback(this.config))); } else { this.jobCatalog = null; }
