diff options
| author | Reynold Xin <rxin@cs.berkeley.edu> | 2013-08-15 17:45:17 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@cs.berkeley.edu> | 2013-08-15 17:45:17 -0700 |
| commit | 230ab2722ebd399afcf64c1a131f4929f602177d (patch) | |
| tree | 59a601b0394eb7626df5928736ca392ec07c39f9 /core | |
| parent | 659553b21ddd7504889ce113a816c1db4a73f167 (diff) | |
| parent | ad2e8b512654314d68f4b7c149950756943992be (diff) | |
| download | spark-230ab2722ebd399afcf64c1a131f4929f602177d.tar.gz spark-230ab2722ebd399afcf64c1a131f4929f602177d.tar.bz2 spark-230ab2722ebd399afcf64c1a131f4929f602177d.zip | |
Merge pull request #834 from Daemoen/master
Updated json output to allow for display of worker state
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/deploy/JsonProtocol.scala | 3 |
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..9901bb8a8c 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.getState) } def writeApplicationInfo(obj: ApplicationInfo) = { |