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

[ server] [ agent ] - 版本信息全流程-完成

Browse Source
This commit is contained in:
zeaslity
2023-02-08 17:32:02 +08:00
parent 1ad81e41c9
commit 8231dd21e4
4 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/java/io/wdd/common/utils/TimeUtils.java
View File

@@ -70,6 +70,21 @@ public class TimeUtils {
return LocalDateTime.now(SYSTEM_TIME_ZONE_ID);
}
/**
* @return 格式化 去掉时间中的毫秒数
*/
public static LocalDateTime currentFormatTime() {
DateTimeFormatter ofPattern = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String format = LocalDateTime
.now(SYSTEM_TIME_ZONE_ID)
.format(ofPattern);
return LocalDateTime.parse(format, ofPattern);
}
public static LocalDateTime cvFromDate(Date date) {
// fix bug

121
server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java
View File

@@ -25,7 +25,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static io.wdd.rpc.init.ServerBootUpEnvironment.ALL_AGENT_TOPIC_NAME_LIST;
import static io.wdd.rpc.init.ServerBootUpEnvironment.ALL_HEALTHY_AGENT_TOPIC_NAME_LIST;
import static io.wdd.rpc.message.handler.OctopusMessageHandler.AGENT_LATEST_VERSION;
import static io.wdd.rpc.message.handler.OctopusMessageHandler.OCTOPUS_MESSAGE_FROM_AGENT;
@@ -57,25 +56,34 @@ public class OctopusAgentServiceImpl implements OctopusAgentService {
// 发送OctopusMessage-Agent
// 从OctopusToServer中收集到所有Agent的版本信息
// 组装信息至集合中
LocalDateTime currentTime = TimeUtils.currentTime();
LocalDateTime currentTime = TimeUtils.currentFormatTime();
buildAndSendToAllAgent(
AgentOperationType.VERSION,
currentTime
);
waitCollectAllAgentVersionInfo(
CountDownLatch countDownLatch = new CountDownLatch(ALL_HEALTHY_AGENT_TOPIC_NAME_LIST.size());
CompletableFuture<Void> getAllAgentVersionInfoFuture = waitCollectAllAgentVersionInfo(
result,
currentTime
currentTime,
countDownLatch
);
try {
TimeUnit.SECONDS.sleep(5);
// 超时等待5秒钟, 或者所有的Agent均已经完成上报
countDownLatch.await(
5,
TimeUnit.SECONDS
);
} catch (InterruptedException e) {
throw new RuntimeException(e);
log.warn("存在部分Agent没有上报 版本信息！");
} finally {
// 必须关闭释放线程
getAllAgentVersionInfoFuture.cancel(true);
}
System.out.println("result = " + result);
return result;
}
@@ -101,63 +109,56 @@ public class OctopusAgentServiceImpl implements OctopusAgentService {
return null;
}
private void waitCollectAllAgentVersionInfo(HashMap<String, String> result, LocalDateTime startTime) {
private CompletableFuture<Void> waitCollectAllAgentVersionInfo(HashMap<String, String> result, LocalDateTime startTime, CountDownLatch countDownLatch) {
CompletableFuture<Void> getAllAgentVersionInfo = new CompletableFuture<>();
try {
ExecutorService pool = ServerCommonPool.pool;
CountDownLatch countDownLatch = new CountDownLatch(ALL_HEALTHY_AGENT_TOPIC_NAME_LIST.size());
ExecutorService pool = ServerCommonPool.pool;
// 从OCTOPUS_MESSAGE_FROM_AGENT中获取符合条件的信息
getAllAgentVersionInfo = CompletableFuture.runAsync(
() -> {
while (true) {
if (OCTOPUS_MESSAGE_FROM_AGENT.isEmpty()) {
// 开始收集等待 200ms
try {
TimeUnit.MILLISECONDS.sleep(50);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 从OCTOPUS_MESSAGE_FROM_AGENT中获取符合条件的信息
return CompletableFuture.runAsync(
() -> {
while (true) {
if (OCTOPUS_MESSAGE_FROM_AGENT.isEmpty()) {
// 开始收集等待 200ms
try {
TimeUnit.MILLISECONDS.sleep(50);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
OctopusMessage message = OCTOPUS_MESSAGE_FROM_AGENT.poll();
// 获取到OM
// 判断信息是否是需要的类型
// 根据 init_time + OctopusMessageType + AgentOperationMessage
if (!judgyIsCurrentServerReplyMessage(
message,
startTime
)) {
// 不是当前应用需要的的OM，将信息放置与Cache队列的末尾
try {
OCTOPUS_MESSAGE_FROM_AGENT.put(message);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
return;
}
// 是当前需要的消息信息
result.put(
message.getUuid(),
(String) message.getResult()
);
// 返回,继续死循环
continue;
}
},
pool
);
// 超时等待5秒钟
countDownLatch.await(
5,
TimeUnit.SECONDS
);
} catch (InterruptedException e) {
log.warn("存在部分Agent没有上报 版本信息！");
getAllAgentVersionInfo.cancel(true);
}
OctopusMessage message = OCTOPUS_MESSAGE_FROM_AGENT.poll();
// 获取到OM
// 判断信息是否是需要的类型
// 根据 init_time + OctopusMessageType + AgentOperationMessage
if (!judgyIsCurrentServerReplyMessage(
message,
startTime
)) {
// 不是当前应用需要的的OM，将信息放置与Cache队列的末尾
try {
OCTOPUS_MESSAGE_FROM_AGENT.put(message);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// 返回,继续死循环
continue;
}
// 是当前需要的消息信息
result.put(
message.getUuid(),
(String) message.getResult()
);
countDownLatch.countDown();
}
},
pool
);
}

2
server/src/main/java/io/wdd/rpc/message/handler/OctopusMessageHandler.java
View File

@@ -83,7 +83,7 @@ public class OctopusMessageHandler {
// todo what to do after received the result
log.debug("cache the octopus message to inner cache list !");
OCTOPUS_MESSAGE_FROM_AGENT.add(octopusMessage);
OCTOPUS_MESSAGE_FROM_AGENT.offer(octopusMessage);
// collect all message from agent and log to somewhere

1
server/src/main/java/io/wdd/server/config/ServerCommonPool.java
View File

@@ -8,7 +8,6 @@ public class ServerCommonPool {
public static ExecutorService pool;
static {
ThreadFactory threadFactory = new ThreadFactoryBuilder()