Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-8400: Use longs in SystemDiagnostics, add null checks 

This closes #4980.

Signed-off-by: Peter Turcsanyi <turcsanyi@apache.org>
This commit is contained in:
Matthew Burgess 2021-04-07 13:37:19 -04:00 committed by Peter Turcsanyi
parent 77a73a603b
commit 33ec8c8427
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnostics.java
View File

@ -39,9 +39,9 @@ public class SystemDiagnostics implements Cloneable {
private int totalThreads;
private int daemonThreads;
private Long totalPhysicalMemory;
private Long maxOpenFileHandles;
private Long openFileHandles;
private long totalPhysicalMemory;
private long maxOpenFileHandles;
private long openFileHandles;
private long uptime;

24
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
View File

@ -16,6 +16,12 @@
*/
package org.apache.nifi.diagnostics;
import org.apache.nifi.controller.repository.ContentRepository;
import org.apache.nifi.controller.repository.FlowFileRepository;
import org.apache.nifi.provenance.ProvenanceRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
@ -31,12 +37,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.nifi.controller.repository.ContentRepository;
import org.apache.nifi.controller.repository.FlowFileRepository;
import org.apache.nifi.provenance.ProvenanceRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A factory for creating system diagnostics.
*
@ -163,17 +163,23 @@ public class SystemDiagnosticsFactory {
final Method totalPhysicalMemory = unixOsMxBeanClass.getMethod("getTotalPhysicalMemorySize");
totalPhysicalMemory.setAccessible(true);
final Long ramBytes = (Long) totalPhysicalMemory.invoke(osStats);
systemDiagnostics.setTotalPhysicalMemory(ramBytes);
if (ramBytes != null) {
systemDiagnostics.setTotalPhysicalMemory(ramBytes);
}
final Method maxFileDescriptors = unixOsMxBeanClass.getMethod("getMaxFileDescriptorCount");
maxFileDescriptors.setAccessible(true);
final Long maxOpenFileDescriptors = (Long) maxFileDescriptors.invoke(osStats);
systemDiagnostics.setMaxOpenFileHandles(maxOpenFileDescriptors);
if (maxOpenFileDescriptors != null) {
systemDiagnostics.setMaxOpenFileHandles(maxOpenFileDescriptors);
}
final Method openFileDescriptors = unixOsMxBeanClass.getMethod("getOpenFileDescriptorCount");
openFileDescriptors.setAccessible(true);
final Long openDescriptorCount = (Long) openFileDescriptors.invoke(osStats);
systemDiagnostics.setOpenFileHandles(openDescriptorCount);
if (openDescriptorCount != null) {
systemDiagnostics.setOpenFileHandles(openDescriptorCount);
}
}
} catch (final Throwable t) {
// Ignore. This will throw either ClassNotFound or NoClassDefFoundError if unavailable in this JVM.