From fa88258cf7d94f105e1d7340b51dffabe8dd93d0 Mon Sep 17 00:00:00 2001 From: WilliamZhu Date: Sun, 30 Oct 2022 11:53:13 +0800 Subject: [PATCH 1/2] update --- .../notebook/console/service/JobService.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/kyligence/notebook/console/service/JobService.java b/src/main/java/io/kyligence/notebook/console/service/JobService.java index f7154e4..1e27790 100644 --- a/src/main/java/io/kyligence/notebook/console/service/JobService.java +++ b/src/main/java/io/kyligence/notebook/console/service/JobService.java @@ -78,9 +78,15 @@ public JobLog getJobLog(String user, String jobId, Long offset) { if (jobLog.getValue() != null) { jobLog.setValue( jobLog.getValue().stream().filter( - s -> s.contains(String.format("[owner] [%s] [groupId] [%s]", user, groupId)) - || s.contains(String.format("DriverLogServer: [owner] [%s]", user)) - ).collect(Collectors.toList()) + s -> s.contains(String.format("[owner] [%s] [groupId]", user)) + ).map(s -> { + String[] arr = s.split("__MMMMMM__", 2); + if (arr.length == 2) { + return arr[1]; + } else { + return s; + } + }).collect(Collectors.toList()) ); } else { jobLog.setValue(Lists.newArrayList()); @@ -246,7 +252,7 @@ public boolean isRunning(Integer status) { return Objects.nonNull(status) && (status == JobInfo.JobStatus.RUNNING || status >= JobInfo.JobStatus.RETRYING); } - public boolean needRetry(Integer status){ + public boolean needRetry(Integer status) { return config.getExecutionEngineCallbackRetries() > 0 && Objects.nonNull(status) && (status == JobInfo.JobStatus.RUNNING || status > JobInfo.JobStatus.RETRYING); } From 6db95eb0ff2a385bf885672e5183a81ef446edfa Mon Sep 17 00:00:00 2001 From: WilliamZhu Date: Sun, 30 Oct 2022 21:02:12 +0800 Subject: [PATCH 2/2] update --- .../java/io/kyligence/notebook/console/service/JobService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/kyligence/notebook/console/service/JobService.java b/src/main/java/io/kyligence/notebook/console/service/JobService.java index 1e27790..7e543b2 100644 --- a/src/main/java/io/kyligence/notebook/console/service/JobService.java +++ b/src/main/java/io/kyligence/notebook/console/service/JobService.java @@ -79,7 +79,7 @@ public JobLog getJobLog(String user, String jobId, Long offset) { jobLog.setValue( jobLog.getValue().stream().filter( s -> s.contains(String.format("[owner] [%s] [groupId]", user)) - ).map(s -> { + ).filter(s-> !s.contains("run command as ShowCommand.`jobs/v2")).map(s -> { String[] arr = s.split("__MMMMMM__", 2); if (arr.length == 2) { return arr[1];