From 0afe5cb65a195d2f14e8dfcefdbec5dac023651f Mon Sep 17 00:00:00 2001
From: Sandy Ryza <sandy@cloudera.com>
Date: Fri, 15 Aug 2014 11:35:08 -0700
Subject: [PATCH] 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
---
.../org/apache/spark/scheduler/EventLoggingListener.scala | 2 ++
core/src/main/scala/org/apache/spark/util/JsonProtocol.scala | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
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
}
}
--
GitLab