prevent NPE when cpu values could not fetched or parsed correctly

cbbayburt · Aug 11, 2023 · cde1081 · cde1081
1 parent 7eff71e
commit cde1081
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/gatherer/VirtualHostManagerProcessor.java b/java/code/src/com/redhat/rhn/taskomatic/task/gatherer/VirtualHostManagerProcessor.java
@@ -277,10 +277,14 @@ private void updateServerCpu(Server server, HostJson host) {
 
         cpu.setArch(ServerFactory.lookupCPUArchByName(host.getCpuArch()));
         cpu.setMHz(Long.toString(Math.round(host.getCpuMhz())));
-        cpu.setNrCPU(host.getTotalCpuThreads().longValue());
-        cpu.setNrsocket(host.getTotalCpuSockets().longValue());
-        cpu.setNrCore(host.getTotalCpuCores().longValue() / host.getTotalCpuSockets().longValue());
-        cpu.setNrThread(host.getTotalCpuThreads().longValue() / host.getTotalCpuCores().longValue());
+        if (host.getTotalCpuSockets().longValue() > 0L) {
+            cpu.setNrsocket(host.getTotalCpuSockets().longValue());
+            cpu.setNrCore(host.getTotalCpuCores().longValue() / host.getTotalCpuSockets().longValue());
+            cpu.setNrThread(host.getTotalCpuThreads().longValue() / host.getTotalCpuCores().longValue());
+            cpu.setNrCPU(host.getTotalCpuThreads().longValue());
+        }
+        // else insufficient data for subscription matching. We keep totalSockets == null as matcher react on it
+        // set no CPU value in that case to prevent division by zero
         cpu.setVendor(host.getCpuVendor());
         cpu.setModel(host.getCpuDescription());
 

diff --git a/java/code/src/com/suse/manager/gatherer/HostJson.java b/java/code/src/com/suse/manager/gatherer/HostJson.java
@@ -88,26 +88,26 @@ public String getHostIdentifier() {
 
     /**
      * Gets the total CPU socket count.
-     * @return the number of sockets
+     * @return the number of sockets - can be 0 if insufficient data were send
      */
     public Integer getTotalCpuSockets() {
-        return totalCpuSockets;
+        return totalCpuSockets == null ? 0 : totalCpuSockets;
     }
 
     /**
      * Gets the total CPU core count.
      * @return the cpu cores
      */
     public Integer getTotalCpuCores() {
-        return totalCpuCores;
+        return totalCpuCores == null ? 1 : totalCpuCores;
     }
 
     /**
      * Gets the total CPU thread count.
      * @return the CPU thread count
      */
     public Integer getTotalCpuThreads() {
-        return totalCpuThreads;
+        return totalCpuThreads == null ? 1 : totalCpuThreads;
     }
 
     /**