zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ Agent ] [ Executor ] - fix bugs

Browse Source
This commit is contained in:
zeaslity
2023-10-24 11:27:20 +08:00
parent 8080314d9b
commit 4afb62f7cf
10 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent-go/AgentInitialization.go
View File

@@ -46,7 +46,7 @@ func INIT(agentServerInfoConf string) chan bool {
initToServerQueue := &rabbitmq.RabbitQueue{
RabbitProp: initToServerProp,
}
defer initToServerQueue.Close()
//defer initToServerQueue.Close()
// 建立连接
initToServerQueue.Connect()

2
server/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.2</version>
<version>3.5.4</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->

16
server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java
View File

@@ -4,6 +4,7 @@ import io.wdd.func.auto.beans.BaseFunctionEnum;
import io.wdd.func.auto.beans.ProjectDeployContext;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.List;
@@ -47,21 +48,24 @@ public class BaseFuncScheduler {
.getMasterNode()
.getTopicName();
if (!MasterNodeProcedure(masterTopicName)) {
log.error("初始化过程错误! 即将终止!");
}
if (!CollectionUtils.isEmpty(projectDeployContext
.getAgentNodeList())) {
List<String> agentTopicNameList = projectDeployContext
.getAgentNodeList()
.stream()
.map(agentNode -> agentNode.getTopicName())
.collect(Collectors.toList());
if (!MasterNodeProcedure(masterTopicName)) {
log.error("初始化过程错误! 即将终止!");
}
if (!AgentNodeProcedure(agentTopicNameList)) {
log.error("初始化过程错误! 即将终止!");
}
}
log.info("初始化过程完成!");
}

3
server/src/main/java/io/wdd/func/auto/service/FuncServiceImpl.java
View File

@@ -85,6 +85,9 @@ public class FuncServiceImpl implements FuncService {
private List<String> syncCallFunction(String agentTopicName, ExecutionMessageType emType, String funcName, List<String> funcArgs) {
// 重新构造内容，增加Function Name
if (CollectionUtils.isEmpty(funcArgs)) {
funcArgs = new ArrayList<>();
}
funcArgs.add(
0,
funcName

2
server/src/main/java/io/wdd/func/xray/service/XrayCoreServiceImpl.java
View File

@@ -20,7 +20,6 @@ import io.wdd.func.xray.persisit.XrayOssOperator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
@@ -61,7 +60,6 @@ public class XrayCoreServiceImpl implements XrayCoreService {
* @param allNetworkPathList
* @return
*/
@NotNull
private static Set<ProxyNode> getAllProxyNodeSet(List<List<ProxyNode>> allNetworkPathList, boolean includeSubscribeNode) {
// 拿到所有的proxyNode
Set<ProxyNode> proxyNodeSet = allNetworkPathList

7
server/src/main/java/io/wdd/rpc/execute/service/ExecutionServiceImpl.java
View File

@@ -9,6 +9,7 @@ import io.wdd.rpc.message.sender.OMessageToAgentSender;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -49,6 +50,7 @@ public class ExecutionServiceImpl implements ExecutionService {
ExecutionMessage executionMessage = this
.generateExecutionMessage(
executionType,
funcContent,
pipeLineCommand,
commandList,
commandListComplete,
@@ -89,7 +91,7 @@ public class ExecutionServiceImpl implements ExecutionService {
// 2023年10月8日 根据执行的命令数量设定超时等待时间
int commandMaxWaitTimeout = COMMAND_MAX_WAIT_TIMEOUT;
if (commandListComplete.size() > 0) {
if (!CollectionUtils.isEmpty(commandListComplete)) {
commandMaxWaitTimeout = COMMAND_MAX_WAIT_TIMEOUT * commandListComplete.size();
}
@@ -137,11 +139,12 @@ public class ExecutionServiceImpl implements ExecutionService {
.build();
}
private ExecutionMessage generateExecutionMessage(String executionType, List<List<String>> pipeLineCommand, List<String> commandList, List<List<String>> commandListComplete, boolean needResultReplay, boolean durationTask) {
private ExecutionMessage generateExecutionMessage(String executionType, List<String> funcContent, List<List<String>> pipeLineCommand, List<String> commandList, List<List<String>> commandListComplete, boolean needResultReplay, boolean durationTask) {
return ExecutionMessage
.builder()
.executionType(executionType)
.funcContent(funcContent)
.singleLineCommand(commandList)
.multiLineCommand(commandListComplete)
.pipeLineCommand(pipeLineCommand)

6
server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java
View File

@@ -55,7 +55,9 @@ public class AcceptAgentInitInfo {
"LosAngeles",
7,
"Beijing",
8
8,
"Paripark",
9
)
);
public static Set<String> ALL_SERVER_ARCH_INFO = new HashSet<>(
@@ -288,7 +290,7 @@ public class AcceptAgentInitInfo {
String[] split = serverName.split("-");
if (split.length <= 2 || !ALL_SERVER_CITY_INDEX.containsKey(split[0]) || !ALL_SERVER_ARCH_INFO.contains(split[1])) {
log.error(
"server info from agent are {}",
"city are not validated from agent are {}",
serverInfoVO
);
throw new MyRuntimeException("server name not validated !");

2
server/src/main/java/io/wdd/server/beans/po/ServerInfoPO.java
View File

@@ -19,7 +19,7 @@ public class ServerInfoPO implements Serializable {
/**
* server primary key
*/
@TableId(value = "server_id", type = IdType.AUTO)
@TableId(value = "server_id", type = IdType.ASSIGN_ID)
private Long serverId;
/**

2
server/src/main/java/io/wdd/server/coreService/impl/CoreServerServiceImpl.java
View File

@@ -190,7 +190,7 @@ public class CoreServerServiceImpl implements CoreServerService {
)
.one();
if (po == null) {
if (po != null) {
// 已经存在，需要把更新的信息 复制到旧的内容之上
copyProperties(
serverInfoVO,

8
server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java
View File

@@ -5,7 +5,7 @@ import io.wdd.func.auto.service.BaseFuncScheduler;
import io.wdd.server.beans.po.ServerInfoPO;
import io.wdd.server.beans.request.ServerQueryEntity;
import io.wdd.server.coreService.CoreServerService;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import javax.annotation.Resource;
@@ -13,14 +13,12 @@ import javax.annotation.Resource;
@SpringBootTest
public class TestBaseFuncScheduler {
@Resource
BaseFuncScheduler baseFuncScheduler;
@Resource
CoreServerService serverService;
@Test
public void testRunProcedure() {
@@ -29,12 +27,14 @@ public class TestBaseFuncScheduler {
projectDeployContext.setProjectId(1716372290994155522L);
ServerQueryEntity serverQueryEntity = new ServerQueryEntity();
serverQueryEntity.setServerName("Osaka");
serverQueryEntity.setServerName("Paripark");
ServerInfoPO serverInfoPO = serverService
.serverGetByPage(serverQueryEntity)
.getRecords()
.get(0);
System.out.println("serverInfoPO = " + serverInfoPO);
projectDeployContext.setMasterNode(serverInfoPO);