Skip to content

Commit 7252612

Browse files
committed
Fix tests.
1 parent a46ad66 commit 7252612

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/DriverQueue.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,9 @@ private[mesos] class DriverQueue(state: ClusterPersistenceEngine, capacity: Int)
6060
val removed = queue.dequeueFirst(d => d.submissionId.equals(submissionId))
6161
if (removed.isDefined) {
6262
state.expunge(removed.get.submissionId)
63-
true
6463
}
6564

66-
false
65+
removed.isDefined
6766
}
6867

6968
def peek(): Option[DriverSubmission] = {

core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ private[spark] class MesosClusterScheduler(
165165
}
166166
}
167167

168-
private def recoverState {
168+
def recoverState {
169169
stateLock.synchronized {
170170
queue = new DriverQueue(engineFactory.createEngine("driverQueue"), queuedCapacity)
171171

core/src/test/scala/org/apache/spark/scheduler/mesos/MesosClusterSchedulerSuite.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class MesosClusterSchedulerSuite extends FunSuite with LocalSparkContext with Mo
3737
conf.setMaster("mesos://localhost:5050")
3838
conf.setAppName("spark mesos")
3939
val scheduler = new MesosClusterScheduler(new BlackHolePersistenceEngineFactory, conf)
40+
scheduler.recoverState
4041
val response =
4142
scheduler.submitDriver(
4243
new MesosDriverDescription(new DriverDescription("jar", 1000, 1, true, createCommand),
@@ -59,6 +60,7 @@ class MesosClusterSchedulerSuite extends FunSuite with LocalSparkContext with Mo
5960
conf.setMaster("mesos://localhost:5050")
6061
conf.setAppName("spark mesos")
6162
val scheduler = new MesosClusterScheduler(new BlackHolePersistenceEngineFactory, conf)
63+
scheduler.recoverState
6264
val response =
6365
scheduler.submitDriver(new MesosDriverDescription(
6466
new DriverDescription("jar", 1000, 1, true, createCommand),

0 commit comments

Comments
 (0)