diff options
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java | 1 | ||||
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java index e28c353e532..e0f470001fa 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java @@ -326,6 +326,7 @@ public class Tenants implements ConnectionStateListener, PathChildrenCacheListen pathChildrenExecutor.shutdown(); } + // TODO: Deploy applications in parallel (with throttling) public void redeployApplications(Deployer deployer) { Set<Tenant> allTenants = ImmutableSet.copyOf(tenants.values()); int totalNumberOfApplications = allTenants.stream() 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 b125dcbce54..e23876411c2 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 @@ -53,6 +53,7 @@ public class DockerOperationsImpl implements DockerOperations { static { DIRECTORIES_TO_MOUNT.put("/etc/yamas-agent", true); DIRECTORIES_TO_MOUNT.put("/etc/filebeat", true); + DIRECTORIES_TO_MOUNT.put(getDefaults().underVespaHome("logs/start-services.out"), false); DIRECTORIES_TO_MOUNT.put(getDefaults().underVespaHome("logs/daemontools_y"), false); DIRECTORIES_TO_MOUNT.put(getDefaults().underVespaHome("logs/jdisc_core"), false); DIRECTORIES_TO_MOUNT.put(getDefaults().underVespaHome("logs/langdetect/"), false); |