|
@@ -66,7 +66,7 @@ public class TaskApplicationService {
|
|
public void state(String taskId, String state, String podName) {
|
|
public void state(String taskId, String state, String podName) {
|
|
TaskEntity taskEntity = simulationManualProjectTaskMapper.selectById(taskId);
|
|
TaskEntity taskEntity = simulationManualProjectTaskMapper.selectById(taskId);
|
|
if (taskEntity == null) {
|
|
if (taskEntity == null) {
|
|
- log.debug("收到不存在的任务的状态消息:" + taskId);
|
|
|
|
|
|
+ log.info("收到不存在的任务的状态消息:" + taskId);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
String projectId = taskEntity.getPId(); // 项目 id
|
|
String projectId = taskEntity.getPId(); // 项目 id
|
|
@@ -118,6 +118,7 @@ public class TaskApplicationService {
|
|
} else if (DictConstants.TASK_TERMINATED.equals(state)) {
|
|
} else if (DictConstants.TASK_TERMINATED.equals(state)) {
|
|
simulationManualProjectTaskMapper.updateFailStateWithStopTime(taskId, state, TimeUtil.getNowForMysql(), DictConstants.TASK_ERROR_REASON_3);
|
|
simulationManualProjectTaskMapper.updateFailStateWithStopTime(taskId, state, TimeUtil.getNowForMysql(), DictConstants.TASK_ERROR_REASON_3);
|
|
} else if (DictConstants.TASK_ANALYSIS.equals(state)) { // 该状态只会获得一次
|
|
} else if (DictConstants.TASK_ANALYSIS.equals(state)) { // 该状态只会获得一次
|
|
|
|
+ log.info("任务 {} 的状态为 {} ,pod 名称为 {}", taskId, state, podName);
|
|
simulationManualProjectTaskMapper.updateSuccessStateWithStopTime(taskId, state, TimeUtil.getNowForMysql());
|
|
simulationManualProjectTaskMapper.updateSuccessStateWithStopTime(taskId, state, TimeUtil.getNowForMysql());
|
|
// 查询项目是否使用 CPU 生成视频
|
|
// 查询项目是否使用 CPU 生成视频
|
|
if (DictConstants.VIDEO_CPU.equals(isChoiceGpu)) {
|
|
if (DictConstants.VIDEO_CPU.equals(isChoiceGpu)) {
|
|
@@ -141,6 +142,7 @@ public class TaskApplicationService {
|
|
// -------------------------------- 判断项目是否结束 --------------------------------
|
|
// -------------------------------- 判断项目是否结束 --------------------------------
|
|
isCompleted = projectDomainService.complete(redisPrefix, projectId);
|
|
isCompleted = projectDomainService.complete(redisPrefix, projectId);
|
|
if (isCompleted) {
|
|
if (isCompleted) {
|
|
|
|
+ log.info("项目 " + projectId + " 已完成。");
|
|
//如果项目已完成先把 pod 删除,并归还并行度
|
|
//如果项目已完成先把 pod 删除,并归还并行度
|
|
KubernetesUtil.deletePod2(apiClient, kubernetesConfiguration.getNamespace(), podName);
|
|
KubernetesUtil.deletePod2(apiClient, kubernetesConfiguration.getNamespace(), podName);
|
|
projectDomainService.incrementOneParallelism(isChoiceGpu, nodeName);
|
|
projectDomainService.incrementOneParallelism(isChoiceGpu, nodeName);
|