From ed3e7d34780d66e2bb38b78d9f5b3001cd3b8cad Mon Sep 17 00:00:00 2001 From: "hzfengyu@corp.netease.com" Date: Wed, 30 Dec 2015 16:05:19 +0800 Subject: [PATCH 2/2] KYLIN-1269 Can not get last error message in email Signed-off-by: fengyu --- .../java/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(-) 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); } } 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(); -- 1.9.4.msysgit.2