summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-03-29 15:20:50 +0100
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-03-29 15:20:50 +0100
commitf7348b06900aa44241f33c3b8b6b676365787a7d (patch)
tree9a2a0bb40a27fa69d2746158ce7cf1a075558e6c
parent0fecb5eb2b0f0daab1252304dd8411982d4d8ef4 (diff)
Restore alphabetical order
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java11
1 files changed, 6 insertions, 5 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 d10fef3dc6c..a1c53c3d931 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
@@ -271,12 +271,12 @@ public class DockerOperationsImpl implements DockerOperations {
Path varLibSia = Paths.get("/var/lib/sia");
// Paths unique to each container
- List<Path> paths = new ArrayList<>(Arrays.asList(
+ List<Path> paths = new ArrayList<>(List.of(
Paths.get("/etc/vespa/flags"),
Paths.get("/etc/yamas-agent"),
context.pathInNodeUnderVespaHome("logs/daemontools_y"),
context.pathInNodeUnderVespaHome("logs/jdisc_core"),
- context.pathInNodeUnderVespaHome("logs/langdetect/"),
+ context.pathInNodeUnderVespaHome("logs/langdetect"),
context.pathInNodeUnderVespaHome("logs/nginx"),
context.pathInNodeUnderVespaHome("logs/vespa"),
context.pathInNodeUnderVespaHome("logs/yca"),
@@ -288,8 +288,10 @@ public class DockerOperationsImpl implements DockerOperations {
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/container-data"),
context.pathInNodeUnderVespaHome("var/db/jdisc"),
context.pathInNodeUnderVespaHome("var/db/vespa"),
context.pathInNodeUnderVespaHome("var/jdisc_container"),
@@ -305,9 +307,8 @@ public class DockerOperationsImpl implements DockerOperations {
context.pathInNodeUnderVespaHome("var/yca"),
context.pathInNodeUnderVespaHome("var/ycore++"),
context.pathInNodeUnderVespaHome("var/yinst/tmp"),
- context.pathInNodeUnderVespaHome("var/zookeeper"),
- context.pathInNodeUnderVespaHome("tmp"),
- context.pathInNodeUnderVespaHome("var/container-data")));
+ context.pathInNodeUnderVespaHome("var/zookeeper")
+ ));
if (context.nodeType() == NodeType.proxy)
paths.add(context.pathInNodeUnderVespaHome("var/vespa-hosted/routing"));