Repository: incubator-gobblin Updated Branches: refs/heads/master b54e2818d -> dddc0b3ea
[GOBBLIN-213][GOBBLIN-191] Add scheduler service to GobblinServiceManager [GOBBLIN-191] Make sure cron scheduler works and tune schedule period Merge branch 'master' into service [GOBBLIN-213] Add scheduler service to GobblinServiceManager Closes #2066 from abti/service Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/dddc0b3e Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/dddc0b3e Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/dddc0b3e Branch: refs/heads/master Commit: dddc0b3eadb0a8572c28a2ea3580d500ccd1ccf1 Parents: b54e281 Author: Abhishek Tiwari <[email protected]> Authored: Fri Aug 18 07:12:42 2017 -0700 Committer: Abhishek Tiwari <[email protected]> Committed: Fri Aug 18 07:12:42 2017 -0700 ---------------------------------------------------------------------- .../apache/gobblin/service/modules/core/GobblinServiceManager.java | 2 ++ .../service/modules/scheduler/GobblinServiceJobScheduler.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/dddc0b3e/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java ---------------------------------------------------------------------- diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java index aebebdc..4707361 100644 --- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java +++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java @@ -197,6 +197,8 @@ public class GobblinServiceManager implements ApplicationLauncher { this.scheduler = new GobblinServiceJobScheduler(config, this.helixManager, Optional.of(this.flowCatalog), Optional.of(this.topologyCatalog), this.orchestrator, schedulerService, Optional.of(LOGGER)); + this.serviceLauncher.addService(schedulerService); + this.serviceLauncher.addService(this.scheduler); } // Initialize RestLI http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/dddc0b3e/gobblin-service/src/main/java/org/apache/gobblin/service/modules/scheduler/GobblinServiceJobScheduler.java ---------------------------------------------------------------------- diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/scheduler/GobblinServiceJobScheduler.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/scheduler/GobblinServiceJobScheduler.java index 5bd71c3..c3c6a3f 100644 --- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/scheduler/GobblinServiceJobScheduler.java +++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/scheduler/GobblinServiceJobScheduler.java @@ -177,6 +177,8 @@ public class GobblinServiceJobScheduler extends JobScheduler implements SpecCata Properties flowSpecProperties = ((FlowSpec) addedSpec).getConfigAsProperties(); jobConfig.putAll(this.properties); jobConfig.setProperty(ConfigurationKeys.JOB_NAME_KEY, addedSpec.getUri().toString()); + jobConfig.setProperty(ConfigurationKeys.JOB_GROUP_KEY, + ((FlowSpec) addedSpec).getConfig().getValue(ConfigurationKeys.FLOW_GROUP_KEY).toString()); if (flowSpecProperties.containsKey(ConfigurationKeys.JOB_SCHEDULE_KEY) && StringUtils.isNotBlank(flowSpecProperties.getProperty(ConfigurationKeys.JOB_SCHEDULE_KEY))) { jobConfig.setProperty(ConfigurationKeys.JOB_SCHEDULE_KEY, flowSpecProperties.getProperty(ConfigurationKeys.JOB_SCHEDULE_KEY));
