2 files changed, 11 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java
index 2905471b02e..f18f10644ca 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java
@@ -6,6 +6,7 @@ import com.yahoo.container.core.AccessLogConfig.FileHandler.CompressionFormat;
 import com.yahoo.container.logging.JSONAccessLog;
 import com.yahoo.container.logging.VespaAccessLog;
 import com.yahoo.osgi.provider.model.ComponentModel;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.ContainerCluster;
 
 import java.util.OptionalInt;
@@ -27,6 +28,7 @@ public final class AccessLogComponent extends SimpleComponent implements AccessL
     private final String symlinkName;
     private final CompressionType compressionType;
     private final int queueSize;
+    private final Integer bufferSize;
 
     public AccessLogComponent(ContainerCluster<?> cluster, AccessLogType logType, CompressionType compressionType, String clusterName, boolean isHostedVespa)
     {
@@ -57,6 +59,9 @@ public final class AccessLogComponent extends SimpleComponent implements AccessL
         this.symlinkName = symlinkName;
         this.compressionType = compressionType;
         this.queueSize = queueSize(cluster).orElse(-1);
+        bufferSize = (cluster instanceof ApplicationContainerCluster)
+                ? 4*1024*1024
+                : null;
 
         if (fileNamePattern == null)
             throw new RuntimeException("File name pattern required when configuring access log.");
@@ -101,6 +106,9 @@ public final class AccessLogComponent extends SimpleComponent implements AccessL
         if (queueSize >= 0) {
             builder.queueSize(queueSize);
         }
+        if (bufferSize != null) {
+            builder.bufferSize(bufferSize);
+        }
         switch (compressionType) {
             case GZIP:
                 builder.compressionFormat(CompressionFormat.GZIP);
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 f3f3b2b1076..f3199f6a46f 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
@@ -86,6 +86,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
             assertEquals("pattern", fileHandlerConfig.pattern());
             assertEquals("interval", fileHandlerConfig.rotation());
             assertEquals(10000, fileHandlerConfig.queueSize());
+            assertEquals(4*1024*1024, fileHandlerConfig.bufferSize());
         }
 
         { // json
@@ -97,6 +98,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
             assertEquals("pattern", fileHandlerConfig.pattern());
             assertEquals("interval", fileHandlerConfig.rotation());
             assertEquals(10000, fileHandlerConfig.queueSize());
+            assertEquals(4*1024*1024, fileHandlerConfig.bufferSize());
         }
     }
 
@@ -116,6 +118,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
         ConnectionLogConfig config = root.getConfig(ConnectionLogConfig.class, "default/component/com.yahoo.container.logging.FileConnectionLog");
         assertEquals("default", config.cluster());
         assertEquals(10000, config.queueSize());
+        assertEquals(256*1024, config.bufferSize());
     }
 
     @Test