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

fix: NetworkInterfaceChecker can't worker

Browse Source
This commit is contained in:
tjq 2024-08-11 18:22:48 +08:00
parent fea1974014
commit a35573544c
5 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
powerjob-common/src/main/java/tech/powerjob/common/utils/HttpUtils.java
View File

@ -21,6 +21,7 @@ public class HttpUtils {
client = new OkHttpClient.Builder()
.connectTimeout(1, TimeUnit.SECONDS)
.readTimeout(5, TimeUnit.SECONDS)
.writeTimeout(10, TimeUnit.SECONDS)
.build();
}

5
powerjob-common/src/main/java/tech/powerjob/common/utils/NetUtils.java
View File

@ -217,9 +217,10 @@ public class NetUtils {
if (networkInterfaceChecker == null) {
return false;
}
log.info("[Net] try to choose NetworkInterface by NetworkInterfaceChecker, current NetworkInterface: {}", networkInterface);
try {
return networkInterfaceChecker.ok(networkInterface, getFirstReachableInetAddress(networkInterface));
boolean ok = networkInterfaceChecker.ok(networkInterface, getFirstReachableInetAddress(networkInterface));
log.info("[Net] try to choose NetworkInterface by NetworkInterfaceChecker, current NetworkInterface[{}], ok: {}", networkInterface, ok);
return ok;
} catch (Exception e) {
log.warn("[Net] isPassedCheckerNetworkInterface failed, current networkInterface: {}", networkInterface, e);
}

6
powerjob-common/src/main/java/tech/powerjob/common/utils/net/PingPongSocketServer.java
View File

@ -35,7 +35,13 @@ public class PingPongSocketServer implements PingPongServer {
}
// 接收连接，如果没有连接，accept() 方法会阻塞
try (Socket socket = serverSocket.accept();OutputStream outputStream = socket.getOutputStream();) {
socket.setSoTimeout(2000);
socket.setKeepAlive(false);
outputStream.write(PingPongUtils.PONG.getBytes(StandardCharsets.UTF_8));
// BufferedReader.readLine() 会等待直到遇到换行符（\n）或回车符（\r\n），才会返回一行内容。如果服务器发送的数据没有这些换行符，readLine() 会一直阻塞，直到超时
outputStream.write(System.lineSeparator().getBytes(StandardCharsets.UTF_8));
outputStream.flush();
} catch (Exception e) {
if (!terminated) {

3
powerjob-common/src/main/java/tech/powerjob/common/utils/net/PingPongUtils.java
View File

@ -30,6 +30,9 @@ public class PingPongUtils {
try (Socket s = new Socket(targetIp, targetPort);InputStream is = s.getInputStream();OutputStream os = s.getOutputStream();BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
s.setSoTimeout(2000);
s.setKeepAlive(false);
// 发送 PING 请求
os.write(PING.getBytes(StandardCharsets.UTF_8));
os.flush();

19
powerjob-worker/src/main/java/tech/powerjob/worker/common/utils/WorkerNetUtils.java
View File

@ -35,13 +35,11 @@ public class WorkerNetUtils {
pingPongServer = new PingPongSocketServer();
pingPongServer.initialize(port);
log.info("[WorkerNetUtils] initialize PingPongSocketServer successfully~");
} catch (Exception e) {
log.warn("[WorkerNetUtils] PingPongSocketServer failed to start, which may result in an incorrectly bound IP, please pay attention to the initialize log.", e);
}
String localHostWithNetworkInterfaceChecker = NetUtils.getLocalHostWithNetworkInterfaceChecker(((networkInterface, inetAddress) -> {
return NetUtils.getLocalHostWithNetworkInterfaceChecker(((networkInterface, inetAddress) -> {
if (inetAddress == null) {
log.info("[WorkerNetUtils] [networkInterface:{}] skip due to inetAddress is null!", networkInterface);
return false;
}
@ -50,10 +48,13 @@ public class WorkerNetUtils {
String url = String.format(SERVER_CONNECTIVITY_CHECK_URL_PATTERN, address, workerIp, port);
try {
String resp = HttpUtils.get(url);
log.info("[WorkerNetUtils] check connectivity by url[{}], response: {}", url, resp);
log.info("[WorkerNetUtils] [networkInterface:{},inetAddress:{}] check connectivity by url[{}], response: {}", networkInterface, inetAddress, url, resp);
if (StringUtils.isNotEmpty(resp)) {
ResultDTO<?> resultDTO = JsonUtils.parseObject(resp, ResultDTO.class);
return Boolean.TRUE.toString().equalsIgnoreCase(String.valueOf(resultDTO.getData()));
boolean ret = Boolean.TRUE.toString().equalsIgnoreCase(String.valueOf(resultDTO.getData()));
if (ret) {
return true;
}
}
} catch (Exception ignore) {
}
@ -61,6 +62,9 @@ public class WorkerNetUtils {
return false;
}));
} catch (Exception e) {
log.warn("[WorkerNetUtils] PingPongSocketServer failed to start, which may result in an incorrectly bound IP, please pay attention to the initialize log.", e);
} finally {
if (pingPongServer != null) {
try {
pingPongServer.close();
@ -69,8 +73,9 @@ public class WorkerNetUtils {
log.warn("[WorkerNetUtils] close PingPongSocketServer failed!", e);
}
}
}
return localHostWithNetworkInterfaceChecker;
return NetUtils.getLocalHostWithNetworkInterfaceChecker(null);
}
}