Merge branch 'master' into mesos-0.9

core/src/main/scala/spark/BoundedMemoryCache.scala

@@ -70,5 +70,6 @@ class BoundedMemoryCache extends Cache with Logging {
 
   protected def dropEntry(key: Any, entry: Entry) {
     logInfo("Dropping key %s of size %d to make space".format(key, entry.size))
+    SparkEnv.get.cacheTracker.dropEntry(key)
   }
 }

core/src/main/scala/spark/CacheTracker.scala

@@ -143,6 +143,17 @@ class CacheTracker(isMaster: Boolean, theCache: Cache) extends Logging {
     }
   }
 
+  // Reports that an entry has been dropped from the cache
+  def dropEntry(key: Any) {
+    key match {
+      case (keySpaceId: Long, (rddId: Int, partition: Int)) =>
+        val host = System.getProperty("spark.hostname", Utils.localHostName)
+        trackerActor !! DroppedFromCache(rddId, partition, host)
+      case _ =>
+        logWarning("Unknown key format: %s".format(key))
+    }
+  }
+
   def stop() {
     trackerActor !? StopCacheTracker
     registeredRddIds.clear()