This is an automated email from the ASF dual-hosted git repository. aiceflower pushed a commit to branch release-1.0.3 in repository https://gitbox.apache.org/repos/asf/linkis.git
commit 1028cb32686a26c9c234615e6a4f6daf75d41af7 Author: Alexyang <[email protected]> AuthorDate: Tue Feb 22 15:06:02 2022 +0800 Fix bug of "kill" method in linkis-entrance, to support null taskID. (#1541) * Fix bug of "kill" method in linkis-entrance, to support null taskID. * Fix bug of "kill" method in linkis-entrance, to support null taskID. Co-authored-by: allenlliu <[email protected]> Co-authored-by: enjoyyin <[email protected]> Co-authored-by: leebai <[email protected]> --- .../java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java | 3 +-- .../org/apache/linkis/entrance/restful/EntranceRestfulRemote.scala | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java index 29602de829..8e24d6b8d4 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java +++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java @@ -363,9 +363,8 @@ public class EntranceRestfulApi implements EntranceRestfulRemote { } - //todo confirm long or Long @RequestMapping(path = "/{id}/kill",method = RequestMethod.GET) - public Message kill(@PathVariable("id") String id, @RequestParam(value = "taskID",required = false) long taskID) { + public Message kill(@PathVariable("id") String id, @RequestParam(value = "taskID",required = false) Long taskID) { String realId = ZuulEntranceUtils.parseExecID(id)[3]; //通过jobid获取job,可能会由于job找不到而导致有looparray的报错,一旦报错的话，就可以将该任务直接置为Cancenlled Option<Job> job = Option.apply(null); diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/restful/EntranceRestfulRemote.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/restful/EntranceRestfulRemote.scala index cb46855eeb..6597776e8d 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/restful/EntranceRestfulRemote.scala +++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/restful/EntranceRestfulRemote.scala @@ -53,7 +53,7 @@ trait EntranceRestfulRemote { def killJobs(req: HttpServletRequest, @RequestBody jsonNode: JsonNode): Message @RequestMapping(value = Array("/entrance/{id}/kill"), method = Array(RequestMethod.POST)) - def kill(@PathVariable("id") id: String, @RequestParam("taskID") taskID:scala.Long): Message + def kill(@PathVariable("id") id: String, @RequestParam("taskID") taskID: java.lang.Long): Message @RequestMapping(value = Array("/entrance/{id}/pause"), method = Array(RequestMethod.POST)) def pause(@PathVariable("id") id: String): Message --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
