You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/01/11 03:53:08 UTC
[1/3] git commit: Fix default TTL for metadata cleaner
Updated Branches:
refs/heads/master 44d6a8e3d -> 1d7bef0c9
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
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/669ba4ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/669ba4ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/669ba4ca
Branch: refs/heads/master
Commit: 669ba4caa95014f4511f842206c3e506f1a41a7a
Parents: 0ebc973
Author: Matei Zaharia <ma...@databricks.com>
Authored: Fri Jan 10 00:21:36 2014 -0800
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Fri Jan 10 00:21:36 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/669ba4ca/core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala
----------------------------------------------------------------------
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 3d1e90a..ac07a55 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 =
[3/3] git commit: Merge pull request #381 from mateiz/default-ttl
Posted by ma...@apache.org.
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/1d7bef0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/1d7bef0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/1d7bef0c
Branch: refs/heads/master
Commit: 1d7bef0c91abe053570e006917185d3b4ae19b0e
Parents: 44d6a8e 942c80b
Author: Matei Zaharia <ma...@databricks.com>
Authored: Fri Jan 10 18:53:03 2014 -0800
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Fri Jan 10 18:53:03 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/util/MetadataCleaner.scala | 2 +-
.../scala/org/apache/spark/streaming/BasicOperationsSuite.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Fix one unit test that was not setting
spark.cleaner.ttl
Posted by ma...@apache.org.
Fix one unit test that was not setting spark.cleaner.ttl
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/942c80b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/942c80b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/942c80b3
Branch: refs/heads/master
Commit: 942c80b34c4642de3b0237761bc1aaeb8cbdd546
Parents: 669ba4c
Author: Matei Zaharia <ma...@databricks.com>
Authored: Fri Jan 10 16:32:36 2014 -0800
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Fri Jan 10 16:32:36 2014 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/streaming/BasicOperationsSuite.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/942c80b3/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala
----------------------------------------------------------------------
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 ee6b433..5ccef7f 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")