Merge branch 'dev-pr' of https://github.com/zhihui1999/PowerJob into pr-disk-overflow

KFCFans · KFCFans · commit b96768208bc3 · 2023-09-02T13:48:09.000+08:00
diff --git a/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/script/AbstractScriptProcessor.java b/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/script/AbstractScriptProcessor.java
@@ -19,6 +19,7 @@
 import java.nio.file.Files;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinTask;
 
 /**
  * 脚本处理器
@@ -78,17 +79,23 @@ protected ProcessResult process0(TaskContext context) throws Exception {
         String result;
 
         final Charset charset = getCharset();
-        try (InputStream is = process.getInputStream(); InputStream es = process.getErrorStream()) {
+        try {
+            InputStream is = process.getInputStream();
+            InputStream es = process.getErrorStream();
 
-            POOL.execute(() -> copyStream(is, inputBuilder, omsLogger, charset));
-            POOL.execute(() -> copyStream(es, errorBuilder, omsLogger, charset));
+            ForkJoinTask<?> inputSubmit = POOL.submit(() -> copyStream(is, inputBuilder, omsLogger, charset));
+            ForkJoinTask<?> errorSubmit = POOL.submit(() -> copyStream(es, errorBuilder, omsLogger, charset));
 
             success = process.waitFor() == 0;
 
+            // 阻塞等待日志读取
+            inputSubmit.get();
+            errorSubmit.get();
+
         } catch (InterruptedException ie) {
             omsLogger.info("[SYSTEM] ScriptProcessor has been interrupted");
         } finally {
-            result = String.format("[INPUT]: %s;[ERROR]: %s", inputBuilder.toString(), errorBuilder.toString());
+            result = String.format("[INPUT]: %s;[ERROR]: %s", inputBuilder, errorBuilder);
         }
         return new ProcessResult(success, result);
     }
@@ -132,11 +139,11 @@ private String prepareScriptFile(Long instanceId, String processorInfo) throws I
         return scriptPath;
     }
 
-    private static void copyStream(InputStream is, StringBuilder sb, OmsLogger omsLogger, Charset charset) {
+    private void copyStream(InputStream is, StringBuilder sb, OmsLogger omsLogger, Charset charset) {
         String line;
         try (BufferedReader br = new BufferedReader(new InputStreamReader(is, charset))) {
             while ((line = br.readLine()) != null) {
-                sb.append(line);
+                sb.append(line).append(System.lineSeparator());
                 // 同步到在线日志
                 omsLogger.info(line);
             }
@@ -145,6 +152,13 @@ private static void copyStream(InputStream is, StringBuilder sb, OmsLogger omsLo
             omsLogger.warn("[SYSTEM] copyStream failed.", e);
 
             sb.append("Exception: ").append(e);
+        } finally {
+            try {
+                is.close();
+            } catch (IOException e) {
+                log.warn("[ScriptProcessor] close stream failed.", e);
+                omsLogger.warn("[SYSTEM] close stream failed.", e);
+            }
         }
     }
 
diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/common/utils/SystemInfoUtils.java b/powerjob-worker/src/main/java/tech/powerjob/worker/common/utils/SystemInfoUtils.java
@@ -68,7 +68,8 @@ private static void fillDiskInfo(SystemMetrics metrics) {
         }
 
         metrics.setDiskUsed(bytes2GB(total - free));
-        metrics.setDiskTotal(bytes2GB(total));
+        // 防止内存溢出导致total为负数,导致找不到worker实例
+        metrics.setDiskTotal(bytes2GB(total < 0 ? Long.MAX_VALUE >> 6 : total ));
         metrics.setDiskUsage(miniDouble(metrics.getDiskUsed() / metrics.getDiskTotal()));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ private static void fillDiskInfo(SystemMetrics metrics) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`metrics.setDiskUsed(bytes2GB(total - free));`
`71`		`- metrics.setDiskTotal(bytes2GB(total));`
	`71`	`+ // 防止内存溢出导致total为负数,导致找不到worker实例`
	`72`	`+ metrics.setDiskTotal(bytes2GB(total < 0 ? Long.MAX_VALUE >> 6 : total ));`
`72`	`73`	`metrics.setDiskUsage(miniDouble(metrics.getDiskUsed() / metrics.getDiskTotal()));`
`73`	`74`	`}`
`74`	`75`