You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2014/11/18 22:11:42 UTC
spark git commit: [SPARK-4404] remove sys.exit() in shutdown hook
Repository: spark
Updated Branches:
refs/heads/master bfebfd8b2 -> 80f317788
[SPARK-4404] remove sys.exit() in shutdown hook
If SparkSubmit die first, then bootstrapper will be blocked by shutdown hook. sys.exit() in a shutdown hook will cause some kind of dead lock.
cc andrewor14
Author: Davies Liu <da...@databricks.com>
Closes #3289 from davies/fix_bootstraper and squashes the following commits:
ea5cdd1 [Davies Liu] Merge branch 'master' of github.com:apache/spark into fix_bootstraper
e04b690 [Davies Liu] remove sys.exit in hook
4d11366 [Davies Liu] remove shutdown hook if subprocess die fist
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/80f31778
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/80f31778
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/80f31778
Branch: refs/heads/master
Commit: 80f31778820586a93d73fa15279a204611cc3c60
Parents: bfebfd8
Author: Davies Liu <da...@databricks.com>
Authored: Tue Nov 18 13:11:38 2014 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Tue Nov 18 13:11:38 2014 -0800
----------------------------------------------------------------------
.../org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/80f31778/core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala
index aa3743c..d2687fa 100644
--- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala
@@ -134,7 +134,7 @@ private[spark] object SparkSubmitDriverBootstrapper {
override def run() = {
if (process != null) {
process.destroy()
- sys.exit(process.waitFor())
+ process.waitFor()
}
}
})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org