You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by le...@apache.org on 2022/06/15 11:22:55 UTC
[incubator-linkis] branch dev-1.2.0 updated: add entrance running tasks restful api
This is an automated email from the ASF dual-hosted git repository.
legendtkl pushed a commit to branch dev-1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.2.0 by this push:
new 4c1341892 add entrance running tasks restful api
4c1341892 is described below
commit 4c1341892aa9f5f58a83900f9ae94fc1b24a90ce
Author: peacewong <wp...@gmail.com>
AuthorDate: Wed Jun 15 17:56:50 2022 +0800
add entrance running tasks restful api
---
.../assembly-combined/conf/linkis.properties | 2 +-
.../entrance/restful/EntranceMetricRestfulApi.java | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/assembly-combined-package/assembly-combined/conf/linkis.properties b/assembly-combined-package/assembly-combined/conf/linkis.properties
index 780dd6fdb..dc04db719 100644
--- a/assembly-combined-package/assembly-combined/conf/linkis.properties
+++ b/assembly-combined-package/assembly-combined/conf/linkis.properties
@@ -51,7 +51,7 @@ wds.linkis.home=/appcom/Install/LinkisInstall
#Linkis governance station administrators
wds.linkis.governance.station.admin=hadoop
wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource
-wds.linkis.server.user.restful.uri.pass.auth=/actuator/prometheus,/api/rest_j/v1/offline
+wds.linkis.server.user.restful.uri.pass.auth=/actuator/prometheus,/api/rest_j/v1/offline,/api/rest_j/v1/entrance/api/metrics/runningtask
spring.spring.servlet.multipart.max-file-size=500MB
spring.spring.servlet.multipart.max-request-size=500MB
diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceMetricRestfulApi.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceMetricRestfulApi.java
index e8f7b8ddf..ef16f06d4 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceMetricRestfulApi.java
+++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceMetricRestfulApi.java
@@ -101,4 +101,21 @@ public class EntranceMetricRestfulApi {
.data("runningNumber", runningNumber)
.data("queuedNumber", queuedNumber);
}
+
+ @RequestMapping(path = "/runningtask", method = RequestMethod.GET)
+ public Message status(HttpServletRequest req) {
+
+ EntranceJob[] undoneTasks = entranceServer.getAllUndoneTask("");
+ Boolean isCompleted = false;
+ if (null == undoneTasks || undoneTasks.length < 1) {
+ isCompleted = true;
+ }
+ int runningTaskNumber = 0;
+ if (undoneTasks != null) {
+ runningTaskNumber = undoneTasks.length;
+ }
+ return Message.ok("success")
+ .data("runningTaskNumber", runningTaskNumber)
+ .data("isCompleted", isCompleted);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org