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] fix the bug of incorrect memory usafe

Browse Source
This commit is contained in:
朱八 2020-08-02 13:35:02 +08:00
parent 50f07e0d47
commit cc0e982be0
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/OmsWorkerVersion.java
View File

@ -28,10 +28,9 @@ public final class OmsWorkerVersion {
* @see Package#getImplementationVersion()
*/
public static String getVersion() {
if (StringUtils.isNotEmpty(CACHE)) {
return CACHE;
if (StringUtils.isEmpty(CACHE)) {
CACHE = determineSpringBootVersion();
}
CACHE = determineSpringBootVersion();
return CACHE;
}

8
powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/common/utils/SystemInfoUtils.java
View File

@ -47,11 +47,13 @@ public class SystemInfoUtils {
private static void fillMemoryInfo(SystemMetrics metrics) {
// JVM内存信息(maxMemory指JVM能从操作系统获取的最大内存，即-Xmx参数设置的值，totalMemory指JVM当前持久的总内存)
metrics.setJvmMaxMemory(bytes2GB(runtime.maxMemory()));
long maxMemory = runtime.maxMemory();
long usedMemory = runtime.totalMemory() - runtime.freeMemory();
metrics.setJvmMaxMemory(bytes2GB(maxMemory));
// 已使用内存：当前申请总量 - 当前空余量
metrics.setJvmUsedMemory(bytes2GB(runtime.totalMemory() - runtime.freeMemory()));
metrics.setJvmUsedMemory(bytes2GB(usedMemory));
// 已用内存比例
metrics.setJvmMemoryUsage(miniDouble(metrics.getJvmUsedMemory() / runtime.maxMemory()));
metrics.setJvmMemoryUsage(miniDouble((double) usedMemory / maxMemory));
}
private static void fillDiskInfo(SystemMetrics metrics) {

6
powerjob-worker/src/test/java/com/github/kfcfans/powerjob/function/MonitorTest.java
View File

@ -52,4 +52,10 @@ public class MonitorTest {
System.out.println("heap used: " + memoryMXBean.getHeapMemoryUsage());
System.out.println("noheap used: " + memoryMXBean.getNonHeapMemoryUsage());
}
@Test
public void testFetchMetrics() {
SystemMetrics systemMetrics = SystemInfoUtils.getSystemMetrics();
System.out.println(JsonUtils.toJSONString(systemMetrics));
}
}