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 2015/01/23 09:31:51 UTC
[04/50] [abbrv] incubator-kylin git commit: fix
BuildCubeWithEngineTest
fix BuildCubeWithEngineTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/4c48cfc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/4c48cfc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/4c48cfc5
Branch: refs/heads/inverted-index
Commit: 4c48cfc5d010442a52cf0639f21dca1727241fb1
Parents: dc83c0a
Author: qianhao.zhou <qi...@ebay.com>
Authored: Thu Jan 22 11:06:02 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Thu Jan 22 11:06:02 2015 +0800
----------------------------------------------------------------------
.../java/com/kylinolap/job/impl/threadpool/AbstractExecutable.java | 2 +-
.../kylinolap/job/impl/threadpool/DefaultChainedExecutable.java | 2 ++
server/src/main/java/com/kylinolap/rest/service/JobService.java | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4c48cfc5/job/src/main/java/com/kylinolap/job/impl/threadpool/AbstractExecutable.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/com/kylinolap/job/impl/threadpool/AbstractExecutable.java b/job/src/main/java/com/kylinolap/job/impl/threadpool/AbstractExecutable.java
index acfe9fe..fe38ca3 100644
--- a/job/src/main/java/com/kylinolap/job/impl/threadpool/AbstractExecutable.java
+++ b/job/src/main/java/com/kylinolap/job/impl/threadpool/AbstractExecutable.java
@@ -55,7 +55,7 @@ public abstract class AbstractExecutable implements Executable, Idempotent {
}
protected void onExecuteFinished(ExecuteResult result, ExecutableContext executableContext) {
- jobService.addJobInfo(getId(), END_TIME, Long.toString(System.currentTimeMillis()));
+ setEndTime(System.currentTimeMillis());
if (!isDiscarded()) {
if (result.succeed()) {
jobService.updateJobOutput(getId(), ExecutableState.SUCCEED, null, result.output());
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4c48cfc5/job/src/main/java/com/kylinolap/job/impl/threadpool/DefaultChainedExecutable.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/com/kylinolap/job/impl/threadpool/DefaultChainedExecutable.java b/job/src/main/java/com/kylinolap/job/impl/threadpool/DefaultChainedExecutable.java
index 178876b..9378482 100644
--- a/job/src/main/java/com/kylinolap/job/impl/threadpool/DefaultChainedExecutable.java
+++ b/job/src/main/java/com/kylinolap/job/impl/threadpool/DefaultChainedExecutable.java
@@ -55,6 +55,7 @@ public class DefaultChainedExecutable extends AbstractExecutable implements Chai
@Override
protected void onExecuteFinished(ExecuteResult result, ExecutableContext executableContext) {
+ setEndTime(System.currentTimeMillis());
if (isDiscarded()) {
notifyUserStatusChange(ExecutableState.DISCARDED);
} else if (result.succeed()) {
@@ -77,6 +78,7 @@ public class DefaultChainedExecutable extends AbstractExecutable implements Chai
jobService.updateJobOutput(getId(), ExecutableState.ERROR, null, null);
notifyUserStatusChange(ExecutableState.ERROR);
} else {
+ notifyUserStatusChange(ExecutableState.READY);
jobService.updateJobOutput(getId(), ExecutableState.READY, null, null);
}
} else {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4c48cfc5/server/src/main/java/com/kylinolap/rest/service/JobService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/com/kylinolap/rest/service/JobService.java b/server/src/main/java/com/kylinolap/rest/service/JobService.java
index f521d10..60583c7 100644
--- a/server/src/main/java/com/kylinolap/rest/service/JobService.java
+++ b/server/src/main/java/com/kylinolap/rest/service/JobService.java
@@ -171,7 +171,7 @@ public class JobService extends BasicService {
result.setUuid(cubeJob.getId());
result.setType(CubeBuildTypeEnum.BUILD);
result.setStatus(parseToJobStatus(job.getStatus()));
- result.setMrWaiting(cubeJob.getMapReduceWaitTime());
+ result.setMrWaiting(cubeJob.getMapReduceWaitTime() / 1000);
result.setDuration(cubeJob.getDuration() / 1000);
for (int i = 0; i < cubeJob.getTasks().size(); ++i) {
AbstractExecutable task = cubeJob.getTasks().get(i);