diff options
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java index 6634b7ef81e..c92157eac9f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java @@ -276,6 +276,7 @@ public class RoutingController { /** Returns whether traffic can be directly routed to given deployment */ private boolean canRouteDirectlyTo(DeploymentId deploymentId, Application application) { if (controller.system().isPublic()) return true; // Public always supports direct routing + if (controller.system().isCd()) return true; // CD deploys directly so we cannot enforce all requirements below // Check Athenz service presence. The test framework uses this identity when sending requests to the // deployment's container(s). diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java index 2969611e729..1684c0dd2a1 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java @@ -96,10 +96,9 @@ public class StorageMaintainer { } - /** Deletes old log files for vespa, nginx, logstash, etc. */ + /** Deletes old log files for vespa and nginx */ public void removeOldFilesFromNode(NodeAgentContext context) { Path[] logPaths = { - context.pathInNodeUnderVespaHome("logs/daemontools_y"), context.pathInNodeUnderVespaHome("logs/nginx"), context.pathInNodeUnderVespaHome("logs/vespa") }; |