You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/07/12 10:21:14 UTC
[1/2] kylin git commit: KYLIN-1879 Fix wrong time result in jobs API
Repository: kylin
Updated Branches:
refs/heads/master a1f4ef433 -> 95eb2ff7a
KYLIN-1879 Fix wrong time result in jobs API
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/170d826b
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/170d826b
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/170d826b
Branch: refs/heads/master
Commit: 170d826bf2d27e625e1d4e1a9b00149098b16197
Parents: a1f4ef4
Author: lidongsjtu <li...@apache.org>
Authored: Tue Jul 12 18:06:17 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Tue Jul 12 18:06:26 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/rest/service/JobService.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/170d826b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
index c868264..e4fbc98 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
@@ -288,7 +288,9 @@ public class JobService extends BasicService {
result.setType(CubeBuildTypeEnum.BUILD);
result.setStatus(parseToJobStatus(output.getState()));
result.setMrWaiting(AbstractExecutable.getExtraInfoAsLong(output, CubingJob.MAP_REDUCE_WAIT_TIME, 0L) / 1000);
- result.setDuration(AbstractExecutable.getDuration(AbstractExecutable.getStartTime(output), AbstractExecutable.getEndTime(output)) / 1000);
+ result.setExecStartTime(AbstractExecutable.getStartTime(output));
+ result.setExecEndTime(AbstractExecutable.getEndTime(output));
+ result.setDuration(AbstractExecutable.getDuration(result.getExecStartTime(), result.getExecEndTime()) / 1000);
for (int i = 0; i < cubeJob.getTasks().size(); ++i) {
AbstractExecutable task = cubeJob.getTasks().get(i);
result.addStep(parseToJobStep(task, i, outputs.get(task.getId())));
[2/2] kylin git commit: minor, fix DebugTomcat
Posted by li...@apache.org.
minor, fix DebugTomcat
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/95eb2ff7
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/95eb2ff7
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/95eb2ff7
Branch: refs/heads/master
Commit: 95eb2ff7a648e686ec2658bde6849a91c7e5c222
Parents: 170d826
Author: lidongsjtu <li...@apache.org>
Authored: Tue Jul 12 18:20:59 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Tue Jul 12 18:20:59 2016 +0800
----------------------------------------------------------------------
examples/test_case_data/sandbox/kylin.properties | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/95eb2ff7/examples/test_case_data/sandbox/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties
index 410bd74..9cba448 100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties
@@ -89,6 +89,8 @@ kylin.cube.algorithm=random
kylin.security.profile=testing
kylin.storage.cleanup.time.threshold=21600000
+kylin.job.controller.lock=org.apache.kylin.job.lock.MockJobLock
+
## Config for Restful APP ##
# database connection settings:
ldap.server=