diff options
author | Jacek Lewandowski <lewandowski.jacek@gmail.com> | 2014-08-14 15:01:39 -0700 |
---|---|---|
committer | Andrew Or <andrewor14@gmail.com> | 2014-08-14 15:02:26 -0700 |
commit | a75bc7a21db07258913d038bf604c0a3c1e55b46 (patch) | |
tree | 5d6ab29fcdd208b5c5c03d0fab254eb44de387fa | |
parent | a7f8a4f5ee757450ce8d4028021441435081cf53 (diff) | |
download | spark-a75bc7a21db07258913d038bf604c0a3c1e55b46.tar.gz spark-a75bc7a21db07258913d038bf604c0a3c1e55b46.tar.bz2 spark-a75bc7a21db07258913d038bf604c0a3c1e55b46.zip |
SPARK-3009: Reverted readObject method in ApplicationInfo so that Applic...
...ationInfo is initialized properly after deserialization
Author: Jacek Lewandowski <lewandowski.jacek@gmail.com>
Closes #1947 from jacek-lewandowski/master and squashes the following commits:
713b2f1 [Jacek Lewandowski] SPARK-3009: Reverted readObject method in ApplicationInfo so that ApplicationInfo is initialized properly after deserialization
-rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala b/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala index 72d0589689..d3674427b1 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala @@ -46,6 +46,11 @@ private[spark] class ApplicationInfo( init() + private def readObject(in: java.io.ObjectInputStream): Unit = { + in.defaultReadObject() + init() + } + private def init() { state = ApplicationState.WAITING executors = new mutable.HashMap[Int, ExecutorInfo] |