Addressed review comments.

apache · May 26, 2020 · e2ebe65 · e2ebe65
1 parent 52c22ce
commit e2ebe65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/src/main/scala/org/apache/spark/executor/Executor.scala b/core/src/main/scala/org/apache/spark/executor/Executor.scala
@@ -121,7 +121,7 @@ private[spark] class Executor(
   // create. The map key is a task id.
   private val taskReaperForTask: HashMap[Long, TaskReaper] = HashMap[Long, TaskReaper]()
 
-  private val executorMetricsSource =
+  val executorMetricsSource =
     if (conf.get(METRICS_EXECUTORMETRICS_SOURCE_ENABLED)) {
       Some(new ExecutorMetricsSource)
     } else {
@@ -138,7 +138,6 @@ private[spark] class Executor(
     Executor.executorSource = executorSource
   }
 
-
   // Whether to load classes in user jars before those in Spark jars
   private val userClassPathFirst = conf.get(EXECUTOR_USER_CLASS_PATH_FIRST)
 
@@ -954,5 +953,5 @@ private[spark] object Executor {
   val taskDeserializationProps: ThreadLocal[Properties] = new ThreadLocal[Properties]
 
   // Used to store executorSource, for local mode only
-  var executorSource: ExecutorSource = _
+  var executorSource: ExecutorSource = null
 }
diff --git a/core/src/test/scala/org/apache/spark/metrics/source/SourceConfigSuite.scala b/core/src/test/scala/org/apache/spark/metrics/source/SourceConfigSuite.scala
@@ -80,7 +80,7 @@ class SourceConfigSuite extends SparkFunSuite with LocalSparkContext {
     }
   }
 
-  test("Test executor source registration in local mode") {
+  test("SPARK-31711: Test executor source registration in local mode") {
     val conf = new SparkConf()
     val sc = new SparkContext("local", "test", conf)
     try {