Skip to content

Commit 42d60c2

Browse files
committed
address comments
1 parent ac3f9f5 commit 42d60c2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

core/src/main/scala/org/apache/spark/executor/Executor.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,8 @@ private[spark] class Executor(
436436
val res = task.run(
437437
taskAttemptId = taskId,
438438
attemptNumber = taskDescription.attemptNumber,
439-
executorPlugins = executorPlugins,
440-
metricsSystem = env.metricsSystem)
439+
metricsSystem = env.metricsSystem,
440+
executorPlugins = executorPlugins)
441441
threwException = false
442442
res
443443
} {

core/src/main/scala/org/apache/spark/scheduler/Task.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private[spark] abstract class Task[T](
8383
taskAttemptId: Long,
8484
attemptNumber: Int,
8585
metricsSystem: MetricsSystem,
86-
executorPlugins: Seq[ExecutorPlugin]): T = {
86+
executorPlugins: Seq[ExecutorPlugin] = Seq.empty): T = {
8787
SparkEnv.get.blockManager.registerTask(taskAttemptId)
8888
// TODO SPARK-24874 Allow create BarrierTaskContext based on partitions, instead of whether
8989
// the stage is barrier.

core/src/test/scala/org/apache/spark/scheduler/TaskContextSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class TaskContextSuite extends SparkFunSuite with BeforeAndAfter with LocalSpark
7070
0, 0, taskBinary, rdd.partitions(0), Seq.empty, 0, new Properties,
7171
closureSerializer.serialize(TaskMetrics.registered).array())
7272
intercept[RuntimeException] {
73-
task.run(0, 0, null, Seq.empty)
73+
task.run(0, 0, null)
7474
}
7575
assert(TaskContextSuite.completed === true)
7676
}
@@ -92,7 +92,7 @@ class TaskContextSuite extends SparkFunSuite with BeforeAndAfter with LocalSpark
9292
0, 0, taskBinary, rdd.partitions(0), Seq.empty, 0, new Properties,
9393
closureSerializer.serialize(TaskMetrics.registered).array())
9494
intercept[RuntimeException] {
95-
task.run(0, 0, null, Seq.empty)
95+
task.run(0, 0, null)
9696
}
9797
assert(TaskContextSuite.lastError.getMessage == "damn error")
9898
}

0 commit comments

Comments
 (0)