Skip to content

A merge of latest changes since creation #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yzhou2001 merged 13 commits into from
Aug 14, 2014
Merged

A merge of latest changes since creation #1

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9497b12
[SPARK-3006] Failed to execute spark-shell in Windows OS
tsudukim Aug 14, 2014
e424565
[Docs] Add missing <code> tags (minor)
andrewor14 Aug 14, 2014
69a57a1
[SPARK-2995][MLLIB] add ALS.setIntermediateRDDStorageLevel
mengxr Aug 14, 2014
d069c5d
[SPARK-3029] Disable local execution of Spark jobs by default
aarondav Aug 14, 2014
6b8de0e
SPARK-2893: Do not swallow Exceptions when running a custom kryo regi…
GrahamDennis Aug 14, 2014
078f3fb
[SPARK-3011][SQL] _temporary directory should be filtered out by sqlC…
josephsu Aug 14, 2014
add75d4
[SPARK-2927][SQL] Add a conf to configure if we always read Binary co…
yhuai Aug 14, 2014
fde692b
[SQL] Python JsonRDD UTF8 Encoding Fix
ahirreddy Aug 14, 2014
267fdff
[SPARK-2925] [sql]fix spark-sql and start-thriftserver shell bugs whe…
scwf Aug 14, 2014
eaeb0f7
Minor cleanup of metrics.Source
rxin Aug 14, 2014
9622106
[SPARK-2979][MLlib] Improve the convergence rate by minimizing the co…
Aug 14, 2014
a7f8a4f
Revert [SPARK-3011][SQL] _temporary directory should be filtered out…
marmbrus Aug 14, 2014
a75bc7a
SPARK-3009: Reverted readObject method in ApplicationInfo so that App…
jacek-lewandowski Aug 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
SPARK-3009: Reverted readObject method in ApplicationInfo so that App… 
…lic...

...ationInfo is initialized properly after deserialization

Author: Jacek Lewandowski <[email protected]>

Closes apache#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
  • Loading branch information
@jacek-lewandowski @andrewor14
jacek-lewandowski authored and andrewor14 committed Aug 14, 2014
commit a75bc7a21db07258913d038bf604c0a3c1e55b46
5 changes: 5 additions & 0 deletions core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down