From 1877a8ddb3f195bdd22c9046923bde7db982cfaf Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Fri, 3 May 2024 18:12:32 -0700 Subject: [PATCH] [SPARK-48127][INFRA] Fix `dev/scalastyle` to check `hadoop-cloud` and `jvm-profile` modules --- .../apache/spark/executor/profiler/ExecutorJVMProfiler.scala | 2 +- .../apache/spark/executor/profiler/ExecutorProfilerPlugin.scala | 2 +- dev/scalastyle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/connector/profiler/src/main/scala/org/apache/spark/executor/profiler/ExecutorJVMProfiler.scala b/connector/profiler/src/main/scala/org/apache/spark/executor/profiler/ExecutorJVMProfiler.scala index 4c3f467fa15b2..20b6db5221fa9 100644 --- a/connector/profiler/src/main/scala/org/apache/spark/executor/profiler/ExecutorJVMProfiler.scala +++ b/connector/profiler/src/main/scala/org/apache/spark/executor/profiler/ExecutorJVMProfiler.scala @@ -25,8 +25,8 @@ import org.apache.hadoop.fs.{FileSystem, FSDataOutputStream, Path} import org.apache.spark.SparkConf import org.apache.spark.deploy.SparkHadoopUtil -import org.apache.spark.internal.LogKeys.PATH import org.apache.spark.internal.{Logging, MDC} +import org.apache.spark.internal.LogKeys.PATH import org.apache.spark.util.ThreadUtils diff --git a/connector/profiler/src/main/scala/org/apache/spark/executor/profiler/ExecutorProfilerPlugin.scala b/connector/profiler/src/main/scala/org/apache/spark/executor/profiler/ExecutorProfilerPlugin.scala index ff753f04868fa..b6b6221277968 100644 --- a/connector/profiler/src/main/scala/org/apache/spark/executor/profiler/ExecutorProfilerPlugin.scala +++ b/connector/profiler/src/main/scala/org/apache/spark/executor/profiler/ExecutorProfilerPlugin.scala @@ -23,8 +23,8 @@ import scala.util.Random import org.apache.spark.SparkConf import org.apache.spark.api.plugin.{DriverPlugin, ExecutorPlugin, PluginContext, SparkPlugin} -import org.apache.spark.internal.LogKeys.EXECUTOR_ID import org.apache.spark.internal.{Logging, MDC} +import org.apache.spark.internal.LogKeys.EXECUTOR_ID /** diff --git a/dev/scalastyle b/dev/scalastyle index 12457af1ae7b3..9de1fd1c9d9d5 100755 --- a/dev/scalastyle +++ b/dev/scalastyle @@ -17,7 +17,7 @@ # limitations under the License. # -SPARK_PROFILES=${1:-"-Pkubernetes -Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl -Phive-thriftserver -Phive -Pvolcano"} +SPARK_PROFILES=${1:-"-Pkubernetes -Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl -Phive-thriftserver -Phive -Pvolcano -Pjvm-profiler -Phadoop-cloud"} # NOTE: echo "q" is needed because SBT prompts the user for input on encountering a build file # with failure (either resolution or compilation); the "q" makes SBT quit.