test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(任务中心): 修复停止主任务状态更新错误问题 

--bug=1049500 --user=王旭 【任务中心】停止主任务-状态和执行结果更新错误 https://www.tapd.cn/55049933/s/1617099
This commit is contained in:
WangXu10 2024-11-25 19:02:33 +08:00 committed by Craftsman
parent f219e4e437
commit 7f366dd9db
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java
View File

@ -626,7 +626,7 @@ public class BaseTaskHubService {
handleK8STask(taskIds, testResourcePoolDTO); handleK8STask(taskIds, testResourcePoolDTO);
} else { } else {
Map<String, List<ExecTaskItem>> nodeItem = list.stream().collect(Collectors.groupingBy(ExecTaskItem::getResourcePoolNode)); Map<String, List<ExecTaskItem>> nodeItem = list.stream().collect(Collectors.groupingBy(ExecTaskItem::getResourcePoolNode));
handleNodeTask(nodeItem); handleNodeTask(nodeItem, false);
} }
} catch (Exception e) { } catch (Exception e) {
LogUtils.error(e); LogUtils.error(e);
@ -634,15 +634,24 @@ public class BaseTaskHubService {
}); });
} }
private void handleNodeTask(Map<String, List<ExecTaskItem>> nodeItem) { private void handleNodeTask(Map<String, List<ExecTaskItem>> nodeItem, boolean isItem) {
//通过任务向节点发起停止 //通过任务向节点发起停止
nodeItem.forEach((node, items) -> { nodeItem.forEach((node, items) -> {
String endpoint = "http://".concat(node); String endpoint = "http://".concat(node);
List<String> itemIds = items.stream().map(ExecTaskItem::getId).toList(); List<String> itemIds = new ArrayList<>();
if (isItem) {
itemIds = items.stream().map(ExecTaskItem::getId).toList();
} else {
itemIds = items.stream().map(ExecTaskItem::getTaskId).toList();
}
SubListUtils.dealForSubList(itemIds, 100, subList -> { SubListUtils.dealForSubList(itemIds, 100, subList -> {
try { try {
LogUtils.info(String.format("开始发送停止请求到 %s 节点执行", endpoint), subList.toString()); LogUtils.info(String.format("开始发送停止请求到 %s 节点执行", endpoint), subList.toString());
MsHttpClient.stopApiTaskItem(endpoint, subList); if (isItem) {
MsHttpClient.stopApiTaskItem(endpoint, subList);
} else {
MsHttpClient.stopApiTask(endpoint, subList);
}
} catch (Exception e) { } catch (Exception e) {
} }
}); });
@ -743,7 +752,7 @@ public class BaseTaskHubService {
handleK8STaskItem(itemIds, testResourcePoolDTO); handleK8STaskItem(itemIds, testResourcePoolDTO);
} else { } else {
Map<String, List<ExecTaskItem>> nodeItem = execTaskItems.stream().collect(Collectors.groupingBy(ExecTaskItem::getResourcePoolNode)); Map<String, List<ExecTaskItem>> nodeItem = execTaskItems.stream().collect(Collectors.groupingBy(ExecTaskItem::getResourcePoolNode));
handleNodeTask(nodeItem); handleNodeTask(nodeItem, true);
} }
} catch (Exception e) { } catch (Exception e) {
LogUtils.error(e); LogUtils.error(e);