You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/07/26 10:57:18 UTC
[kylin] branch master updated: KYLIN-2998 bug fix
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new b1032eb KYLIN-2998 bug fix
b1032eb is described below
commit b1032ebb600777477c8cdda270cc88757ac7aaeb
Author: shaofengshi <sh...@apache.org>
AuthorDate: Thu Jul 26 18:15:30 2018 +0800
KYLIN-2998 bug fix
---
.../src/main/java/org/apache/kylin/job/common/PatternedLogger.java | 4 ++--
.../src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core-job/src/main/java/org/apache/kylin/job/common/PatternedLogger.java b/core-job/src/main/java/org/apache/kylin/job/common/PatternedLogger.java
index f6e1507..a850ee9 100644
--- a/core-job/src/main/java/org/apache/kylin/job/common/PatternedLogger.java
+++ b/core-job/src/main/java/org/apache/kylin/job/common/PatternedLogger.java
@@ -50,7 +50,7 @@ public class PatternedLogger extends BufferedLogger {
private static final Pattern PATTERN_HIVE_APP_ID_URL_2 = Pattern.compile("Executing on YARN cluster with App id (.*?)");
// spark
- private static final Pattern PATTERN_SPARK_APP_ID = Pattern.compile("Submitted application (.*?)");
+ private static final Pattern PATTERN_SPARK_APP_ID = Pattern.compile("Submitted application (.*)");
private static final Pattern PATTERN_SPARK_APP_URL = Pattern.compile("tracking URL: (.*)");
private static final Pattern PATTERN_JOB_STATE = Pattern.compile("Final-State : (.*?)$");
@@ -109,5 +109,5 @@ public class PatternedLogger extends BufferedLogger {
public interface ILogListener{
void onLogEvent(String infoKey, Map<String, String> info);
}
-
+
}
diff --git a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
index e1e01cd..4635fad 100644
--- a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
+++ b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
@@ -348,7 +348,7 @@ public class SparkExecutable extends AbstractExecutable {
private int killAppRetry(String appId) throws IOException, InterruptedException {
String state = getAppState(appId);
- if (state.equals("SUCCEEDED") || state.equals("FAILED") || state.equals("KILLED")) {
+ if ("SUCCEEDED".equals(state) || "FAILED".equals(state) || "KILLED".equals(state)) {
logger.warn(appId + "is final state, no need to kill");
return 0;
}
@@ -366,7 +366,7 @@ public class SparkExecutable extends AbstractExecutable {
retry++;
}
- if (state.equals("KILLED")) {
+ if ("KILLED".equals(state)) {
logger.info(appId + " killed successfully");
return 0;
} else {