diff options
| author | Sean Owen <sowen@cloudera.com> | 2015-02-26 12:56:54 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-02-26 12:56:54 -0800 |
| commit | cd5c8d7bbd3ea410df08af6cdd3833e0ed4b91a0 (patch) | |
| tree | 92c19e62bd1ff4c31a96da1efc8eb83f9918102b /core | |
| parent | 7fa960e653a905fc48d4097b49ce560cff919fa2 (diff) | |
| download | spark-cd5c8d7bbd3ea410df08af6cdd3833e0ed4b91a0.tar.gz spark-cd5c8d7bbd3ea410df08af6cdd3833e0ed4b91a0.tar.bz2 spark-cd5c8d7bbd3ea410df08af6cdd3833e0ed4b91a0.zip | |
SPARK-4704 [CORE] SparkSubmitDriverBootstrap doesn't flush output
Join on output threads to make sure any lingering output from process reaches stdout, stderr before exiting
CC andrewor14 since I believe he created this section of code
Author: Sean Owen <sowen@cloudera.com>
Closes #4788 from srowen/SPARK-4704 and squashes the following commits:
ad7114e [Sean Owen] Join on output threads to make sure any lingering output from process reaches stdout, stderr before exiting
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala | 4 |
1 files changed, 2 insertions, 2 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 2eab998184..311048cdaa 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala @@ -17,8 +17,6 @@ package org.apache.spark.deploy -import java.io.File - import scala.collection.JavaConversions._ import org.apache.spark.util.{RedirectThread, Utils} @@ -164,6 +162,8 @@ private[spark] object SparkSubmitDriverBootstrapper { } } val returnCode = process.waitFor() + stdoutThread.join() + stderrThread.join() sys.exit(returnCode) } |