spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zsxw...@apache.org
Subject spark git commit: [SPARK-20843][CORE] Add a config to set driver terminate timeout
Date Sat, 27 May 2017 05:25:57 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-2.1 6e6adccea -> ebd72f453


[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 <shixiong@databricks.com>

Closes #18126 from zsxwing/SPARK-20843.

(cherry picked from commit 6c1dbd6fc8d49acf7c1c902d2ebf89ed5e788a4e)
Signed-off-by: Shixiong Zhu <shixiong@databricks.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ebd72f45
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ebd72f45
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ebd72f45

Branch: refs/heads/branch-2.1
Commit: ebd72f453aa0b4f68760d28b3e93e6dd33856659
Parents: 6e6adcc
Author: Shixiong Zhu <shixiong@databricks.com>
Authored: Fri May 26 22:25:38 2017 -0700
Committer: Shixiong Zhu <shixiong@databricks.com>
Committed: Fri May 26 22:25:54 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/ebd72f45/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


Mime
View raw message