[kylin] branch 2.6.x updated: KYLIN-3817: Duration in Cube building is a negative number

[shaofengshi]

This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/2.6.x by this push:
     new 008ed65  KYLIN-3817: Duration in Cube building is a negative number
008ed65 is described below

commit 008ed65750db6747c6fe46ef51af9458057d830f
Author: Shaohui Liu <liushao...@xiaomi.com>
AuthorDate: Fri Mar 15 23:56:21 2019 +0800

    KYLIN-3817: Duration in Cube building is a negative number
---
 .../org/apache/kylin/job/execution/DefaultChainedExecutable.java    | 6 +++---
 .../main/java/org/apache/kylin/job/execution/ExecutableManager.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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 3bcd8ca..67acf2e 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
@@ -77,14 +77,14 @@ public class DefaultChainedExecutable extends 
AbstractExecutable implements Chai
     @Override
     protected void onExecuteStart(ExecutableContext executableContext) {
         final long startTime = getStartTime();
-        Map<String, String> info = Maps.newHashMap();
-        info.put(BUILD_INSTANCE, DistributedLockFactory.processAndHost());
         if (startTime > 0) {
-            getManager().updateJobOutput(getId(), ExecutableState.RUNNING, 
info, null);
+            getManager().updateJobOutput(getId(), ExecutableState.RUNNING, 
null, null);
         } else {
+            Map<String, String> info = Maps.newHashMap();
             info.put(START_TIME, Long.toString(System.currentTimeMillis()));
             getManager().updateJobOutput(getId(), ExecutableState.RUNNING, 
info, null);
         }
+        getManager().addJobInfo(getId(), BUILD_INSTANCE, 
DistributedLockFactory.processAndHost());
     }
 
     @Override
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 22aa859..b1244b5 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
@@ -444,7 +444,7 @@ public class ExecutableManager {
                 jobOutput.setStatus(newStatus.toString());
             }
             if (info != null) {
-                jobOutput.getInfo().putAll(info);
+                jobOutput.setInfo(info);
             }
             if (output != null) {
                 jobOutput.setContent(output);