diff options
author | Davies Liu <davies@databricks.com> | 2014-11-18 13:11:38 -0800 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2014-11-18 13:11:46 -0800 |
commit | 2d26c6248240978c6f69bf765113ced50cc70043 (patch) | |
tree | 0383509dc3c85fe7283b81c9c13a6ba4d54617d3 /core | |
parent | 9e91118455acc074635822d55738866f6cfa7715 (diff) | |
download | spark-2d26c6248240978c6f69bf765113ced50cc70043.tar.gz spark-2d26c6248240978c6f69bf765113ced50cc70043.tar.bz2 spark-2d26c6248240978c6f69bf765113ced50cc70043.zip |
[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 <davies@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
(cherry picked from commit 80f31778820586a93d73fa15279a204611cc3c60)
Signed-off-by: Andrew Or <andrew@databricks.com>
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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 aa3743ca7d..d2687faad6 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() } } }) |