Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4AB19200CF2 for ; Wed, 9 Aug 2017 03:04:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 490B11655A6; Wed, 9 Aug 2017 01:04:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 899DF1654EE for ; Wed, 9 Aug 2017 03:04:36 +0200 (CEST) Received: (qmail 76731 invoked by uid 500); 9 Aug 2017 01:04:35 -0000 Mailing-List: contact commits-help@gobblin.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@gobblin.incubator.apache.org Delivered-To: mailing list commits@gobblin.incubator.apache.org Received: (qmail 76719 invoked by uid 99); 9 Aug 2017 01:04:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Aug 2017 01:04:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5EA4AE96F5; Wed, 9 Aug 2017 01:04:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hutran@apache.org To: commits@gobblin.apache.org Message-Id: <4f086ca44261452fb02e9ebbfe32dfad@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-gobblin git commit: [GOBBLIN-191] Make sure cron scheduler works and tune schedule period Date: Wed, 9 Aug 2017 01:04:35 +0000 (UTC) archived-at: Wed, 09 Aug 2017 01:04:37 -0000 Repository: incubator-gobblin Updated Branches: refs/heads/master 6c14efe76 -> a28ff2185 [GOBBLIN-191] Make sure cron scheduler works and tune schedule period Closes #2042 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/a28ff218 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/a28ff218 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/a28ff218 Branch: refs/heads/master Commit: a28ff21852db0c231297ad75dd66027432a6537b Parents: 6c14efe Author: Abhishek Tiwari Authored: Tue Aug 8 18:04:17 2017 -0700 Committer: Hung Tran Committed: Tue Aug 8 18:04:17 2017 -0700 ---------------------------------------------------------------------- .../service/modules/scheduler/GobblinServiceJobScheduler.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/a28ff218/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 f6f101b..5bd71c3 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 @@ -25,6 +25,7 @@ import java.util.Properties; import java.util.UUID; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.helix.HelixManager; import org.apache.helix.InstanceType; import org.quartz.DisallowConcurrentExecution; @@ -173,8 +174,13 @@ public class GobblinServiceJobScheduler extends JobScheduler implements SpecCata try { Properties jobConfig = new Properties(); + Properties flowSpecProperties = ((FlowSpec) addedSpec).getConfigAsProperties(); jobConfig.putAll(this.properties); jobConfig.setProperty(ConfigurationKeys.JOB_NAME_KEY, addedSpec.getUri().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)); + } this.scheduledFlowSpecs.put(addedSpec.getUri().toString(), addedSpec);