diff options
author | Michael Gummelt <mgummelt@mesosphere.io> | 2016-02-12 14:57:31 -0800 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2016-02-12 14:57:31 -0800 |
commit | 38bc6018e922877fdf43c90b24cc0438262eb157 (patch) | |
tree | 2c0ee5306f627d88b52cf7abced7acbcb1b89d44 /core/src | |
parent | 42d656814f756599a2bc426f0e1f32bd4cc4470f (diff) | |
download | spark-38bc6018e922877fdf43c90b24cc0438262eb157.tar.gz spark-38bc6018e922877fdf43c90b24cc0438262eb157.tar.bz2 spark-38bc6018e922877fdf43c90b24cc0438262eb157.zip |
[SPARK-5095] Fix style in mesos coarse grained scheduler code
andrewor14 This addressed your style comments from #10993
Author: Michael Gummelt <mgummelt@mesosphere.io>
Closes #11187 from mgummelt/fix_mesos_style.
Diffstat (limited to 'core/src')
2 files changed, 12 insertions, 10 deletions
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala index 98699e0b29..f803cc7a36 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala @@ -124,6 +124,7 @@ private[spark] class CoarseMesosSchedulerBackend( } } + // This method is factored out for testability protected def getShuffleClient(): MesosExternalShuffleClient = { new MesosExternalShuffleClient( SparkTransportConf.fromSparkConf(conf, "shuffle"), @@ -518,10 +519,11 @@ private[spark] class CoarseMesosSchedulerBackend( * Called when a slave is lost or a Mesos task finished. Updates local view on * what tasks are running. It also notifies the driver that an executor was removed. */ - private def executorTerminated(d: SchedulerDriver, - slaveId: String, - taskId: String, - reason: String): Unit = { + private def executorTerminated( + d: SchedulerDriver, + slaveId: String, + taskId: String, + reason: String): Unit = { stateLock.synchronized { removeExecutor(taskId, SlaveLost(reason)) slaves(slaveId).taskIDs.remove(taskId) diff --git a/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackendSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackendSuite.scala index e542aa0cfc..5e01d95fc3 100644 --- a/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackendSuite.scala +++ b/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackendSuite.scala @@ -41,12 +41,12 @@ class CoarseMesosSchedulerBackendSuite extends SparkFunSuite with MockitoSugar with BeforeAndAfter { - var sparkConf: SparkConf = _ - var driver: SchedulerDriver = _ - var taskScheduler: TaskSchedulerImpl = _ - var backend: CoarseMesosSchedulerBackend = _ - var externalShuffleClient: MesosExternalShuffleClient = _ - var driverEndpoint: RpcEndpointRef = _ + private var sparkConf: SparkConf = _ + private var driver: SchedulerDriver = _ + private var taskScheduler: TaskSchedulerImpl = _ + private var backend: CoarseMesosSchedulerBackend = _ + private var externalShuffleClient: MesosExternalShuffleClient = _ + private var driverEndpoint: RpcEndpointRef = _ test("mesos supports killing and limiting executors") { setBackend() |