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 <405240259@qq.com>
Co-authored-by: enjoyyin <690574002@qq.com>
Co-authored-by: leebai <39912100+leeebai@users.noreply.github.com>
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 29602de..8e24d6b 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 @@
}
- //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 cb46855..6597776 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 @@
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