Skip to content

[SPARK-47383][CORE] Support spark.shutdown.timeout config #45504

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 5 commits into from
+27 −2
Closed

[SPARK-47383][CORE] Support spark.shutdown.timeout config #45504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
034eea4
Added timeout. Still need to test
robreeves Mar 12, 2024
1131d8f
Updated config doc
robreeves Mar 13, 2024
cfae485
code comment
robreeves Mar 13, 2024
a7e94d4
fix imports
robreeves Mar 13, 2024
a61a139
added internal to config
robreeves Mar 18, 2024
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: 10 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 @@ -2666,4 +2666,14 @@ package object config {
.version("4.0.0")
.booleanConf
.createWithDefault(false)

private[spark] val SPARK_SHUTDOWN_TIMEOUT_MS =
ConfigBuilder("spark.shutdown.timeout")
.internal()
.doc("Defines the timeout period to wait for all shutdown hooks to be executed. " +
"This must be passed as a system property argument in the Java options, for example " +
"spark.driver.extraJavaOptions=\"-Dspark.shutdown.timeout=60s\".")
.version("4.0.0")
.timeConf(TimeUnit.MILLISECONDS)
.createOptional
}
19 changes: 17 additions & 2 deletions core/src/main/scala/org/apache/spark/util/ShutdownHookManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,16 @@ package org.apache.spark.util

import java.io.File
import java.util.PriorityQueue
import java.util.concurrent.TimeUnit

import scala.util.Try

import org.apache.hadoop.fs.FileSystem

import org.apache.spark.SparkConf
import org.apache.spark.internal.Logging
import org.apache.spark.internal.config.SPARK_SHUTDOWN_TIMEOUT_MS


/**
* Various utility methods used by Spark.
Expand Down Expand Up @@ -177,8 +181,19 @@ private [util] class SparkShutdownHookManager {
val hookTask = new Runnable() {
override def run(): Unit = runAll()
}
org.apache.hadoop.util.ShutdownHookManager.get().addShutdownHook(
hookTask, FileSystem.SHUTDOWN_HOOK_PRIORITY + 30)
val priority = FileSystem.SHUTDOWN_HOOK_PRIORITY + 30
// The timeout property must be passed as a Java system property because this
// is initialized before Spark configurations are registered as system
// properties later in initialization.
val timeout = new SparkConf().get(SPARK_SHUTDOWN_TIMEOUT_MS)

timeout.fold {
org.apache.hadoop.util.ShutdownHookManager.get().addShutdownHook(
hookTask, priority)
} { t =>
org.apache.hadoop.util.ShutdownHookManager.get().addShutdownHook(
hookTask, priority, t, TimeUnit.MILLISECONDS)
}
}

def runAll(): Unit = {
Expand Down