diff options
5 files changed, 7 insertions, 7 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 7b3d307c0b0..2905471b02e 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 @@ -66,7 +66,7 @@ public final class AccessLogComponent extends SimpleComponent implements AccessL if (cluster == null) return OptionalInt.empty(); double vcpu = cluster.vcpu().orElse(0); if (vcpu <= 0) return OptionalInt.empty(); - return OptionalInt.of((int) Math.max(512, Math.ceil(vcpu * 64.0))); + return OptionalInt.of((int) Math.max(4096, Math.ceil(vcpu * 256.0))); } private static String accessLogClass(AccessLogType logType) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java index 2441bb77515..9977e955f85 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConnectionLogComponent.java @@ -28,7 +28,7 @@ public class ConnectionLogComponent extends SimpleComponent implements Connectio if (cluster == null) return OptionalInt.empty(); double vcpu = cluster.vcpu().orElse(0); if (vcpu <= 0) return OptionalInt.empty(); - return OptionalInt.of((int) Math.max(512, Math.ceil(vcpu * 64.0))); + return OptionalInt.of((int) Math.max(4096, Math.ceil(vcpu * 512.0))); } @Override 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 b11aa00f7c6..56f09eefe82 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,7 +86,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { AccessLogConfig.FileHandler fileHandlerConfig = config.fileHandler(); assertEquals("pattern", fileHandlerConfig.pattern()); assertEquals("interval", fileHandlerConfig.rotation()); - assertEquals(2048, fileHandlerConfig.queueSize()); + assertEquals(10000, fileHandlerConfig.queueSize()); } { // json @@ -97,7 +97,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { AccessLogConfig.FileHandler fileHandlerConfig = config.fileHandler(); assertEquals("pattern", fileHandlerConfig.pattern()); assertEquals("interval", fileHandlerConfig.rotation()); - assertEquals(2048, fileHandlerConfig.queueSize()); + assertEquals(10000, fileHandlerConfig.queueSize()); } } @@ -116,7 +116,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { assertNotNull(connectionLogComponent); ConnectionLogConfig config = root.getConfig(ConnectionLogConfig.class, "default/component/com.yahoo.container.logging.FileConnectionLog"); assertEquals("default", config.cluster()); - assertEquals(2048, config.queueSize()); + assertEquals(10000, config.queueSize()); } @Test diff --git a/container-core-config/src/main/resources/configdefinitions/container.core.access-log.def b/container-core-config/src/main/resources/configdefinitions/container.core.access-log.def index 8f9aa2d0fc0..69058b3d8da 100644 --- a/container-core-config/src/main/resources/configdefinitions/container.core.access-log.def +++ b/container-core-config/src/main/resources/configdefinitions/container.core.access-log.def @@ -20,4 +20,4 @@ fileHandler.compressOnRotation bool default=true fileHandler.compressionFormat enum {GZIP, ZSTD} default=GZIP # Max queue length of file handler -fileHandler.queueSize int default=2048 +fileHandler.queueSize int default=10000 diff --git a/jdisc_http_service/src/main/resources/configdefinitions/container.logging.connection-log.def b/jdisc_http_service/src/main/resources/configdefinitions/container.logging.connection-log.def index 0606598aec7..409419b10ac 100644 --- a/jdisc_http_service/src/main/resources/configdefinitions/container.logging.connection-log.def +++ b/jdisc_http_service/src/main/resources/configdefinitions/container.logging.connection-log.def @@ -4,4 +4,4 @@ namespace=container.logging cluster string # Max queue length of file handler -queueSize int default=2048
\ No newline at end of file +queueSize int default=10000
\ No newline at end of file |