Merge pull request #5233 from vespa-engine/freva/mount-var-lib-sia-host-root

Mount /var/lib/sia on host root

1 files changed, 7 insertions, 6 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 b9cea1cd5da..5bbee592f8a 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
@@ -29,6 +29,7 @@ import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -53,7 +54,7 @@ public class DockerOperationsImpl implements DockerOperations {
     private final Environment environment;
     private final ProcessExecuter processExecuter;
     private final String nodeProgram;
-    private Map<Path, Boolean> directoriesToMount;
+    private final Map<Path, Boolean> directoriesToMount;
     private final IPAddresses retriever;
 
     public DockerOperationsImpl(Docker docker, Environment environment, ProcessExecuter processExecuter, IPAddresses retriever) {
@@ -91,6 +92,10 @@ public class DockerOperationsImpl implements DockerOperations {
                     .withAddCapability("SYS_PTRACE") // Needed for gcore, pstack etc.
                     .withAddCapability("SYS_ADMIN"); // Needed for perf
 
+            if (environment.getNodeType() == NodeType.confighost) {
+                command.withVolume("/var/lib/sia", "/var/lib/sia");
+            }
+
             if (!docker.networkNPTed()) {
                 command.withIpAddress(nodeInetAddress);
                 command.withNetworkMode(DockerImpl.DOCKER_CUSTOM_MACVLAN_NETWORK_NAME);
@@ -387,10 +392,6 @@ public class DockerOperationsImpl implements DockerOperations {
         directoriesToMount.put(environment.pathInNodeUnderVespaHome("tmp"), false);
         directoriesToMount.put(environment.pathInNodeUnderVespaHome("var/container-data"), false);
 
-        if (environment.getNodeType() == NodeType.confighost) {
-            directoriesToMount.put(Paths.get("/var/lib/sia"), false);
-        }
-        
-        return directoriesToMount;
+        return Collections.unmodifiableMap(directoriesToMount);
     }
 }