This is an automated email from the ASF dual-hosted git repository.
casion 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 7ab847aa1 [ISSUE-1763] Add non empty validation to the applicationlist
interface (#2440)
7ab847aa1 is described below
commit 7ab847aa124e0dffe780472402a30ad52bf95c0e
Author: 成彬彬 <[email protected]>
AuthorDate: Thu Jul 14 10:48:11 2022 +0800
[ISSUE-1763] Add non empty validation to the applicationlist interface
(#2440)
* Add non empty validation to the applicationlist interface
---
.../org/apache/linkis/manager/rm/restful/RMMonitorRest.scala | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
index 921d1a956..c41c4eede 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala
@@ -114,7 +114,7 @@ class RMMonitorRest extends Logging {
def getApplicationList(request: HttpServletRequest, @RequestBody param:
util.Map[String, AnyRef]): Message = {
val message = Message.ok("")
val userName = ModuleUserUtils.getOperationUser(request, "applicationlist")
- val userCreator = param.get("userCreator").asInstanceOf[String]
+ val userCreator = if (param.get("userCreator") == null) null else
param.get("userCreator").asInstanceOf[String]
val engineType = if (param.get("engineType") == null) null else
param.get("engineType").asInstanceOf[String]
val nodes = getEngineNodes(userName, true)
val creatorToApplicationList = new mutable.HashMap[String,
mutable.HashMap[String, Any]]
@@ -133,10 +133,10 @@ class RMMonitorRest extends Logging {
creatorToApplicationList.put(userCreatorLabel.getCreator,
applicationList)
}
val applicationList =
creatorToApplicationList(userCreatorLabel.getCreator)
- applicationList.put("usedResource",
applicationList("usedResource").asInstanceOf[Resource] +
node.getNodeResource.getUsedResource)
- applicationList.put("maxResource",
applicationList("maxResource").asInstanceOf[Resource] +
node.getNodeResource.getMaxResource)
- applicationList.put("minResource",
applicationList("minResource").asInstanceOf[Resource] +
node.getNodeResource.getMinResource)
- applicationList.put("lockedResource",
applicationList("lockedResource").asInstanceOf[Resource] +
node.getNodeResource.getLockedResource)
+ applicationList.put("usedResource", (if
(applicationList("usedResource") == null )
Resource.initResource(ResourceType.LoadInstance) else
applicationList("usedResource").asInstanceOf[Resource] ) +
node.getNodeResource.getUsedResource)
+ applicationList.put("maxResource", (if
(applicationList("maxResource") == null )
Resource.initResource(ResourceType.LoadInstance) else
applicationList("maxResource").asInstanceOf[Resource] ) +
node.getNodeResource.getMaxResource)
+ applicationList.put("minResource", (if
(applicationList("minResource") == null )
Resource.initResource(ResourceType.LoadInstance) else
applicationList("minResource").asInstanceOf[Resource] ) +
node.getNodeResource.getMinResource)
+ applicationList.put("lockedResource", (if
(applicationList("lockedResource") == null )
Resource.initResource(ResourceType.LoadInstance) else
applicationList("lockedResource").asInstanceOf[Resource] ) +
node.getNodeResource.getLockedResource)
val engineInstance = new mutable.HashMap[String, Any]
engineInstance.put("creator", userCreatorLabel.getCreator)
engineInstance.put("engineType", engineTypeLabel.getEngineType)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
