This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit f8b0bffb28aebb2db3415907c78e85576b84c206 Author: Chesnay Schepler <[email protected]> AuthorDate: Wed Jun 17 13:08:58 2020 +0200 [FLINK-18343][e2e] Set Flink rootLogger to DEBUG --- .../org/apache/flink/tests/util/flink/FlinkDistribution.java | 11 +++++++++++ .../flink/tests/util/flink/LocalStandaloneFlinkResource.java | 2 ++ 2 files changed, 13 insertions(+) diff --git a/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/FlinkDistribution.java b/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/FlinkDistribution.java index 9516880..07c910e 100644 --- a/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/FlinkDistribution.java +++ b/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/FlinkDistribution.java @@ -24,6 +24,7 @@ import org.apache.flink.configuration.GlobalConfiguration; import org.apache.flink.configuration.UnmodifiableConfiguration; import org.apache.flink.tests.util.AutoClosableProcess; import org.apache.flink.tests.util.TestUtils; +import org.apache.flink.tests.util.util.FileUtils; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; @@ -34,6 +35,7 @@ import okhttp3.Request; import okhttp3.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import java.io.BufferedReader; import java.io.FileInputStream; @@ -66,6 +68,8 @@ final class FlinkDistribution { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); + private static final Pattern ROOT_LOGGER_PATTERN = Pattern.compile("(rootLogger.level =).*"); + private final Path opt; private final Path lib; private final Path conf; @@ -96,6 +100,13 @@ final class FlinkDistribution { AutoClosableProcess.runBlocking(bin.resolve("taskmanager.sh").toAbsolutePath().toString(), "start"); } + public void setRootLogLevel(Level logLevel) throws IOException { + FileUtils.replace( + conf.resolve("log4j.properties"), + ROOT_LOGGER_PATTERN, + matcher -> matcher.group(1) + " " + logLevel.name()); + } + public void startFlinkCluster() throws IOException { LOG.info("Starting Flink cluster."); AutoClosableProcess.runBlocking(bin.resolve("start-cluster.sh").toAbsolutePath().toString()); diff --git a/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/LocalStandaloneFlinkResource.java b/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/LocalStandaloneFlinkResource.java index 6a95d55..55ef08c 100644 --- a/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/LocalStandaloneFlinkResource.java +++ b/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/flink/LocalStandaloneFlinkResource.java @@ -34,6 +34,7 @@ import org.apache.flink.util.ConfigurationException; import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import javax.annotation.Nullable; @@ -80,6 +81,7 @@ public class LocalStandaloneFlinkResource implements FlinkResource { TestUtils.copyDirectory(distributionDirectory, tmp); distribution = new FlinkDistribution(tmp); + distribution.setRootLogLevel(Level.DEBUG); for (JarOperation jarOperation : setup.getJarOperations()) { distribution.performJarOperation(jarOperation); }
