Merge pull request #11999 from vespa-engine/hmusum/add-access-log-by-default-for-application-container-cluster

Add access log by default for application container cluster

2 files changed, 3 insertions, 11 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 aef2697a5dd..d09f23da64e 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
@@ -302,7 +302,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
             AccessLogBuilder.buildIfNotDisabled(deployState, cluster, accessLog).ifPresent(cluster::addComponent);
         }
 
-        if (accessLogElements.isEmpty() && cluster.getSearch() != null)
+        if (accessLogElements.isEmpty())
             cluster.addDefaultSearchAccessLog();
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
index 4ea10c9a1c1..00ab175f496 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
@@ -18,30 +18,22 @@ import static org.junit.Assert.assertEquals;
 
 /**
  * @author gjoranv
- * @since 5.5
  */
 public class AccessLogTest extends ContainerModelBuilderTestBase {
 
     @Test
-    public void default_access_log_is_only_added_when_search_is_present() {
+    public void default_access_log_is_added_by_default() {
         Element cluster1Elem = DomBuilderTest.parse(
                 "<container id='cluster1' version='1.0'>",
-                "<search />",
-                nodesXml,
-                "</container>");
-        Element cluster2Elem = DomBuilderTest.parse(
-                "<container id='cluster2' version='1.0'>",
                 "  <nodes>",
                 "    <node hostalias='mockhost' baseport='1234' />",
                 "  </nodes>",
                 "</container>" );
 
-        createModel(root, cluster1Elem, cluster2Elem);
+        createModel(root, cluster1Elem);
 
         assertNotNull(getJsonAccessLog("cluster1"));
-        assertNull(   getJsonAccessLog("cluster2"));
         assertNull(getVespaAccessLog("cluster1"));
-        assertNull(getVespaAccessLog("cluster2"));
     }
 
     @Test