diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java index bf11027d0fa2..32e794fbcfe5 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIceberg.java @@ -85,6 +85,9 @@ private DockerContainer createSpark() .withCopyFileToContainer( forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg/spark-defaults.conf")), "/spark/conf/spark-defaults.conf") + .withCopyFileToContainer( + forHostPath(dockerFiles.getDockerFilesHostPath("common/spark/log4j2.properties")), + "/spark/conf/log4j2.properties") .withCommand( "spark-submit", "--master", "local[*]", diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergJdbcCatalog.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergJdbcCatalog.java index 265de62335af..9a838eba5b03 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergJdbcCatalog.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergJdbcCatalog.java @@ -111,6 +111,9 @@ private DockerContainer createSpark() .withCopyFileToContainer( forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg-jdbc-catalog/spark-defaults.conf")), "/spark/conf/spark-defaults.conf") + .withCopyFileToContainer( + forHostPath(dockerFiles.getDockerFilesHostPath("common/spark/log4j2.properties")), + "/spark/conf/log4j2.properties") .withCommand( "spark-submit", "--master", "local[*]", diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergNessie.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergNessie.java index a1be84a92c67..8634536fe25a 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergNessie.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergNessie.java @@ -70,6 +70,9 @@ private DockerContainer createSparkContainer() .withCopyFileToContainer( forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg-nessie/spark-defaults.conf")), "/spark/conf/spark-defaults.conf") + .withCopyFileToContainer( + forHostPath(dockerFiles.getDockerFilesHostPath("common/spark/log4j2.properties")), + "/spark/conf/log4j2.properties") .withCommand( "spark-submit", "--master", "local[*]", diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergRest.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergRest.java index 5a5e1fdb7312..f427a0bb8eff 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergRest.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeSparkIcebergRest.java @@ -90,6 +90,10 @@ private DockerContainer createSparkContainer() forHostPath(dockerFiles.getDockerFilesHostPath( "conf/environment/singlenode-spark-iceberg-rest/spark-defaults.conf")), "/spark/conf/spark-defaults.conf") + .withCopyFileToContainer( + forHostPath(dockerFiles.getDockerFilesHostPath( + "common/spark/log4j2.properties")), + "/spark/conf/log4j2.properties") .withCommand( "spark-submit", "--master", "local[*]", diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/spark/log4j2.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/spark/log4j2.properties new file mode 100644 index 000000000000..386ce31060a3 --- /dev/null +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/presto-product-tests/common/spark/log4j2.properties @@ -0,0 +1,15 @@ +rootLogger.level = error +rootLogger.appenderRef.stdout.ref = console + +appender.console.type = Console +appender.console.name = console +appender.console.target = SYSTEM_ERR + +logger.repl.name = org.apache.spark.repl.Main +logger.repl.level = error + +# SPARK-34128: Suppress undesirable TTransportException warnings involved in THRIFT-4805 +appender.console.filter.1.type = RegexFilter +appender.console.filter.1.regex = .*Thrift error occurred during processing of message.* +appender.console.filter.1.onMatch = deny +appender.console.filter.1.onMismatch = neutral