Skip to content

Commit eb9d602

Browse files
fix the bug for adding task for existed jobs.
1 parent aef48de commit eb9d602

File tree

1 file changed

+4
-4
lines changed
  • streamis-jobmanager/streamis-jobmanager-server/src/main/java/com/webank/wedatasphere/streamis/jobmanager/restful/api

1 file changed

+4
-4
lines changed

streamis-jobmanager/streamis-jobmanager-server/src/main/java/com/webank/wedatasphere/streamis/jobmanager/restful/api/JobRestfulApi.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,11 @@ public Message addTask(HttpServletRequest req,
281281
} else if(streamTask == null) {
282282
// 这里取个巧,从该工程该用户有权限的Job中找到一个Flink的历史作业,作为这个Spark Streaming作业的jobId和jobInfo
283283
// 替换掉JobInfo中的 yarn 信息,这样我们前端就可以在不修改任何逻辑的情况下正常展示Spark Streaming作业了
284-
PageInfo<QueryJobListVo> jobList = streamJobService.getByProList(streamJobs.get(0).getProjectName(), username, null, 0, null);
285-
List<QueryJobListVo> copyJobs = jobList.getList().stream().filter(job -> !job.getJobType().startsWith("spark") && job.getStatus() > 0)
284+
PageInfo<QueryJobListVo> jobList = streamJobService.getByProList(streamJobs.get(0).getProjectName(), username, null, null, null);
285+
List<QueryJobListVo> copyJobs = jobList.getList().stream().filter(job -> !job.getJobType().startsWith("spark."))
286286
.collect(Collectors.toList());
287287
if(copyJobs.isEmpty()) {
288-
return Message.error("no Flink Job has submitted, the register to Streamis cannot be succeeded.");
288+
return Message.error("no Flink Job has been submitted, the register to Streamis cannot be succeeded.");
289289
}
290290
int index = 0;
291291
while(streamTask == null && index < copyJobs.size()) {
@@ -301,7 +301,7 @@ public Message addTask(HttpServletRequest req,
301301
}
302302
}
303303
if(streamTask == null) {
304-
return Message.error("no Flink Job has submitted, the register to Streamis cannot be succeeded.");
304+
return Message.error("no Flink task has been executed, the register to Streamis cannot be succeeded.");
305305
}
306306
}
307307
streamTask.setStartTime(new Date());

0 commit comments

Comments
 (0)