Skip to content

[SPARK-5095] Fix style in mesos coarse grained scheduler code #11187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SPARK-5095] Fix style in mesos coarse grained scheduler code #11187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions ...est/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackendSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down