aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJosh Rosen <joshrosen@apache.org>2013-10-20 14:49:05 -0700
committerJosh Rosen <joshrosen@apache.org>2013-10-20 14:49:05 -0700
commit640f253a6572208efa24a36a6442ac08a266cf24 (patch)
tree4ced31fbacdb130e9aa860dd2d7acd3a19634ff3 /core
parent9159d2d09d459e8879fee2222edd53860adc2b44 (diff)
downloadspark-640f253a6572208efa24a36a6442ac08a266cf24.tar.gz
spark-640f253a6572208efa24a36a6442ac08a266cf24.tar.bz2
spark-640f253a6572208efa24a36a6442ac08a266cf24.zip
Fix test failures in local mode due to updateEpoch
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/MapOutputTracker.scala5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/src/main/scala/org/apache/spark/MapOutputTracker.scala b/core/src/main/scala/org/apache/spark/MapOutputTracker.scala
index f0f8f2d2c7..43e32602e5 100644
--- a/core/src/main/scala/org/apache/spark/MapOutputTracker.scala
+++ b/core/src/main/scala/org/apache/spark/MapOutputTracker.scala
@@ -273,10 +273,7 @@ private[spark] class MapOutputTrackerMaster extends MapOutputTracker {
}
override def updateEpoch(newEpoch: Long) {
- // This might be called on the MapOutputTrackerMaster if we're running in local mode:
- epochLock.synchronized {
- assert (newEpoch == epoch)
- }
+ // This might be called on the MapOutputTrackerMaster if we're running in local mode.
}
}