You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by zs...@apache.org on 2017/05/27 05:25:41 UTC
spark git commit: [SPARK-20843][CORE] Add a config to set driver
terminate timeout
Repository: spark
Updated Branches:
refs/heads/master a0f8a072e -> 6c1dbd6fc
[SPARK-20843][CORE] Add a config to set driver terminate timeout
## What changes were proposed in this pull request?
Add a `worker` configuration to set how long to wait before forcibly killing driver.
## How was this patch tested?
Jenkins
Author: Shixiong Zhu <sh...@databricks.com>
Closes #18126 from zsxwing/SPARK-20843.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6c1dbd6f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6c1dbd6f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6c1dbd6f
Branch: refs/heads/master
Commit: 6c1dbd6fc8d49acf7c1c902d2ebf89ed5e788a4e
Parents: a0f8a07
Author: Shixiong Zhu <sh...@databricks.com>
Authored: Fri May 26 22:25:38 2017 -0700
Committer: Shixiong Zhu <sh...@databricks.com>
Committed: Fri May 26 22:25:38 2017 -0700
----------------------------------------------------------------------
.../main/scala/org/apache/spark/deploy/worker/DriverRunner.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/6c1dbd6f/core/src/main/scala/org/apache/spark/deploy/worker/DriverRunner.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/DriverRunner.scala b/core/src/main/scala/org/apache/spark/deploy/worker/DriverRunner.scala
index e878c10..58a1811 100644
--- a/core/src/main/scala/org/apache/spark/deploy/worker/DriverRunner.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/DriverRunner.scala
@@ -57,7 +57,8 @@ private[deploy] class DriverRunner(
@volatile private[worker] var finalException: Option[Exception] = None
// Timeout to wait for when trying to terminate a driver.
- private val DRIVER_TERMINATE_TIMEOUT_MS = 10 * 1000
+ private val DRIVER_TERMINATE_TIMEOUT_MS =
+ conf.getTimeAsMs("spark.worker.driverTerminateTimeout", "10s")
// Decoupled for testing
def setClock(_clock: Clock): Unit = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org