mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

引擎逻辑修改

Browse Source
This commit is contained in:
even 2025-05-30 12:53:21 +08:00
parent 00a172715f
commit 82f1aaa72f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/config/ExecutorConfig.java
View File

@ -13,7 +13,7 @@ public class ExecutorConfig {
@Bean("parallelExecutor") @Bean("parallelExecutor")
public ThreadPoolTaskExecutor pipelineExecutor() { public ThreadPoolTaskExecutor pipelineExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(5); executor.setCorePoolSize(10);
executor.setMaxPoolSize(10); executor.setMaxPoolSize(10);
executor.setQueueCapacity(100); executor.setQueueCapacity(100);
executor.setThreadNamePrefix("Parallel-"); executor.setThreadNamePrefix("Parallel-");
@ -25,7 +25,7 @@ public class ExecutorConfig {
@Bean("serialExecutor") @Bean("serialExecutor")
public ThreadPoolTaskExecutor serialExecutor() { public ThreadPoolTaskExecutor serialExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(5); executor.setCorePoolSize(10);
executor.setMaxPoolSize(10); executor.setMaxPoolSize(10);
executor.setQueueCapacity(100); executor.setQueueCapacity(100);
executor.setThreadNamePrefix("Serial-"); executor.setThreadNamePrefix("Serial-");
@ -37,7 +37,7 @@ public class ExecutorConfig {
@Bean("workerExecutor") @Bean("workerExecutor")
public ThreadPoolTaskExecutor workerExecutor() { public ThreadPoolTaskExecutor workerExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(5); executor.setCorePoolSize(10);
executor.setMaxPoolSize(10); executor.setMaxPoolSize(10);
executor.setQueueCapacity(100); executor.setQueueCapacity(100);
executor.setThreadNamePrefix("Worker-"); executor.setThreadNamePrefix("Worker-");

8
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/ParallelDispatcher.java
View File

@ -61,10 +61,10 @@ public class ParallelDispatcher implements BaseDispatcher{
latch.await(); latch.await();
// TODO 检查是否全部执行成功 ，目前没有逻辑就是忽略错误 // TODO 检查是否全部执行成功 ，目前没有逻辑就是忽略错误
// 当前执行失败 // 当前执行失败
while (pipelineRunContext.getState().get() != ContextStateEnum.RUNNING.getCode()) { // while (pipelineRunContext.getState().get() != ContextStateEnum.RUNNING.getCode()) {
// 想办法借助工具类 或者直接wait // // 想办法借助工具类 或者直接wait
pipelineRunContext.pause(); // pipelineRunContext.pause();
} // }
} }
} }
@Override @Override

2
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/dispatcher/impl/SerialDispatcher.java
View File

@ -51,7 +51,7 @@ public class SerialDispatcher implements BaseDispatcher {
AtomicInteger state = taskRunContext.getState(); AtomicInteger state = taskRunContext.getState();
// 如果不为正常执行成功就暂时阻塞直到有状态更改 // 如果不为正常执行成功就暂时阻塞直到有状态更改
while (state.get() != ContextStateEnum.HAPPY_ENDING.getCode() while (state.get() != ContextStateEnum.HAPPY_ENDING.getCode()
// && state.get() != ContextStateEnum.BAD_ENDING.getCode() && state.get() != ContextStateEnum.BAD_ENDING.getCode()
) { ) {
// Thread.sleep(1000L); // Thread.sleep(1000L);
taskRunContext.pause(); taskRunContext.pause();

2
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestCaseGenerationWorker.java
View File

@ -43,7 +43,7 @@ public class TestCaseGenerationWorker extends SshWorker {
//获取机器 //获取机器
MachineInfo machineInfoDO = this.getMachineInfoService().getById(machineId); MachineInfo machineInfoDO = this.getMachineInfoService().getById(machineId);
statusCode = shell(machineInfoDO, null, context, statusCode = shell(machineInfoDO, CryptogramUtil.doDecrypt(machineInfoDO.getPassword()), context,
"echo \"自定义镜像执行命令\"", "echo \"自定义镜像执行命令\"",
commandScript commandScript
); );