Skip to content

[SPARK-32236][CORE] Local cluster should shutdown gracefully #29049

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

[SPARK-32236][CORE] Local cluster should shutdown gracefully #29049

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
2 changes: 2 additions & 0 deletions core/src/main/scala/org/apache/spark/deploy/LocalSparkCluster.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class LocalSparkCluster(
private val localHostname = Utils.localHostName()
private val masterRpcEnvs = ArrayBuffer[RpcEnv]()
private val workerRpcEnvs = ArrayBuffer[RpcEnv]()
private val shutdownWaitTimeout = conf.get(config.LOCAL_CLUSTER_SHUTDOWN_WAIT_TIMEOUT)
// exposed for testing
var masterWebUIPort = -1

Expand Down Expand Up @@ -75,6 +76,7 @@ class LocalSparkCluster(
def stop(): Unit = {
logInfo("Shutting down local Spark cluster.")
// Stop the workers before the master so they don't get upset that it disconnected
Thread.sleep(shutdownWaitTimeout)
workerRpcEnvs.foreach(_.shutdown())
masterRpcEnvs.foreach(_.shutdown())
workerRpcEnvs.foreach(_.awaitTermination())
Expand Down
8 changes: 8 additions & 0 deletions core/src/main/scala/org/apache/spark/internal/config/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1873,4 +1873,12 @@ package object config {
.version("3.1.0")
.booleanConf
.createWithDefault(false)

private[spark] val LOCAL_CLUSTER_SHUTDOWN_WAIT_TIMEOUT =
ConfigBuilder("spark.localCluster.shutdown.wait.timeoutMs")
.internal()
.doc("Timeout in milliseconds for waiting for local cluster to shutdown.")
.version("3.1.0")
.timeConf(TimeUnit.MILLISECONDS)
.createWithDefault(1000)
}