Merge remote-tracking branch 'origin/20240522-saq-fix'

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

@@ -244,6 +244,11 @@ public class TaskApplicationService {
                 // 进行三次重试
                 int multiTaskRetryTimes = taskDomainService.getMultiTaskRetryTimes(taskId);
                 if (multiTaskRetryTimes < 3){
+                    try {
+                        KubernetesUtil.deletePod2(apiClient, kubernetesConfiguration.getMultiNamespace(), podName);
+                    }catch (Exception e){
+                        log.info("删除pod失败,projectId:{},taskId:{}",taskEntity.getProjectId(),taskId, e);
+                    }
                     String taskBody = taskEntity.getTaskBody();
                     SendResult<String, String> stringStringSendResult = kafkaTemplate.send(taskEntity.getProjectId(), 0,
                         taskId, taskBody).get();
@@ -255,7 +260,7 @@ public class TaskApplicationService {
                     String yamlRedisKeyCache = "multi_yaml_cache_project_" + taskEntity.getProjectId()+"_scene_" + taskEntity.getSceneId();
                     String s = stringRedisTemplate.opsForValue().get(yamlRedisKeyCache);
                     if (!StringUtil.isEmpty(s)){
-                        projectDomainService.createMultiPodBeginByYaml(s);
+                        projectDomainService.createMultiPodBeginByYaml(multiPodYamlDirectory + "multi/" + s);
                         taskDomainService.setMultiTaskRetryTimes(taskId, multiTaskRetryTimes + 1);
                         return;
                     }else {