From 511cfd97f617662bc474ecf835cf7bc46ee8f0e8 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Sat, 25 Feb 2023 17:02:21 +0800 Subject: [PATCH] =?UTF-8?q?[agent][executor]-=20=E4=BC=98=E5=8C=96command?= =?UTF-8?q?=20executor=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../initialization/bootup/OctopusAgentInitService.java | 7 +++++-- .../main/java/io/wdd/rpc/init/ServerCacheAgentStatus.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/agent/src/main/java/io/wdd/agent/initialization/bootup/OctopusAgentInitService.java b/agent/src/main/java/io/wdd/agent/initialization/bootup/OctopusAgentInitService.java index 527d61c..e7d90c3 100644 --- a/agent/src/main/java/io/wdd/agent/initialization/bootup/OctopusAgentInitService.java +++ b/agent/src/main/java/io/wdd/agent/initialization/bootup/OctopusAgentInitService.java @@ -71,15 +71,18 @@ public class OctopusAgentInitService { ) public void ReceiveInitInfoFromServer(Message message, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) { + OctopusMessage octopusMessage; try { - OctopusMessage octopusMessage = objectMapper.readValue(message.getBody(), OctopusMessage.class); + octopusMessage = objectMapper.readValue(message.getBody(), OctopusMessage.class); // consider the multi-agents register situation // judge the machineID begin String[] split = octopusMessage.getUuid().split("-"); if (!agentServerInfo.getMachineId().startsWith(split[split.length - 1])) { - throw new MyRuntimeException("INIT Message not for this agent !"); + String s = "INIT Message not for this agent !"; + log.error(s); + throw new MyRuntimeException(s); } // response chain to handle all kind of type of octopus message diff --git a/server/src/main/java/io/wdd/rpc/init/ServerCacheAgentStatus.java b/server/src/main/java/io/wdd/rpc/init/ServerCacheAgentStatus.java index fe791c6..23496c7 100644 --- a/server/src/main/java/io/wdd/rpc/init/ServerCacheAgentStatus.java +++ b/server/src/main/java/io/wdd/rpc/init/ServerCacheAgentStatus.java @@ -203,7 +203,7 @@ public class ServerCacheAgentStatus { // Trigger调用Agent Metric 任务 ArrayList allHealthyAgentTopicNames = new ArrayList<>(32); for (int i = 0; i < statusList.size(); i++) { - if (statusList + if (null !=statusList.get(i) && statusList .get(i) .equals("1")) { allHealthyAgentTopicNames.add(ALL_AGENT_TOPIC_NAME_LIST.get(i));