You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/02/22 07:06:08 UTC
[incubator-linkis] branch release-1.0.3 updated: Fix bug of "kill" method in linkis-entrance, to support null taskID. (#1541)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch release-1.0.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/release-1.0.3 by this push:
new 8d460a4 Fix bug of "kill" method in linkis-entrance, to support null taskID. (#1541)
8d460a4 is described below
commit 8d460a42eca2e86562e0249eb6cdd027640bf031
Author: Alexyang <xu...@qq.com>
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 <40...@qq.com>
Co-authored-by: enjoyyin <69...@qq.com>
Co-authored-by: leebai <39...@users.noreply.github.com>
---
.../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 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 @@ 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 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 @@ 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: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org