Repository: kylin Updated Branches: refs/heads/master a43729bc7 -> 468fe9ffc
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/468fe9ff Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/468fe9ff Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/468fe9ff Branch: refs/heads/master Commit: 468fe9ffc3d1b6c6813481803dd59673f78718f1 Parents: a43729b Author: Li Yang <liy...@apache.org> Authored: Thu Oct 27 15:01:51 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu Oct 27 15:01:51 2016 +0800 ---------------------------------------------------------------------- build/conf/kylin_job_conf_inmem.xml | 2 +- .../main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ---- .../java/org/apache/kylin/job/engine/JobEngineConfig.java | 7 ------- 3 files changed, 1 insertion(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/468fe9ff/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 1d349f6..d363507 100644 --- a/build/conf/kylin_job_conf_inmem.xml +++ b/build/conf/kylin_job_conf_inmem.xml @@ -81,7 +81,7 @@ <property> <name>mapreduce.task.timeout</name> - <value>3600000</value> + <value>7200000</value> <description>Set task timeout to 1 hour</description> </property> http://git-wip-us.apache.org/repos/asf/kylin/blob/468fe9ff/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 455b691..8744296 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 @@ -411,10 +411,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/468fe9ff/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() {
