Browse Source

fix:开发环境数据集模型挂载路径修复

pull/106/head
西大锐 1 year ago
parent
commit
53b59fd26f
3 changed files with 9 additions and 4 deletions
  1. +6
    -3
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java
  2. +1
    -0
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/AIM64EncoderUtil.java
  3. +2
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MlflowUtil.java

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

@@ -73,6 +73,7 @@ public class JupyterServiceImpl implements JupyterService {
V1PersistentVolumeClaim pvc = k8sClientUtil.createPvc(namespace, pvcName, storage,storageClassName); V1PersistentVolumeClaim pvc = k8sClientUtil.createPvc(namespace, pvcName, storage,storageClassName);
Integer podPort = k8sClientUtil.createPod(podName, namespace, port, mountPath, pvc, image); Integer podPort = k8sClientUtil.createPod(podName, namespace, port, mountPath, pvc, image);
return masterIp + ":" + podPort; return masterIp + ":" + podPort;

} }


@Override @Override
@@ -84,12 +85,13 @@ public class JupyterServiceImpl implements JupyterService {


// 提取数据集,模型信息,得到数据集模型的path // 提取数据集,模型信息,得到数据集模型的path
Map<String, Object> dataset = JacksonUtil.parseJSONStr2Map(devEnvironment.getDataset()); Map<String, Object> dataset = JacksonUtil.parseJSONStr2Map(devEnvironment.getDataset());
String datasetPath = (String) dataset.get("path");
String datasetPath = "argo-workflow" + dataset.get("path");

Map<String, Object> model = JacksonUtil.parseJSONStr2Map(devEnvironment.getModel()); Map<String, Object> model = JacksonUtil.parseJSONStr2Map(devEnvironment.getModel());
String modelPath = (String) model.get("path");
String modelPath = "argo-workflow" + model.get("path");


LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
//手动构造pod名称
//构造pod名称
String podName = loginUser.getUsername().toLowerCase() +"-editor-pod" + "-" + id; String podName = loginUser.getUsername().toLowerCase() +"-editor-pod" + "-" + id;
String pvcName = loginUser.getUsername().toLowerCase() + "-editor-pvc"; String pvcName = loginUser.getUsername().toLowerCase() + "-editor-pvc";
//新建编辑器的pvc //新建编辑器的pvc
@@ -109,6 +111,7 @@ public class JupyterServiceImpl implements JupyterService {


} }



@Override @Override
public String stopJupyterService(Integer id) throws Exception { public String stopJupyterService(Integer id) throws Exception {
DevEnvironment devEnvironment = this.devEnvironmentDao.queryById(id); DevEnvironment devEnvironment = this.devEnvironmentDao.queryById(id);


+ 1
- 0
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/AIM64EncoderUtil.java View File

@@ -104,5 +104,6 @@ public class AIM64EncoderUtil {
String searchQuery = encode(map, false); String searchQuery = encode(map, false);
// 返回查询字符串 // 返回查询字符串
return searchQuery; return searchQuery;

} }
} }

+ 2
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MlflowUtil.java View File

@@ -7,7 +7,8 @@ import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;


@Component @Component
public class MlflowUtil {
public class
MlflowUtil {
private static String trackingUri = "http://172.20.32.181:32005"; private static String trackingUri = "http://172.20.32.181:32005";
private MlflowClient client; private MlflowClient client;




Loading…
Cancel
Save