This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 0d1c3f8a5 fix: resource output json error (#5160)
0d1c3f8a5 is described below
commit 0d1c3f8a572c3532057a1163062c043c75fc1eae
Author: cwmore <124852055+cwm...@users.noreply.github.com>
AuthorDate: Fri Aug 23 10:43:41 2024 +0800
fix: resource output json error (#5160)
Co-authored-by: west <754515...@qq.com>
---
.../org/apache/linkis/manager/common/entity/resource/CPUResource.java | 2 +-
.../linkis/manager/common/entity/resource/LoadInstanceResource.java | 2 +-
.../org/apache/linkis/manager/common/entity/resource/LoadResource.java | 2 +-
.../apache/linkis/manager/common/entity/resource/MemoryResource.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/CPUResource.java
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/CPUResource.java
index aecd3ee3c..4a861f582 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/CPUResource.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/CPUResource.java
@@ -128,7 +128,7 @@ public class CPUResource extends Resource {
@Override
public String toJson() {
- return String.format(" \"cpu\":%s ", cores);
+ return String.format(" {\"cpu\":%s} ", cores);
}
@Override
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadInstanceResource.java
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadInstanceResource.java
index 2eb37cc55..accb25c35 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadInstanceResource.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadInstanceResource.java
@@ -170,7 +170,7 @@ public class LoadInstanceResource extends Resource {
public String toString() {
return String.format(
"Number of instances(实例数)：%d，(RAM)内存：%s ,cpu: %s",
- this.getInstances(), this.getMemory(), this.getCores());
+ this.getInstances(), ByteTimeUtils.bytesToString(this.getMemory()),
this.getCores());
}
public long getMemory() {
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadResource.java
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadResource.java
index 313ce7b92..5a4a586b9 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadResource.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/LoadResource.java
@@ -125,7 +125,7 @@ public class LoadResource extends Resource {
@Override
public String toJson() {
return String.format(
- "{\"memory\":%s,\"cpu\":%d}",
ByteTimeUtils.bytesToString(this.memory), this.cores);
+ "{\"memory\":\"%s\",\"cpu\":%d}",
ByteTimeUtils.bytesToString(this.memory), this.cores);
}
@Override
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/MemoryResource.java
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/MemoryResource.java
index da69c930c..09c70b1d2 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/MemoryResource.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/MemoryResource.java
@@ -112,7 +112,7 @@ public class MemoryResource extends Resource {
@Override
public String toJson() {
- return " \"memory\":\"" + ByteTimeUtils.bytesToString(memory) + " ";
+ return " {\"memory\":\"" + ByteTimeUtils.bytesToString(memory) + "\"} ";
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@linkis.apache.org
For additional commands, e-mail: commits-h...@linkis.apache.org
