Repository: kylin Updated Branches: refs/heads/yang21 2d87faec4 -> 9287117e1
minor, drop kylin.job.step.timeout Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9287117e Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9287117e Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9287117e Branch: refs/heads/yang21 Commit: 9287117e17bcd5d9f7c7b93bfa5b5d3b2ad7b0c3 Parents: 2d87fae Author: Li Yang <liy...@apache.org> Authored: Thu Oct 27 15:11:20 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu Oct 27 15:11:20 2016 +0800 ---------------------------------------------------------------------- build/conf/kylin_job_conf_inmem.xml | 4 ++-- .../main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ---- .../java/org/apache/kylin/job/engine/JobEngineConfig.java | 7 ------- 3 files changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9287117e/build/conf/kylin_job_conf_inmem.xml ---------------------------------------------------------------------- diff --git a/build/conf/kylin_job_conf_inmem.xml b/build/conf/kylin_job_conf_inmem.xml index 73b5cc5..d6799d5 100644 --- a/build/conf/kylin_job_conf_inmem.xml +++ b/build/conf/kylin_job_conf_inmem.xml @@ -81,8 +81,8 @@ <property> <name>mapred.task.timeout</name> - <value>3600000</value> - <description>Set task timeout to 1 hour</description> + <value>7200000</value> + <description>Set task timeout to 2 hour</description> </property> <!--Additional config for in-mem cubing, giving mapper more memory --> http://git-wip-us.apache.org/repos/asf/kylin/blob/9287117e/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index 53074fd..f824d8e 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -407,10 +407,6 @@ abstract public class KylinConfigBase implements Serializable { return getOptionalStringArray("kylin.job.admin.dls", null); } - public long getJobStepTimeout() { - return Long.parseLong(getOptional("kylin.job.step.timeout", String.valueOf(2 * 60 * 60))); - } - public double getJobCuboidSizeRatio() { return Double.parseDouble(getOptional("kylin.job.cuboid.size.ratio", "0.25")); } http://git-wip-us.apache.org/repos/asf/kylin/blob/9287117e/core-job/src/main/java/org/apache/kylin/job/engine/JobEngineConfig.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/engine/JobEngineConfig.java b/core-job/src/main/java/org/apache/kylin/job/engine/JobEngineConfig.java index 8ba1730..1e3eeaa 100644 --- a/core-job/src/main/java/org/apache/kylin/job/engine/JobEngineConfig.java +++ b/core-job/src/main/java/org/apache/kylin/job/engine/JobEngineConfig.java @@ -145,13 +145,6 @@ public class JobEngineConfig { } /** - * @return the jobStepTimeout - */ - public long getJobStepTimeout() { - return config.getJobStepTimeout(); - } - - /** * @return the asyncJobCheckInterval */ public int getAsyncJobCheckInterval() {
