Browse Source

优化查询pod状态

pull/268/head
chenzhihang 8 months ago
parent
commit
a0d17e6dd3
2 changed files with 9 additions and 15 deletions
  1. +0
    -6
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/TensorBoardServiceImpl.java
  2. +9
    -9
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java

+ 0
- 6
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/TensorBoardServiceImpl.java View File

@@ -49,12 +49,6 @@ public class TensorBoardServiceImpl implements TensorBoardService {
break;
}
}
Boolean podReady = k8sClientUtil.getPodReady(podName, StringUtils.isEmpty(frameLogPathVo.getNamespace()) ? "default" : frameLogPathVo.getNamespace());
if (Constant.Running.equals(status) && !podReady) {
status = Constant.Pending;
} else if (Constant.Running.equals(status) && podReady) {
status = Constant.Running;
}
} catch (Exception e) {
return tensorboardStatusVo;
}


+ 9
- 9
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java View File

@@ -635,23 +635,23 @@ public class K8sClientUtil {
public String getPodStatus(String podName, String namespace) throws Exception {
CoreV1Api api = new CoreV1Api(apiClient);
V1Pod pod = api.readNamespacedPod(podName, namespace, null, null, null);
return pod.getStatus().getPhase();
}
String status = pod.getStatus().getPhase();
Boolean podReady = false;

public Boolean getPodReady(String podName, String namespace) throws Exception {
CoreV1Api api = new CoreV1Api(apiClient);
V1Pod pod = api.readNamespacedPod(podName, namespace, null, null, null);
List<V1PodCondition> conditions = pod.getStatus().getConditions();
if (conditions != null) {
for (V1PodCondition condition : conditions) {
if (!Constant.Ready.equals(condition.getType())) {
return false;
break;
}
}
return true;
} else {
return false;
podReady = true;
}

if (Constant.Running.equals(status) && !podReady) {
return Constant.Pending;
}
return status;
}

/**


Loading…
Cancel
Save