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/12/31 11:38:48 UTC
kylin git commit: KYLIN-1269 Can not get last error message in email
Repository: kylin
Updated Branches:
refs/heads/2.0-rc 0a99e4e47 -> 11f5aa095
KYLIN-1269 Can not get last error message in email
Signed-off-by: fengyu <zh...@corp.netease.com>
Signed-off-by: Li, Yang <ya...@ebay.com>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/11f5aa09
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/11f5aa09
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/11f5aa09
Branch: refs/heads/2.0-rc
Commit: 11f5aa09594d0a74c67cd024d021a732fa02ad7d
Parents: 0a99e4e
Author: hzfengyu@corp.netease.com <hz...@corp.netease.com>
Authored: Wed Dec 30 16:05:19 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Dec 31 18:35:43 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/job/execution/DefaultChainedExecutable.java | 2 +-
engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/11f5aa09/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 082630d..2e95711 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
@@ -96,7 +96,7 @@ public class DefaultChainedExecutable extends AbstractExecutable implements Chai
}
} else {
setEndTime(System.currentTimeMillis());
- jobService.updateJobOutput(getId(), ExecutableState.ERROR, null, null);
+ jobService.updateJobOutput(getId(), ExecutableState.ERROR, null, result.output());
notifyUserStatusChange(executableContext, ExecutableState.ERROR);
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/11f5aa09/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
index 32e0f21..979ff75 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/CubingJob.java
@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
+import java.util.regex.Matcher;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
@@ -137,7 +138,7 @@ public class CubingJob extends DefaultChainedExecutable {
content = content.replaceAll("\\$\\{mr_waiting\\}", getMapReduceWaitTime() / 60000 + "mins");
content = content.replaceAll("\\$\\{last_update_time\\}", new Date(getLastModified()).toString());
content = content.replaceAll("\\$\\{submitter\\}", StringUtil.noBlank(getSubmitter(), "missing submitter"));
- content = content.replaceAll("\\$\\{error_log\\}", StringUtil.noBlank(logMsg, "no error message"));
+ content = content.replaceAll("\\$\\{error_log\\}", Matcher.quoteReplacement(StringUtil.noBlank(logMsg, "no error message")));
try {
InetAddress inetAddress = InetAddress.getLocalHost();