diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2019-07-09 09:00:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-09 09:00:26 +0200 |
commit | cc9e3be20b8d08936175af491c76d71790a388ce (patch) | |
tree | ebb5bc748b929a17137e7506b957a20a75093a81 | |
parent | 0bb6ba9a7b369620c9856534b97b07f1b80e89ff (diff) | |
parent | 3ebb140848a98a976e154e2bb589e7b8befd2483 (diff) |
Merge pull request #9990 from vespa-engine/freva/cleanup-mount-paths
Clean up mount paths
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 55 |
1 files changed, 23 insertions, 32 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 91fcdc89da3..9150c8b1699 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 @@ -269,51 +269,42 @@ public class DockerOperationsImpl implements DockerOperations { // Paths unique to each container List<Path> paths = new ArrayList<>(List.of( - Paths.get("/etc/vespa/flags"), - Paths.get("/etc/yamas-agent"), - Paths.get("/opt/splunkforwarder/var/log"), - Paths.get("/var/log"), - Paths.get("/var/spool/postfix/maildrop"), - context.pathInNodeUnderVespaHome("logs/daemontools_y"), - context.pathInNodeUnderVespaHome("logs/jdisc_core"), - context.pathInNodeUnderVespaHome("logs/langdetect"), - context.pathInNodeUnderVespaHome("logs/nginx"), + Paths.get("/etc/vespa/flags"), // local file db, to use flags before connection to cfg is established + Paths.get("/etc/yamas-agent"), // metrics check configuration + Paths.get("/opt/splunkforwarder/var/log"), // VESPA-14917, thin pool leakage + Paths.get("/var/log"), // VESPA-14917, thin pool leakage + Paths.get("/var/spool/postfix/maildrop"), // VESPA-14917, thin pool leakage + context.pathInNodeUnderVespaHome("logs/daemontools_y"), // TODO: related to ykeykey? context.pathInNodeUnderVespaHome("logs/vespa"), context.pathInNodeUnderVespaHome("logs/yca"), - context.pathInNodeUnderVespaHome("logs/yck"), - context.pathInNodeUnderVespaHome("logs/yell"), - context.pathInNodeUnderVespaHome("logs/ykeykey"), - context.pathInNodeUnderVespaHome("logs/ykeykeyd"), - context.pathInNodeUnderVespaHome("logs/yms_agent"), + context.pathInNodeUnderVespaHome("logs/ykeykeyd"), // TODO: should only be needed for proxy? context.pathInNodeUnderVespaHome("logs/ysar"), - context.pathInNodeUnderVespaHome("logs/ystatus"), - context.pathInNodeUnderVespaHome("logs/zpu"), context.pathInNodeUnderVespaHome("tmp"), - context.pathInNodeUnderVespaHome("var/cache"), - context.pathInNodeUnderVespaHome("var/crash"), + context.pathInNodeUnderVespaHome("var/crash"), // core dumps context.pathInNodeUnderVespaHome("var/container-data"), - context.pathInNodeUnderVespaHome("var/db/jdisc"), context.pathInNodeUnderVespaHome("var/db/vespa"), - context.pathInNodeUnderVespaHome("var/jdisc_container"), - context.pathInNodeUnderVespaHome("var/jdisc_core"), - context.pathInNodeUnderVespaHome("var/maven"), - context.pathInNodeUnderVespaHome("var/mediasearch"), // TODO: Remove when vespa-routing is no more - context.pathInNodeUnderVespaHome("var/run"), - context.pathInNodeUnderVespaHome("var/service"), - context.pathInNodeUnderVespaHome("var/share"), - context.pathInNodeUnderVespaHome("var/spool"), + context.pathInNodeUnderVespaHome("var/mediasearch"), // TODO: Remove when Vespa 6 is gone + context.pathInNodeUnderVespaHome("var/run"), // TODO: Remove? Only contains .pid files + context.pathInNodeUnderVespaHome("var/service"), // TODO: Remove? Contains 1 link to unmounted directory context.pathInNodeUnderVespaHome("var/vespa"), context.pathInNodeUnderVespaHome("var/yca"), - context.pathInNodeUnderVespaHome("var/ycore++"), - context.pathInNodeUnderVespaHome("var/yinst/tmp"), - context.pathInNodeUnderVespaHome("var/zookeeper") + context.pathInNodeUnderVespaHome("var/yinst/tmp"), // TODO: Remove? Used during start up, then cleared + context.pathInNodeUnderVespaHome("var/zookeeper") // Tenant content nodes, config server and controller )); - if (context.nodeType() == NodeType.proxy) + if (context.nodeType() == NodeType.proxy) { + paths.add(context.pathInNodeUnderVespaHome("logs/nginx")); paths.add(context.pathInNodeUnderVespaHome("var/vespa-hosted/routing")); - if (context.nodeType() == NodeType.tenant) + } else if (context.nodeType() == NodeType.tenant) paths.add(varLibSia); + if (isInfrastructureHost(context.nodeType())) { + // configserver/src/main/sh/start-configserver, standalone-container/src/main/sh/standalone-container.sh + paths.add(context.pathInNodeUnderVespaHome("var/jdisc_core")); + } else { + paths.add(context.pathInNodeUnderVespaHome("var/jdisc_container")); // container-disc/src/main/sh/vespa-start-container-daemon.sh + } + paths.forEach(path -> command.withVolume(context.pathOnHostFromPathInNode(path), path)); |