review

jenkinsci · Oct 17, 2023 · 629bb74 · 629bb74
1 parent 43569ea
commit 629bb74
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/AbstractDiskSpaceMonitor.java
@@ -115,7 +115,8 @@ public DiskSpace markNodeOfflineIfDiskspaceIsTooLow(Computer c) {
         long threshold = getThresholdBytes(c);
         if (size != null) {
             size.setThreshold(threshold);
-            size.setWarningThreshold(getWarningThresholdBytes(c));
+            long warningThreshold = getWarningThresholdBytes(c);
+            size.setWarningThreshold(warningThreshold);
             if (size.size < threshold) {
                 size.setTriggered(this.getClass(), true);
                 if (getDescriptor().markOffline(c, size)) {

diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
@@ -24,6 +24,7 @@
 
 package hudson.node_monitors;
 
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.Util;
 import hudson.model.AdministrativeMonitor;
 import hudson.model.Computer;
@@ -293,6 +294,7 @@ private final class Record extends Thread {
 
         private long timestamp;
 
+
         Record() {
             super("Monitoring thread for " + getDisplayName() + " started on " + new Date());
         }

diff --git a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
@@ -25,14 +25,19 @@
 package hudson.node_monitors;
 
 import hudson.Functions;
+import hudson.model.AdministrativeMonitor;
+import hudson.model.Computer;
 import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace;
 import hudson.remoting.VirtualChannel;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.text.ParseException;
 import java.util.Locale;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import jenkins.MasterToSlaveFileCallable;
+import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -46,6 +51,7 @@
  * @since 1.520
 */
 public abstract class DiskSpaceMonitorDescriptor extends AbstractAsyncNodeMonitorDescriptor<DiskSpace> {
+
     /**
      * Value object that represents the disk space.
      */
@@ -124,7 +130,7 @@ public boolean isTriggered() {
 
         @Restricted(NoExternalUse.class)
         public boolean isWarning() {
-            return warningThreshold > 0 && size < warningThreshold;
+            return size > threshold && size < warningThreshold ;
         }
 
         /**

diff --git a/core/src/main/java/hudson/node_monitors/MonitorMarkedNodeOffline.java b/core/src/main/java/hudson/node_monitors/MonitorMarkedNodeOffline.java
@@ -38,6 +38,7 @@
  */
 @Extension
 public class MonitorMarkedNodeOffline extends AdministrativeMonitor {
+
     @Override
     public String getDisplayName() {
         return Messages.MonitorMarkedNodeOffline_DisplayName();