diff --git a/.run/Server-dev.run.xml b/.run/Server-dev.run.xml
new file mode 100644
index 0000000..fb98f5e
--- /dev/null
+++ b/.run/Server-dev.run.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.run/Server-k3s.run.xml b/.run/Server-k3s.run.xml
new file mode 100644
index 0000000..e47d4e0
--- /dev/null
+++ b/.run/Server-k3s.run.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/agent/all-agent-hosts.txt b/agent/all-agent-hosts.txt
index 8d79dfc..bdbe604 100644
--- a/agent/all-agent-hosts.txt
+++ b/agent/all-agent-hosts.txt
@@ -39,4 +39,6 @@
132.145.28.48 London-arm64-02 london-4 l4
# 所有的主机
-Phoenix-amd64-02,Phoenix-arm64-01,Phoenix-arm64-02,London-amd64-01,London-amd64-02,London-arm64-01,London-arm64-02
\ No newline at end of file
+Phoenix-amd64-02,Phoenix-arm64-01,Phoenix-arm64-02,London-amd64-01,London-amd64-02,London-arm64-01,London-arm64-02
+
+Tokyo-amd64-13-6e8a19, Tokyo-amd64-07-f66a41, Phoenix-arm64-01-52c2f4, Phoenix-amd64-02-2a45bb, Phoenix-arm64-02-7b95ac, London-arm64-02-9ee6ba, London-amd64-01-0b219f, London-amd64-02-c155d1, London-arm64-01-72519e
\ No newline at end of file
diff --git a/agent/src/main/resources/bootstrap.yml b/agent/src/main/resources/bootstrap.yml
index 94ec790..e638fa4 100644
--- a/agent/src/main/resources/bootstrap.yml
+++ b/agent/src/main/resources/bootstrap.yml
@@ -19,6 +19,9 @@ spring:
- group: local
data-id: common-local.yaml
+server:
+ port: 8000
+
#debug: true
#logging:
# level:
diff --git a/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java b/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java
index b2e1648..fdb0074 100644
--- a/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java
+++ b/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java
@@ -191,7 +191,7 @@ public class OctopusAgentServiceImpl implements OctopusAgentService {
);
*/
try {
- // 超时等待5秒钟, 或者所有的Agent均已经完成上报
+ // 超时等待5秒钟, 或者所有的Agent均已经完成上报ddo
countDownLatch.await(
5,
TimeUnit.SECONDS
@@ -242,7 +242,6 @@ public class OctopusAgentServiceImpl implements OctopusAgentService {
}
-
@Override
public String shutdownAgentDanger(String agentTopicName) {
@@ -293,11 +292,9 @@ public class OctopusAgentServiceImpl implements OctopusAgentService {
)) {
// 不是当前应用需要的的OM，将信息放置与Cache队列的末尾
- try {
- OCTOPUS_MESSAGE_FROM_AGENT.put(message);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
+
+ OCTOPUS_MESSAGE_FROM_AGENT.offer(message);
+
// 返回,继续死循环
continue;
}
@@ -346,11 +343,9 @@ public class OctopusAgentServiceImpl implements OctopusAgentService {
)) {
// 不是当前应用需要的的OM，将信息放置与Cache队列的末尾
- try {
- OCTOPUS_MESSAGE_FROM_AGENT.put(message);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
+
+ OCTOPUS_MESSAGE_FROM_AGENT.offer(message);
+
// 返回,继续死循环
continue;
}
diff --git a/server/src/main/java/io/wdd/rpc/message/handler/AsyncWaitOMResult.java b/server/src/main/java/io/wdd/rpc/message/handler/AsyncWaitOMResult.java
index ceca3ec..de41ec3 100644
--- a/server/src/main/java/io/wdd/rpc/message/handler/AsyncWaitOMResult.java
+++ b/server/src/main/java/io/wdd/rpc/message/handler/AsyncWaitOMResult.java
@@ -73,6 +73,9 @@ public class AsyncWaitOMResult {
);
if (!REPLAY_CACHE_MAP.containsKey(matchKey)) {
// 没有这个Key,说明等待结果已经超时了,直接丢弃,然后继续循环
+
+ // todo 错误的数据需要放置于某处
+
continue;
}
diff --git a/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandlerServer.java b/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandlerServer.java
index 73ed84d..82ca28a 100644
--- a/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandlerServer.java
+++ b/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandlerServer.java
@@ -13,6 +13,7 @@ import org.springframework.data.redis.core.RedisTemplate;
import javax.annotation.Resource;
import java.io.IOException;
+import java.util.ArrayDeque;
import java.util.concurrent.ArrayBlockingQueue;
@Configuration
@@ -29,9 +30,8 @@ public class OMessageHandlerServer {
* 各个业务模块需要自己手动去获取自己需要的内容
* TODO 数据一致性问题，当AgentShutDown可能有一些信息会消失
*/
- public static ArrayBlockingQueue OCTOPUS_MESSAGE_FROM_AGENT = new ArrayBlockingQueue<>(
- 128,
- true
+ public static ArrayDeque OCTOPUS_MESSAGE_FROM_AGENT = new ArrayDeque<>(
+ 128
);
@Resource
RedisTemplate redisTemplate;
diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java b/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java
index c53f3a6..097c124 100644
--- a/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java
+++ b/server/src/main/java/io/wdd/rpc/scheduler/service/QuartzSchedulerServiceImpl.java
@@ -82,7 +82,7 @@ public class QuartzSchedulerServiceImpl implements QuartzSchedulerService {
futureExecutionResultKey
);
- log.info("[ 定时脚本任务 ] - 新建任务成功, 船舰任务DTO为 => {}", scriptSchedulerDTO);
+ log.info("[ 定时脚本任务 ] - 新建任务成功, 任务DTO为 => {}", scriptSchedulerDTO);
log.info("[ 定时脚本任务 ] - 新建任务成功, 任务内容为 => {}", jobDetail);
// persistent the script scheduled mission
diff --git a/server/src/main/resources/bootstrap.yml b/server/src/main/resources/bootstrap.yml
index c6cd9da..b67c82d 100644
--- a/server/src/main/resources/bootstrap.yml
+++ b/server/src/main/resources/bootstrap.yml
@@ -18,3 +18,6 @@ spring:
extension-configs:
- group: local
data-id: common-local.yaml
+
+server:
+ port: 9999
\ No newline at end of file