third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: optimize ServerElectionService

Browse Source
This commit is contained in:
tjq 2023-01-22 10:36:22 +08:00
parent 17b842a2a2
commit 63a5e2b458
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
powerjob-server/powerjob-server-remote/src/main/java/tech/powerjob/server/remote/server/election/ServerElectionService.java
View File

@ -56,10 +56,12 @@ public class ServerElectionService {
public String elect(ServerDiscoveryRequest request) { public String elect(ServerDiscoveryRequest request) {
if (!accurate()) { if (!accurate()) {
final String currentServer = request.getCurrentServer();
// 如果是本机，就不需要查数据库那么复杂的操作了，直接返回成功 // 如果是本机，就不需要查数据库那么复杂的操作了，直接返回成功
Optional<ProtocolInfo> localProtocolInfoOpt = Optional.ofNullable(transportService.allProtocols().get(request.getProtocol())); Optional<ProtocolInfo> localProtocolInfoOpt = Optional.ofNullable(transportService.allProtocols().get(request.getProtocol()));
if (localProtocolInfoOpt.isPresent() && localProtocolInfoOpt.get().getAddress().equals(request.getCurrentServer())) { if (localProtocolInfoOpt.isPresent() && localProtocolInfoOpt.get().getAddress().equals(currentServer)) {
return request.getCurrentServer(); log.debug("[ServerElectionService] this server[{}] is worker's current server, skip check", currentServer);
return currentServer;
} }
} }
return getServer0(request); return getServer0(request);
@ -149,12 +151,15 @@ public class ServerElectionService {
.toCompletableFuture() .toCompletableFuture()
.get(PING_TIMEOUT_MS, TimeUnit.MILLISECONDS); .get(PING_TIMEOUT_MS, TimeUnit.MILLISECONDS);
if (response.isSuccess()) { if (response.isSuccess()) {
log.info("[ServerElection] server[{}] is active, it will be the master.", serverAddress);
// 检测通过的是远程 server 的暴露地址，需要返回 worker 需要的协议地址 // 检测通过的是远程 server 的暴露地址，需要返回 worker 需要的协议地址
final JSONObject protocolInfo = JsonUtils.parseObject(response.getData(), JSONObject.class).getJSONObject(protocol); final JSONObject protocolInfo = JsonUtils.parseObject(response.getData(), JSONObject.class).getJSONObject(protocol);
if (protocolInfo != null) { if (protocolInfo != null) {
downServerCache.remove(serverAddress); downServerCache.remove(serverAddress);
return protocolInfo.toJavaObject(ProtocolInfo.class).getAddress(); final String protocolAddress = protocolInfo.toJavaObject(ProtocolInfo.class).getAddress();
log.info("[ServerElection] server[{}] is active, it will be the master, final protocol address={}", serverAddress, protocolAddress);
return protocolAddress;
} else {
log.warn("[ServerElection] server[{}] is active but don't have target protocol", serverAddress);
} }
} }
}catch (Exception e) { }catch (Exception e) {