[FIX] 修复node信息解析错误

Author: 李浩

src/main/java/io/choerodon/devops/app/service/impl/ClusterNodeInfoServiceImpl.java

@@ -1,11 +1,5 @@
 package io.choerodon.devops.app.service.impl;
 
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,8 +9,15 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 import io.choerodon.core.domain.Page;
 import io.choerodon.core.exception.CommonException;
 import io.choerodon.devops.api.vo.AgentNodeInfoVO;
@@ -106,9 +107,9 @@ private String node2JsonString(AgentNodeInfoVO raw) {
         BeanUtils.copyProperties(raw, node);
         node.setCpuLimit(String.format(CPU_MEASURE_FORMAT, K8sUtil.getNormalValueFromCpuString(node.getCpuLimit())));
         node.setCpuRequest(String.format(CPU_MEASURE_FORMAT, K8sUtil.getNormalValueFromCpuString(node.getCpuRequest())));
-        node.setCpuTotal(String.format(CPU_MEASURE_FORMAT, K8sUtil.getNormalValueFromCpuString(StringUtils.isEmpty(raw.getCpuAllocatable()) ? raw.getCpuCapacity() : raw.getCpuAllocatable())));
-        node.setPodTotal(Long.parseLong(StringUtils.isEmpty(raw.getPodAllocatable()) ? raw.getPodCapacity() : raw.getPodAllocatable()));
-        node.setMemoryTotal(StringUtils.isEmpty(raw.getMemoryAllocatable()) ? raw.getMemoryCapacity() : raw.getMemoryAllocatable());
+        node.setCpuTotal(String.format(CPU_MEASURE_FORMAT, K8sUtil.getNormalValueFromCpuString(ObjectUtils.isEmpty(raw.getCpuAllocatable()) ? raw.getCpuCapacity() : raw.getCpuAllocatable())));
+        node.setPodTotal(ObjectUtils.isEmpty(raw.getPodAllocatable()) ? K8sUtil.getNormalValueFromPodString(raw.getPodCapacity()) : K8sUtil.getNormalValueFromPodString(raw.getPodAllocatable()));
+        node.setMemoryTotal(ObjectUtils.isEmpty(raw.getMemoryAllocatable()) ? raw.getMemoryCapacity() : raw.getMemoryAllocatable());
 
         setMemoryInfo(node);
 
@@ -307,8 +308,8 @@ public List<String> queryNodeName(Long projectId, Long clusterId) {
         long total = stringRedisTemplate.opsForList().size(rediskey);
 
         return Objects.requireNonNull(stringRedisTemplate
-                .opsForList()
-                .range(rediskey, 0, total - 1))
+                        .opsForList()
+                        .range(rediskey, 0, total - 1))
                 .stream()
                 .map(node -> JSONObject.parseObject(node, ClusterNodeInfoVO.class))
                 .map(ClusterNodeInfoVO::getNodeName)

src/main/java/io/choerodon/devops/infra/util/K8sUtil.java

@@ -97,6 +97,14 @@ public static double getNormalValueFromCpuString(String cpuAmount) {
         return 0.0;
     }
 
+    public static Long getNormalValueFromPodString(String podAmount) {
+        if (podAmount.endsWith("k")) {
+            return Long.parseLong(podAmount.substring(0, podAmount.length() - 1)) * 1000;
+        } else {
+            return Long.parseLong(podAmount);
+        }
+    }
+
 
     private static String getPodStatus(V1ContainerStateTerminated containerStateTerminated) {
         LOGGER.debug("Get pod status: {}", containerStateTerminated);