Browse Source

优化查询pod状态

pull/268/head
chenzhihang 10 months ago
parent
commit
adf3b8d02a
2 changed files with 7 additions and 5 deletions
  1. +7
    -3
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/TensorBoardServiceImpl.java
  2. +0
    -2
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/PodStatusVo.java

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

@@ -8,6 +8,7 @@ import com.ruoyi.platform.service.TensorBoardService;
import com.ruoyi.platform.utils.K8sClientUtil; import com.ruoyi.platform.utils.K8sClientUtil;
import com.ruoyi.platform.vo.FrameLogPathVo; import com.ruoyi.platform.vo.FrameLogPathVo;
import com.ruoyi.platform.vo.PodStatusVo; import com.ruoyi.platform.vo.PodStatusVo;
import com.ruoyi.system.api.constant.Constant;
import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -32,7 +33,6 @@ public class TensorBoardServiceImpl implements TensorBoardService {
@Override @Override
public PodStatusVo getTensorBoardStatus(FrameLogPathVo frameLogPathVo) { public PodStatusVo getTensorBoardStatus(FrameLogPathVo frameLogPathVo) {
String status = PodStatus.Terminated.getName(); String status = PodStatus.Terminated.getName();
Boolean podReady = false;
PodStatusVo tensorboardStatusVo = new PodStatusVo(); PodStatusVo tensorboardStatusVo = new PodStatusVo();
tensorboardStatusVo.setStatus(status); tensorboardStatusVo.setStatus(status);
if (StringUtils.isEmpty(frameLogPathVo.getPath())) { if (StringUtils.isEmpty(frameLogPathVo.getPath())) {
@@ -49,14 +49,18 @@ public class TensorBoardServiceImpl implements TensorBoardService {
break; break;
} }
} }
podReady = k8sClientUtil.getPodReady(podName, StringUtils.isEmpty(frameLogPathVo.getNamespace()) ? "default" : frameLogPathVo.getNamespace());
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) { } catch (Exception e) {
return tensorboardStatusVo; return tensorboardStatusVo;
} }
String url = redisService.getCacheObject(podName); String url = redisService.getCacheObject(podName);
tensorboardStatusVo.setStatus(status); tensorboardStatusVo.setStatus(status);
tensorboardStatusVo.setUrl(url); tensorboardStatusVo.setUrl(url);
tensorboardStatusVo.setReady(podReady);
return tensorboardStatusVo; return tensorboardStatusVo;
} }




+ 0
- 2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/PodStatusVo.java View File

@@ -12,6 +12,4 @@ public class PodStatusVo implements Serializable {
private String status; private String status;


private String url; private String url;

private Boolean ready;
} }

Loading…
Cancel
Save