spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andrewo...@apache.org
Subject spark git commit: SPARK-4300 [CORE] Race condition during SparkWorker shutdown
Date Thu, 26 Feb 2015 22:09:04 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.2 2d83442f2 -> 64e0cbc73


SPARK-4300 [CORE] Race condition during SparkWorker shutdown

Close appender saving stdout/stderr before destroying process to avoid exception on reading
closed input stream.
(This also removes a redundant `waitFor()` although it was harmless)

CC tdas since I think you wrote this method.

Author: Sean Owen <sowen@cloudera.com>

Closes #4787 from srowen/SPARK-4300 and squashes the following commits:

e0cdabf [Sean Owen] Close appender saving stdout/stderr before destroying process to avoid
exception on reading closed input stream

(cherry picked from commit 3fb53c0298761ba227890525ae79ce4ec6300deb)
Signed-off-by: Andrew Or <andrew@databricks.com>


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

Branch: refs/heads/branch-1.2
Commit: 64e0cbc731c38028afeac62d881573452a86058f
Parents: 2d83442
Author: Sean Owen <sowen@cloudera.com>
Authored: Thu Feb 26 14:08:56 2015 -0800
Committer: Andrew Or <andrew@databricks.com>
Committed: Thu Feb 26 14:09:03 2015 -0800

----------------------------------------------------------------------
 .../scala/org/apache/spark/deploy/worker/ExecutorRunner.scala     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/64e0cbc7/core/src/main/scala/org/apache/spark/deploy/worker/ExecutorRunner.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ExecutorRunner.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ExecutorRunner.scala
index acbdf0d..1876408 100644
--- a/core/src/main/scala/org/apache/spark/deploy/worker/ExecutorRunner.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/ExecutorRunner.scala
@@ -84,14 +84,13 @@ private[spark] class ExecutorRunner(
     var exitCode: Option[Int] = None
     if (process != null) {
       logInfo("Killing process!")
-      process.destroy()
-      process.waitFor()
       if (stdoutAppender != null) {
         stdoutAppender.stop()
       }
       if (stderrAppender != null) {
         stderrAppender.stop()
       }
+      process.destroy()
       exitCode = Some(process.waitFor())
     }
     worker ! ExecutorStateChanged(appId, execId, state, message, exitCode)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message