From 30e54a7bc9014ced1bea06acadf4da3921e0c2bf Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 30 Jul 2007 00:04:05 +0000 Subject: [PATCH] added disk space monitoring, too. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@3929 71c3de6d-444a-0410-be80-ed276b4c234a --- .../main/java/hudson/model/ComputerSet.java | 23 +++++++++- .../node_monitors/DiskSpaceMonitor.java | 45 +++++++++++++++++++ .../hudson/node_monitors/NodeMonitor.java | 5 ++- 3 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java diff --git a/core/src/main/java/hudson/model/ComputerSet.java b/core/src/main/java/hudson/model/ComputerSet.java index e757fab631..6c2430fd71 100644 --- a/core/src/main/java/hudson/model/ComputerSet.java +++ b/core/src/main/java/hudson/model/ComputerSet.java @@ -1,9 +1,12 @@ package hudson.model; +import hudson.model.Descriptor.FormException; +import hudson.node_monitors.NodeMonitor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; -import hudson.node_monitors.NodeMonitor; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -14,12 +17,28 @@ import java.util.List; * @author Kohsuke Kawaguchi */ public final class ComputerSet implements ModelObject { + private static volatile List monitors = Collections.emptyList(); + + public ComputerSet() { + if(monitors.isEmpty()) { + // create all instances when requested for the first time. + ArrayList r = new ArrayList(); + for (Descriptor d : NodeMonitor.LIST) + try { + r.add(d.newInstance(null)); + } catch (FormException e) { + // so far impossible. TODO: report + } + monitors = r; + } + } + public String getDisplayName() { return "nodes"; } public List get_monitors() { - return null; + return monitors; } public Computer[] get_all() { diff --git a/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java new file mode 100644 index 0000000000..136594b42e --- /dev/null +++ b/core/src/main/java/hudson/node_monitors/DiskSpaceMonitor.java @@ -0,0 +1,45 @@ +package hudson.node_monitors; + +import hudson.FilePath; +import hudson.FilePath.FileCallable; +import hudson.model.Computer; +import hudson.model.Descriptor; +import hudson.remoting.VirtualChannel; +import org.kohsuke.stapler.StaplerRequest; + +import java.io.File; +import java.io.IOException; + +/** + * Checks available disk space of the node. + * Requres Mustang. + * + * @author Kohsuke Kawaguchi + * @since 1.123 + */ +public class DiskSpaceMonitor extends NodeMonitor { + public Descriptor getDescriptor() { + return DESCRIPTOR; + } + + public static final Descriptor DESCRIPTOR = new AbstractNodeMonitorDescriptor(DiskSpaceMonitor.class) { + protected Long monitor(Computer c) throws IOException, InterruptedException { + FilePath p = c.getNode().getRootPath(); + if(p==null) return null; + + return p.act(new FileCallable() { + public Long invoke(File f, VirtualChannel channel) throws IOException { + return f.getUsableSpace(); + } + }); + } + + public String getDisplayName() { + return "Disk Space"; + } + + public NodeMonitor newInstance(StaplerRequest req) throws FormException { + return new DiskSpaceMonitor(); + } + }; +} diff --git a/core/src/main/java/hudson/node_monitors/NodeMonitor.java b/core/src/main/java/hudson/node_monitors/NodeMonitor.java index aaa681f87e..97d932e202 100644 --- a/core/src/main/java/hudson/node_monitors/NodeMonitor.java +++ b/core/src/main/java/hudson/node_monitors/NodeMonitor.java @@ -1,6 +1,7 @@ package hudson.node_monitors; import hudson.ExtensionPoint; +import hudson.Functions; import hudson.model.ComputerSet; import hudson.model.Describable; import hudson.model.Descriptor; @@ -42,7 +43,7 @@ public abstract class NodeMonitor implements ExtensionPoint, Describable