Don't use Optional in map

3 files changed, 9 insertions, 14 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
index 010045c9039..2c627e3f6e9 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
@@ -53,16 +53,12 @@ public class StorageMaintainer {
     private final Path archiveContainerStoragePath;
 
     // We cache disk usage to avoid doing expensive disk operations so often
-    private LoadingCache<Path, Optional<Long>> diskUsage = CacheBuilder.newBuilder()
+    private LoadingCache<Path, Long> diskUsage = CacheBuilder.newBuilder()
             .maximumSize(100)
             .expireAfterWrite(5, TimeUnit.MINUTES)
-            .build(new CacheLoader<Path, Optional<Long>>() {
-                public Optional<Long> load(Path containerDir) {
-                    try {
-                        return Optional.of(getDiskUsedInBytes(containerDir));
-                    } catch (Throwable e) {
-                        return Optional.empty();
-                    }
+            .build(new CacheLoader<Path, Long>() {
+                public Long load(Path containerDir) throws IOException, InterruptedException {
+                    return getDiskUsedInBytes(containerDir);
                 }
             });
 
@@ -192,14 +188,14 @@ public class StorageMaintainer {
     public Optional<Long> getDiskUsageFor(NodeAgentContext context) {
         Path containerDir = context.pathOnHostFromPathInNode("/");
         try {
-            return getDiskUsageFor(containerDir);
+            return Optional.of(getDiskUsageFor(containerDir));
         } catch (Exception e) {
             context.log(logger, LogLevel.WARNING, "Problems during disk usage calculations in " + containerDir.toAbsolutePath(), e);
             return Optional.empty();
         }
     }
 
-    Optional<Long> getDiskUsageFor(Path containerDir) throws ExecutionException {
+    long getDiskUsageFor(Path containerDir) throws ExecutionException {
         return diskUsage.get(containerDir);
     }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 999381a3866..4e8cd00cf70 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.node.admin.nodeagent;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.google.inject.Inject;
 import com.yahoo.concurrent.ThreadFactoryFactory;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.hosted.dockerapi.Container;
@@ -110,7 +109,7 @@ public class NodeAgentImpl implements NodeAgent {
     private NodeSpec lastNode = null;
     private CpuUsageReporter lastCpuMetric = new CpuUsageReporter();
 
-    @Inject
+    // Created in NodeAdminImpl
     public NodeAgentImpl(
             final NodeAgentContext context,
             final NodeRepository nodeRepository,
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
index 643023e46e6..81a0c4a5e20 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java
@@ -199,13 +199,13 @@ public class StorageMaintainerTest {
             int writeSize = 10000;
             Files.write(folder.newFile().toPath(), new byte[writeSize]);
 
-            long usedBytes = storageMaintainer.getDiskUsageFor(folder.getRoot().toPath()).get();
+            long usedBytes = storageMaintainer.getDiskUsageFor(folder.getRoot().toPath());
             if (usedBytes * 4 < writeSize || usedBytes > writeSize * 4)
                 fail("Used bytes is " + usedBytes + ", but wrote " + writeSize + " bytes, not even close.");
 
             // Write another file, since disk usage is cached it should not change
             Files.write(folder.newFile().toPath(), new byte[writeSize]);
-            assertEquals(usedBytes, (long) storageMaintainer.getDiskUsageFor(folder.getRoot().toPath()).get());
+            assertEquals(usedBytes, storageMaintainer.getDiskUsageFor(folder.getRoot().toPath()));
         }
 
         @Test