From f3309cfea20ec8e40eda2dfcf6331015893cb018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Bulej?= <bulej@d3s.mff.cuni.cz>
Date: Fri, 20 Oct 2023 10:55:40 +0200
Subject: [PATCH 1/2] Update Hadoop to version 3.3.6

This is to include a fix for IBM Semeru builds of OpenJ9 based JVMs
which as included in version 3.3.5.

Details at https://github.com/apache/hadoop/pull/4537
---
 build.sbt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.sbt b/build.sbt
index 86da393a..07e61874 100644
--- a/build.sbt
+++ b/build.sbt
@@ -268,6 +268,8 @@ lazy val apacheSparkBenchmarks = (project in file("benchmarks/apache-spark"))
     ),
     // Override versions pulled in by dependencies.
     dependencyOverrides ++= Seq(
+      // Force newer version of Hadoop (compatibility with IBM Semeru JDK builds).
+      "org.apache.hadoop" % "hadoop-client-runtime" % "3.3.6",
       // Force common (newer) version of Netty packages.
       "io.netty" % "netty-all" % nettyVersion,
       // Force common (newer) version of Jackson packages.

From 760ce1cd9b41f6c939e74b3454df91efc33f80be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Bulej?= <bulej@d3s.mff.cuni.cz>
Date: Fri, 20 Oct 2023 11:02:04 +0200
Subject: [PATCH 2/2] Mask warnings about non-built-in garbage collectors

---
 benchmarks/apache-spark/src/main/resources/log4j2.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/benchmarks/apache-spark/src/main/resources/log4j2.xml b/benchmarks/apache-spark/src/main/resources/log4j2.xml
index ccf9fcda..4f11ba18 100644
--- a/benchmarks/apache-spark/src/main/resources/log4j2.xml
+++ b/benchmarks/apache-spark/src/main/resources/log4j2.xml
@@ -61,12 +61,18 @@
     -->
     <Logger name="org.apache.hadoop.util.NativeCodeLoader" level="error"/>
 
-    <!-- 
+    <!--
       Note that spark.local.dir will be overridden by the value set by the cluster manager
       (via SPARK_LOCAL_DIRS in mesos/standalone/kubernetes and LOCAL_DIRS in YARN).
     -->
     <Logger name="org.apache.spark.SparkConf" level="error"/>
 
+    <!--
+      To enable non-built-in garbage collector(s) List(...), users should configure it(them) to
+      spark.eventLog.gcMetrics.youngGenerationGarbageCollectors or spark.eventLog.gcMetrics.oldGenerationGarbageCollectors
+    -->
+    <Logger name="org.apache.spark.metrics.GarbageCollectionMetrics" level="error"/>
+
     <!--
       URL.setURLStreamHandlerFactory failed to set FsUrlStreamHandlerFactory
     -->