Skip to content

[SPARK-20863] Add metrics/instrumentation to LiveListenerBus #18083

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

Closed
JoshRosen wants to merge 12 commits into from
Closed

[SPARK-20863] Add metrics/instrumentation to LiveListenerBus #18083

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a1fb5a8
WIP
JoshRosen May 23, 2017
a46c247
Fix test compilation
JoshRosen May 24, 2017
378206e
Mock in EventLoggingListenerSuite
JoshRosen May 24, 2017
37a1a7d
Address Wenchen's review comments.
JoshRosen May 25, 2017
3b713a3
Add per-listener timing statistics.
JoshRosen May 25, 2017
60c7448
Protect against registering thousands of listener classes.
JoshRosen May 26, 2017
dcecdae
Merge remote-tracking branch 'origin/master' into listener-bus-metrics
JoshRosen Jun 5, 2017
4a083de
Minor cleanups.
JoshRosen Jun 5, 2017
d1a5e99
Add test for per-listener-class timer; rename method.
JoshRosen Jun 5, 2017
b8164b2
Merge remote-tracking branch 'origin/master' into listener-bus-metrics
JoshRosen Jun 8, 2017
f36fbaa
Use Option.
JoshRosen Jun 8, 2017
76b669c
Add configuration.
JoshRosen Jun 8, 2017
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
Next Next commit
Use Option.
  • Loading branch information
@JoshRosen
JoshRosen committed Jun 8, 2017
commit f36fbaaa4d0a69de163e22f9a7514adc02e837b5
8 changes: 4 additions & 4 deletions core/src/main/scala/org/apache/spark/util/ListenerBus.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import org.apache.spark.internal.Logging
*/
private[spark] trait ListenerBus[L <: AnyRef, E] extends Logging {

private[this] val listenersPlusTimers = new CopyOnWriteArrayList[(L, Timer)]
private[this] val listenersPlusTimers = new CopyOnWriteArrayList[(L, Option[Timer])]

// Marked `private[spark]` for access in tests.
private[spark] def listeners = listenersPlusTimers.asScala.map(_._1).asJava
Expand All @@ -47,7 +47,7 @@ private[spark] trait ListenerBus[L <: AnyRef, E] extends Logging {
* Add a listener to listen events. This method is thread-safe and can be called in any thread.
*/
final def addListener(listener: L): Unit = {
listenersPlusTimers.add((listener, getTimer(listener).orNull))
listenersPlusTimers.add((listener, getTimer(listener)))
}

/**
Expand All @@ -73,8 +73,8 @@ private[spark] trait ListenerBus[L <: AnyRef, E] extends Logging {
val listenerAndMaybeTimer = iter.next()
val listener = listenerAndMaybeTimer._1
val maybeTimer = listenerAndMaybeTimer._2
val maybeTimerContext = if (maybeTimer != null) {
maybeTimer.time()
val maybeTimerContext = if (maybeTimer.isDefined) {
maybeTimer.get.time()
} else {
null
}
Expand Down