Merge pull request #71 from hareldev/added-JENKINS-FS

Author: PierreBtz

src/main/java/com/cloudbees/simplediskusage/QuickDiskUsagePlugin.java

@@ -205,6 +205,34 @@ private void registerJobs(UsageComputation uc) throws IOException, InterruptedEx
         }
     }
 
+    private File getJenkinsBaseDirectory() throws NullPointerException {
+        // finds the lowest non-null value of parent.
+        // for example, would return "/" for "/var/jenkins_home"
+        Jenkins jenkins = Jenkins.get();
+        Path basePath = jenkins.getRootDir().toPath();
+        try {
+            while (basePath.getParent() != null) {
+                basePath = basePath.getParent();
+            }
+        }
+        catch (NullPointerException e){
+            logger.log(Level.WARNING, "cloudbees-disk-usage-plugin: Could not find Jenkins Base Directory");
+        }
+        return basePath.toFile();
+    }
+
+    private void registerDirectoriesFS(UsageComputation uc) throws IOException, InterruptedException {
+        Map<File, String> directoriesToProcess = new HashMap<>();
+        // Display JENKINS_FS size
+        File rootPath = getJenkinsBaseDirectory();
+        directoriesToProcess.put(rootPath, "JENKINS_FS");
+
+        // Add or update entries for directories
+        for (Map.Entry<File, String> item : directoriesToProcess.entrySet()) {
+            uc.addListener(item.getKey().toPath(), new DirectoryUsageListener(item.getValue()));
+        }
+    }
+
     private void registerDirectories(UsageComputation uc) throws IOException, InterruptedException {
         Jenkins jenkins = Jenkins.get();
         Map<File, String> directoriesToProcess = new HashMap<>();
@@ -256,7 +284,17 @@ public void run() {
                 registerDirectories(uc);
                 total.set(uc.getItemsCount());
                 uc.compute();
+                
+                // Adds JENKINS_FS section with relevant disk usage info
+                File rootPath = getJenkinsBaseDirectory();
+                UsageComputation ucfs = new UsageComputation(Arrays.asList(rootPath.toPath()));
+                registerJobs(ucfs);
+                registerDirectoriesFS(ucfs);
+                total.set(ucfs.getItemsCount());
+                ucfs.computeFS();
+
                 logger.fine("Finished re-estimating disk usage.");
+
                 lastRunEnd = System.currentTimeMillis();
             } catch (IOException | InterruptedException e) {
                 logger.log(Level.WARNING, "Unable to run disk usage check", e);

src/main/java/com/cloudbees/simplediskusage/UsageComputation.java

@@ -3,6 +3,7 @@
 import hudson.FilePath;
 import jenkins.model.Jenkins;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -52,6 +53,35 @@ public void compute() throws IOException {
         }
     }
 
+    public void computeFS() {
+        // setting the disk space usage for the entire FS        
+        for (Path path : pathsToScan) {
+            try {
+                Path dir = path.toAbsolutePath();
+                long pathDiskUsage = jenkinsFSUsage();
+                CompletionListener listener = listenerMap.get(dir);
+                if (listener != null) {
+                    listener.onCompleted(dir, pathDiskUsage);
+                }
+            }
+            catch (Exception e){
+                logger.log(Level.WARNING, "cloudbees-disk-usage-plugin: FS information could not get acquired.");
+            }
+        }
+    }
+
+    protected long jenkinsFSUsage() {
+        File rd = Jenkins.get().getRootDir();
+        long totalJenkins = rd.getTotalSpace();
+        long usableJenkins = rd.getUsableSpace();
+        if (usableJenkins <= 0 || totalJenkins <= 0) {
+            // information unavailable. pointless to try.
+            logger.log(Level.WARNING, "cloudbees-disk-usage-plugin: JENKINS_HOME disk usage information isn't available.");
+            return -1;
+        }
+        return (totalJenkins - usableJenkins);
+    }
+
     protected void computeUsage(Path path) throws IOException {
         // we don't really need AtomicLong here, walking the tree is synchronous, but
         // it's convenient for the operations it provides