aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorReynold Xin <reynoldx@gmail.com>2013-08-26 11:21:03 -0700
committerReynold Xin <reynoldx@gmail.com>2013-08-26 11:21:03 -0700
commita77e0abb96c4d4cd35822656e57b99320a16aec2 (patch)
tree0b7212f8f4b395e4bb508c33fe374cf43a0d1d39 /core
parent9db1e50344cc49810c8549b5b3022038c64e4dfa (diff)
downloadspark-a77e0abb96c4d4cd35822656e57b99320a16aec2.tar.gz
spark-a77e0abb96c4d4cd35822656e57b99320a16aec2.tar.bz2
spark-a77e0abb96c4d4cd35822656e57b99320a16aec2.zip
Added worker state to the cluster master JSON ui.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/spark/deploy/JsonProtocol.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/deploy/JsonProtocol.scala b/core/src/main/scala/spark/deploy/JsonProtocol.scala
index bd1db7c294..f8dcf025b4 100644
--- a/core/src/main/scala/spark/deploy/JsonProtocol.scala
+++ b/core/src/main/scala/spark/deploy/JsonProtocol.scala
@@ -33,7 +33,8 @@ private[spark] object JsonProtocol {
("cores" -> obj.cores) ~
("coresused" -> obj.coresUsed) ~
("memory" -> obj.memory) ~
- ("memoryused" -> obj.memoryUsed)
+ ("memoryused" -> obj.memoryUsed) ~
+ ("state" -> obj.state.toString)
}
def writeApplicationInfo(obj: ApplicationInfo) = {