diff options
| author | Matei Zaharia <matei@databricks.com> | 2014-01-10 18:53:03 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-01-10 18:53:03 -0800 |
| commit | 1d7bef0c91abe053570e006917185d3b4ae19b0e (patch) | |
| tree | fbba856769e27c39dfdc5946ca66e25cf1ba1604 | |
| parent | 44d6a8e3d803e6d6b78044a4060c54558f90ef57 (diff) | |
| parent | 942c80b34c4642de3b0237761bc1aaeb8cbdd546 (diff) | |
| download | spark-1d7bef0c91abe053570e006917185d3b4ae19b0e.tar.gz spark-1d7bef0c91abe053570e006917185d3b4ae19b0e.tar.bz2 spark-1d7bef0c91abe053570e006917185d3b4ae19b0e.zip | |
Merge pull request #381 from mateiz/default-ttl
Fix default TTL for metadata cleaner
It seems to have been set to 3500 in a previous commit for debugging, but it should be off by default.
| -rw-r--r-- | core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala | 2 | ||||
| -rw-r--r-- | streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala | 2 |
2 files changed, 2 insertions, 2 deletions
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 3d1e90a352..ac07a55cb9 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", 3500) + conf.getInt("spark.cleaner.ttl", -1) } def getDelaySeconds(conf: SparkConf, cleanerType: MetadataCleanerType.MetadataCleanerType): Int = 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 ee6b433d1f..5ccef7f461 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 = new SparkConf() + val conf2 = conf.clone() .setMaster("local[2]") .setAppName("BasicOperationsSuite") .set("spark.streaming.clock", "org.apache.spark.streaming.util.ManualClock") |