From 22d4d62420908ba3451409fa7c72cd26a009a858 Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Sat, 11 Jan 2014 16:07:03 -0800 Subject: [PATCH 1/2] Revert "Fix one unit test that was not setting spark.cleaner.ttl" This reverts commit 942c80b34c4642de3b0237761bc1aaeb8cbdd546. --- .../scala/org/apache/spark/streaming/BasicOperationsSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala b/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala index 5ccef7f461974..ee6b433d1f1fa 100644 --- a/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala +++ b/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala @@ -375,7 +375,7 @@ class BasicOperationsSuite extends TestSuiteBase { } test("slice") { - val conf2 = conf.clone() + val conf2 = new SparkConf() .setMaster("local[2]") .setAppName("BasicOperationsSuite") .set("spark.streaming.clock", "org.apache.spark.streaming.util.ManualClock") From 07b952e1d1fa5257b0f781fe30d16d26dde91774 Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Sat, 11 Jan 2014 16:07:10 -0800 Subject: [PATCH 2/2] Revert "Fix default TTL for metadata cleaner" This reverts commit 669ba4caa95014f4511f842206c3e506f1a41a7a. --- core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala b/core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala index ac07a55cb9101..3d1e90a3522a4 100644 --- a/core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala +++ b/core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala @@ -74,7 +74,7 @@ object MetadataCleanerType extends Enumeration { // initialization of StreamingContext. It's okay for users trying to configure stuff themselves. object MetadataCleaner { def getDelaySeconds(conf: SparkConf) = { - conf.getInt("spark.cleaner.ttl", -1) + conf.getInt("spark.cleaner.ttl", 3500) } def getDelaySeconds(conf: SparkConf, cleanerType: MetadataCleanerType.MetadataCleanerType): Int =