Skip to content

[SPARK-20131][Core]Don't use this lock in StandaloneSchedulerBackend.stop #17610

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 3 commits into from
Closed

[SPARK-20131][Core]Don't use this lock in StandaloneSchedulerBackend.stop #17610

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6d0841
Use a separate lock for stop
zsxwing Apr 11, 2017
0d79882
Change stopping to AtomicBoolean
zsxwing Apr 13, 2017
929061c
Remove lock
zsxwing Apr 13, 2017
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
33 changes: 17 additions & 16 deletions core/src/main/scala/org/apache/spark/scheduler/cluster/StandaloneSchedulerBackend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.spark.scheduler.cluster

import java.util.concurrent.Semaphore
import java.util.concurrent.atomic.AtomicBoolean

import scala.concurrent.Future

Expand All @@ -42,7 +43,7 @@ private[spark] class StandaloneSchedulerBackend(
with Logging {

private var client: StandaloneAppClient = null
private var stopping = false
private val stopping = new AtomicBoolean(false)
private val launcherBackend = new LauncherBackend() {
override protected def onStopRequest(): Unit = stop(SparkAppHandle.State.KILLED)
}
Expand Down Expand Up @@ -112,7 +113,7 @@ private[spark] class StandaloneSchedulerBackend(
launcherBackend.setState(SparkAppHandle.State.RUNNING)
}

override def stop(): Unit = synchronized {
override def stop(): Unit = {
stop(SparkAppHandle.State.FINISHED)
}

Expand All @@ -125,14 +126,14 @@ private[spark] class StandaloneSchedulerBackend(

override def disconnected() {
notifyContext()
if (!stopping) {
if (!stopping.get) {
logWarning("Disconnected from Spark cluster! Waiting for reconnection...")
}
}

override def dead(reason: String) {
notifyContext()
if (!stopping) {
if (!stopping.get) {
launcherBackend.setState(SparkAppHandle.State.KILLED)
logError("Application has been killed. Reason: " + reason)
try {
Expand Down Expand Up @@ -206,20 +207,20 @@ private[spark] class StandaloneSchedulerBackend(
registrationBarrier.release()
}

private def stop(finalState: SparkAppHandle.State): Unit = synchronized {
try {
stopping = true

super.stop()
client.stop()
private def stop(finalState: SparkAppHandle.State): Unit = {
if (stopping.compareAndSet(false, true)) {
try {
super.stop()
client.stop()

val callback = shutdownCallback
if (callback != null) {
callback(this)
val callback = shutdownCallback
if (callback != null) {
callback(this)
}
} finally {
launcherBackend.setState(finalState)
launcherBackend.close()
}
} finally {
launcherBackend.setState(finalState)
launcherBackend.close()
}
}

Expand Down