Skip to content

[SPARK-10124] [MESOS] Fix removing queued driver in mesos cluster mode. #8322

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
tnachen wants to merge 1 commit into from
Closed

[SPARK-10124] [MESOS] Fix removing queued driver in mesos cluster mode. #8322

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
19 changes: 11 additions & 8 deletions core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,14 +507,16 @@ private[spark] class MesosClusterScheduler(
val driversToRetry = pendingRetryDrivers.filter { d =>
d.retryState.get.nextRetry.before(currentTime)
}

scheduleTasks(
driversToRetry,
copyBuffer(driversToRetry),
removeFromPendingRetryDrivers,
currentOffers,
tasks)

// Then we walk through the queued drivers and try to schedule them.
scheduleTasks(
queuedDrivers,
copyBuffer(queuedDrivers),
removeFromQueuedDrivers,
currentOffers,
tasks)
Expand All @@ -527,13 +529,14 @@ private[spark] class MesosClusterScheduler(
.foreach(o => driver.declineOffer(o.getId))
}

private def copyBuffer(
buffer: ArrayBuffer[MesosDriverDescription]): ArrayBuffer[MesosDriverDescription] = {
val newBuffer = new ArrayBuffer[MesosDriverDescription](buffer.size)
buffer.copyToBuffer(newBuffer)
newBuffer
}

def getSchedulerState(): MesosClusterSchedulerState = {
def copyBuffer(
buffer: ArrayBuffer[MesosDriverDescription]): ArrayBuffer[MesosDriverDescription] = {
val newBuffer = new ArrayBuffer[MesosDriverDescription](buffer.size)
buffer.copyToBuffer(newBuffer)
newBuffer
}
stateLock.synchronized {
new MesosClusterSchedulerState(
frameworkId,
Expand Down