mlx

api-common/src/main/java/api/common/util/SshUtil.java

@@ -49,9 +49,9 @@ public class SshUtil {
      */
     public static ClientSession getSession(SshClient sshClient, String hostname, String username, String password) throws IOException {
         sshClient.start();
-        ClientSession session = sshClient.connect(username, hostname, port).verify(10000).getSession();
+        ClientSession session = sshClient.connect(username, hostname, port).verify(3600000).getSession();
         session.addPasswordIdentity(password);
-        AuthFuture verify = session.auth().verify(10000);
+        AuthFuture verify = session.auth().verify(3600000);
         if (verify.isFailure()) {
             throw new RuntimeException("------- ssh 用户名密码验证失败！");
         }

simulation-resource-common/src/main/java/com/css/simulation/resource/common/util/MinioUtil.java

@@ -18,7 +18,9 @@ import java.io.InputStream;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class MinioUtil {
 
@@ -44,7 +46,7 @@ public class MinioUtil {
                         .prefix(prefix)
                         .build()
         );
-        List<String> result = new ArrayList<>();
+        Set<String> result = new HashSet<>();
         for (Result<Item> next : objects) {
             Item item = next.get();
             String objectName = item.objectName();
@@ -53,7 +55,7 @@ public class MinioUtil {
             result.add(prefix + split[0]);
         }
 
-        return result;
+        return new ArrayList<>(result);
     }
 
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/scheduler/TickScheduler.java

@@ -63,7 +63,8 @@ public class TickScheduler {
                     String podName = redisTemplate.opsForValue().get("podName:" + taskId);
                     String podDeleteCommand = "kubectl delete pod " + podName;
                     if (podName != null) {
-                        log.info("TickScheduler--tick 修改任务 " + taskId + "已超时，状态修改为 Aborted，pod 名称为：" + podName + "，并执行删除 pod 命令：" + podDeleteCommand);
+                        log.info("TickScheduler--tick 修改任务 " + taskId + "已超时，状态修改为 Aborted，pod 名称为：" + podName
+                                + "，并执行删除 pod 命令：" + podDeleteCommand);
                         SshUtil.execute(session, podDeleteCommand);
 //            taskManager.updateFailStateWithStopTime(taskId, state, TimeUtil.getNowForMysql()); // 如果任务 abort 代表项目失败
                         taskMapper.updateFailStateWithStopTime(taskId, DictConstants.TASK_ABORTED, TimeUtil.getNowForMysql());

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

@@ -116,7 +116,8 @@ public class TaskService {
             log.info("TaskService--state 修改任务 " + taskId + "的状态为 Running，pod 名称为：" + podName);
             taskMapper.updateStateWithStartTime(taskId, state, TimeUtil.getNowForMysql());
         } else if ("Aborted".equals(state)) {
-            log.info("TaskService--state 修改任务 " + taskId + "的状态为 Aborted，pod 名称为：" + podName + "，并执行删除 pod 命令：" + podDeleteCommand);
+            log.info("TaskService--state 修改任务 " + taskId + "的状态为 Aborted，pod 名称为：" + podName
+                    + "，并执行删除 pod 命令：" + podDeleteCommand);
             SshUtil.execute(session, podDeleteCommand);
 //            taskManager.updateFailStateWithStopTime(taskId, state, TimeUtil.getNowForMysql()); // 如果任务 abort 代表项目失败
             taskMapper.updateFailStateWithStopTime(taskId, state, TimeUtil.getNowForMysql());
@@ -138,7 +139,6 @@ public class TaskService {
 //                }
 //            }
 //            String errorMessageString = errorMessage.get();
-            return;
         } else if ("Terminated".equals(state)) {
             log.info("TaskService--state 修改任务 " + taskId + "的状态为 Terminated，pod 名称为：" + podName
                     + "，并执行删除 pod 命令：" + podDeleteCommand);