kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kangkai...@apache.org
Subject [26/50] [abbrv] kylin git commit: minor, fix bug "skip all steps after resume"
Date Fri, 07 Jul 2017 08:38:28 GMT
minor, fix bug "skip all steps after resume"


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e7f9dab7
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e7f9dab7
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e7f9dab7

Branch: refs/heads/KYLIN-2606
Commit: e7f9dab77f087ce1701974abaae1b8f541448de4
Parents: 5eca7f6
Author: Roger Shi <rogershijicheng@hotmail.com>
Authored: Thu Jun 29 23:08:27 2017 +0800
Committer: liyang-gmt8 <liyang@apache.org>
Committed: Thu Jun 29 23:11:00 2017 +0800

----------------------------------------------------------------------
 .../kylin/job/execution/DefaultChainedExecutable.java       | 1 +
 .../org/apache/kylin/job/execution/ExecutableManager.java   | 9 +++++++++
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/e7f9dab7/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java
----------------------------------------------------------------------
diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java
b/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java
index ae129ab..4f5c02b 100644
--- a/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java
+++ b/core-job/src/main/java/org/apache/kylin/job/execution/DefaultChainedExecutable.java
@@ -75,6 +75,7 @@ public class DefaultChainedExecutable extends AbstractExecutable implements
Chai
             final long endTime = getEndTime();
             if (endTime > 0) {
                 long interruptTime = System.currentTimeMillis() - endTime + getInterruptTime();
+                info.putAll(getManager().getJobOutput(getId()).getInfo());
                 info.put(START_TIME, Long.toString(startTime));
                 info.put(INTERRUPT_TIME, Long.toString(interruptTime));
                 getManager().updateJobOutput(getId(), ExecutableState.RUNNING, info, null);

http://git-wip-us.apache.org/repos/asf/kylin/blob/e7f9dab7/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java
----------------------------------------------------------------------
diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java
b/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java
index f16cfde..f8fb980 100644
--- a/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java
+++ b/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java
@@ -389,6 +389,15 @@ public class ExecutableManager {
         updateJobOutput(jobId, ExecutableState.STOPPED, null, null);
     }
 
+    public ExecutableOutputPO getJobOutput(String jobId) {
+        try {
+            return executableDao.getJobOutput(jobId);
+        } catch (PersistentException e) {
+            logger.error("Can't get output of Job " + jobId);
+            throw new RuntimeException(e);
+        }
+    }
+
     public void updateJobOutput(String jobId, ExecutableState newStatus, Map<String, String>
info, String output) {
         try {
             final ExecutableOutputPO jobOutput = executableDao.getJobOutput(jobId);


Mime
View raw message