diff options
| author | Sandy Ryza <sandy@cloudera.com> | 2014-08-15 11:35:08 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-08-15 11:35:08 -0700 |
| commit | 0afe5cb65a195d2f14e8dfcefdbec5dac023651f (patch) | |
| tree | 4c9e114c3ca2c23bd0f319008c68d06630d66076 /core | |
| parent | fd9fcd25e93c727b327909cde0027426204ca6c3 (diff) | |
| download | spark-0afe5cb65a195d2f14e8dfcefdbec5dac023651f.tar.gz spark-0afe5cb65a195d2f14e8dfcefdbec5dac023651f.tar.bz2 spark-0afe5cb65a195d2f14e8dfcefdbec5dac023651f.zip | |
SPARK-3028. sparkEventToJson should support SparkListenerExecutorMetrics...
...Update
Author: Sandy Ryza <sandy@cloudera.com>
Closes #1961 from sryza/sandy-spark-3028 and squashes the following commits:
dccdff5 [Sandy Ryza] Fix compile error
f883ded [Sandy Ryza] SPARK-3028. sparkEventToJson should support SparkListenerExecutorMetricsUpdate
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/util/JsonProtocol.scala | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala b/core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala index 406147f167..7378ce923f 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala @@ -127,6 +127,8 @@ private[spark] class EventLoggingListener( logEvent(event, flushLogger = true) override def onApplicationEnd(event: SparkListenerApplicationEnd) = logEvent(event, flushLogger = true) + // No-op because logging every update would be overkill + override def onExecutorMetricsUpdate(event: SparkListenerExecutorMetricsUpdate) { } /** * Stop logging events. diff --git a/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala b/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala index 6f8eb1ee12..1e18ec688c 100644 --- a/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala +++ b/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala @@ -72,8 +72,9 @@ private[spark] object JsonProtocol { case applicationEnd: SparkListenerApplicationEnd => applicationEndToJson(applicationEnd) - // Not used, but keeps compiler happy + // These aren't used, but keeps compiler happy case SparkListenerShutdown => JNothing + case SparkListenerExecutorMetricsUpdate(_, _) => JNothing } } |