From ae6a4606565ae8cabe5a14f942c5c95849a3c0d5 Mon Sep 17 00:00:00 2001 From: Neville Li Date: Thu, 15 Sep 2022 15:51:44 -0400 Subject: [PATCH] Lower Kafka log level in product tests --- .../product/launcher/env/common/Kafka.java | 19 ++++++++++++++++++- .../common/kafka/log.properties | 1 + 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/kafka/log.properties diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java index e5647f8bff14..80763dc2fa2c 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Kafka.java @@ -14,18 +14,24 @@ package io.trino.tests.product.launcher.env.common; +import io.trino.tests.product.launcher.docker.DockerFiles; +import io.trino.tests.product.launcher.docker.DockerFiles.ResourceProvider; import io.trino.tests.product.launcher.env.DockerContainer; import io.trino.tests.product.launcher.env.Environment; import io.trino.tests.product.launcher.testcontainers.PortBinder; import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy; +import org.testcontainers.utility.MountableFile; import javax.inject.Inject; import java.time.Duration; import static io.trino.tests.product.launcher.docker.ContainerUtil.forSelectedPorts; +import static io.trino.tests.product.launcher.env.EnvironmentContainers.isPrestoContainer; +import static io.trino.tests.product.launcher.env.common.Standard.CONTAINER_PRESTO_ETC; import static java.util.Objects.requireNonNull; import static org.testcontainers.containers.wait.strategy.Wait.forLogMessage; +import static org.testcontainers.utility.MountableFile.forHostPath; public class Kafka implements EnvironmentExtender @@ -36,11 +42,15 @@ public class Kafka static final String SCHEMA_REGISTRY = "schema-registry"; static final String ZOOKEEPER = "zookeeper"; + private final ResourceProvider configDir; + private final PortBinder portBinder; @Inject - public Kafka(PortBinder portBinder) + public Kafka(DockerFiles dockerFiles, PortBinder portBinder) { + this.configDir = requireNonNull(dockerFiles, "dockerFiles is null") + .getDockerFilesHostDirectory("common/kafka"); this.portBinder = requireNonNull(portBinder, "portBinder is null"); } @@ -50,6 +60,13 @@ public void extendEnvironment(Environment.Builder builder) builder.addContainers(createZookeeper(), createKafka(), createSchemaRegistry()) .containerDependsOn(KAFKA, ZOOKEEPER) .containerDependsOn(SCHEMA_REGISTRY, KAFKA); + + MountableFile logConfigFile = forHostPath(configDir.getPath("log.properties")); + builder.configureContainers(container -> { + if (isPrestoContainer(container.getLogicalName())) { + container.withCopyFileToContainer(logConfigFile, CONTAINER_PRESTO_ETC + "/log.properties"); + } + }); } @SuppressWarnings("resource") diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/kafka/log.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/kafka/log.properties new file mode 100644 index 000000000000..8eb3b8fcf0c5 --- /dev/null +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/kafka/log.properties @@ -0,0 +1 @@ +org.apache.kafka=WARN