You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/04/13 01:33:46 UTC
git commit: [Fix #204] Update out-dated comments
Repository: spark
Updated Branches:
refs/heads/master 6aa08c39c -> c2d160fbe
[Fix #204] Update out-dated comments
This PR is self-explanatory.
Author: Andrew Or <an...@gmail.com>
Closes #381 from andrewor14/master and squashes the following commits:
3e8dde2 [Andrew Or] Fix comments for #204
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c2d160fb
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c2d160fb
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c2d160fb
Branch: refs/heads/master
Commit: c2d160fbee2ef90a7683d9771f2f632b68d74aef
Parents: 6aa08c3
Author: Andrew Or <an...@gmail.com>
Authored: Sat Apr 12 16:33:38 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sat Apr 12 16:33:38 2014 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkContext.scala | 6 +-----
.../scala/org/apache/spark/scheduler/ReplayListenerBus.scala | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/c2d160fb/core/src/main/scala/org/apache/spark/SparkContext.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index a764c17..5a36e6f 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -1191,11 +1191,7 @@ class SparkContext(config: SparkConf) extends Logging {
listenerBus.post(SparkListenerApplicationStart(appName, startTime, sparkUser))
}
- /**
- * Post the application end event to all listeners immediately, rather than adding it
- * to the event queue for it to be asynchronously processed eventually. Otherwise, a race
- * condition exists in which the listeners may stop before this event has been propagated.
- */
+ /** Post the application end event */
private def postApplicationEnd() {
listenerBus.post(SparkListenerApplicationEnd(System.currentTimeMillis))
}
http://git-wip-us.apache.org/repos/asf/spark/blob/c2d160fb/core/src/main/scala/org/apache/spark/scheduler/ReplayListenerBus.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/ReplayListenerBus.scala b/core/src/main/scala/org/apache/spark/scheduler/ReplayListenerBus.scala
index f868e77..f89724d 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/ReplayListenerBus.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/ReplayListenerBus.scala
@@ -31,8 +31,8 @@ import org.apache.spark.util.JsonProtocol
/**
* A SparkListenerBus that replays logged events from persisted storage.
*
- * This class expects files to be appropriately prefixed as specified in EventLoggingListener.
- * There exists a one-to-one mapping between ReplayListenerBus and event logging applications.
+ * This assumes the given paths are valid log files, where each line can be deserialized into
+ * exactly one SparkListenerEvent.
*/
private[spark] class ReplayListenerBus(
logPaths: Seq[Path],