Merge pull request #1411 from yahoo/freva/minor-node-admin-fixes

Freva/minor node admin fixes

2 files changed, 6 insertions, 0 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
index 07e44a58f44..985345f4196 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java
@@ -219,6 +219,7 @@ public class DockerOperationsImpl implements DockerOperations {
                     // TOTAL_MEMORY_MB is used to make any jdisc container think the machine
                     // only has this much physical memory (overrides total memory reported by `free -m`).
                     command.withEnvironment("TOTAL_MEMORY_MB", Long.toString(minMainMemoryAvailableMb));
+                    command.withEnvironment("VESPA_TOTAL_MEMORY_MB", Long.toString(minMainMemoryAvailableMb));
                 }
             }
 
@@ -240,6 +241,10 @@ public class DockerOperationsImpl implements DockerOperations {
         }
     }
 
+    /**
+     * Due to a bug in docker (https://github.com/docker/libnetwork/issues/1443), we need to manually set
+     * IPv6 gateway in containers connected to more than one docker network
+     */
     private void setupContainerNetworkingWithScript(ContainerName containerName) {
         PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperationsImpl.class, containerName);
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/maintenance/CoredumpHandler.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/maintenance/CoredumpHandler.java
index 329973485ea..d936975f2c9 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/maintenance/CoredumpHandler.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/maintenance/CoredumpHandler.java
@@ -48,6 +48,7 @@ public class CoredumpHandler {
     }
 
     public void removeJavaCoredumps(Path javaCoredumpsPath) {
+        if (! javaCoredumpsPath.toFile().isDirectory()) return;
         DeleteOldAppData.deleteFiles(javaCoredumpsPath.toString(), 0, "^java_pid.*\\.hprof$", false);
     }