mlx

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/consumer/ProjectConsumer.java

@@ -87,7 +87,7 @@ public class ProjectConsumer {
      *
      * @param projectRecord 项目启动消息
      */
-    @KafkaListener(groupId = "simulation-resource-scheduler", topics = "${scheduler.manual-project.topic}")
+    @KafkaListener(groupId = "simulation-resource-scheduler", topics = "${scheduler.start-topic}")
     @SneakyThrows
     public void cacheManualProject(ConsumerRecord<String, String> projectRecord) {
         String projectJson = projectRecord.value();
@@ -232,7 +232,7 @@ public class ProjectConsumer {
         client.stop();
     }
 
-//    @KafkaListener(groupId = "simulation-resource-scheduler", topics = "${scheduler.manual-project.stop-topic}")
+//    @KafkaListener(groupId = "simulation-resource-scheduler", topics = "${scheduler.stop-topic}")
 //    @SneakyThrows
 //    public void stopManualProject(ConsumerRecord<String, String> stopRecord) {
 //        log.info("ProjectConsumer--stopManualProject 接收到的项目终止消息为：" + stopRecord);

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/ManualProjectService.java

@@ -34,15 +34,15 @@ public class ManualProjectService {
 
     @Value("${scheduler.minio-path.project-result}")
     String projectResultPathOfMinio;
-    @Value("${scheduler.linux-temp-path}")
+    @Value("${scheduler.linux-path.temp}")
     String linuxTempPath;
     @Value("${minio.bucket-name}")
     String bucketName;
-    @Value("${scheduler.score.hostname}")
+    @Value("${scheduler.host.hostname}")
     String hostname;
-    @Value("${scheduler.score.username}")
+    @Value("${scheduler.host.username}")
     String username;
-    @Value("${scheduler.score.password}")
+    @Value("${scheduler.host.password}")
     String password;
 
     // -------------------------------- Comment --------------------------------

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/util/ProjectUtil.java

@@ -88,7 +88,7 @@ public class ProjectUtil {
         String clusterWaitingPrefix = clusterPrefix + ":waiting";
         String projectRunningKey = clusterRunningPrefix + ":" + projectId;
         String projectWaitingKey = clusterWaitingPrefix + ":" + projectId;
-        String projectCheckKey = clusterWaitingPrefix + ":" + projectId + ":check";
+        String projectCheckKey = projectRunningKey + ":check";
 
         return PrefixTO.builder()
                 .clusterPrefix(clusterPrefix)