Merge pull request #22561 from vespa-engine/bjormel/use-access-dir-for-connection-log

hosted/Vespa8: use 'access' dir for connection log

1 files changed, 6 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 18399e67ba2..bb84f809fc4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -436,7 +436,12 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
         // Add connection log if access log is configured
         if (cluster.getAllComponents().stream().anyMatch(component -> component instanceof AccessLogComponent)) {
-            cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class, "qrs"));
+            // TODO: clean up after Vespa 8
+            if (cluster.isHostedVespa() || deployState.getVespaVersion().getMajor() == 8) {
+                cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class, "access"));
+            } else {
+                cluster.addComponent(new ConnectionLogComponent(cluster, FileConnectionLog.class, "qrs"));
+            }
         }
     }