You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/12 02:12:15 UTC
[1/3] git commit: Revert "Fix one unit test that was not setting
spark.cleaner.ttl"
Updated Branches:
refs/heads/master 6510f04e4 -> 409866b35
Revert "Fix one unit test that was not setting spark.cleaner.ttl"
This reverts commit 942c80b34c4642de3b0237761bc1aaeb8cbdd546.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/22d4d624
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/22d4d624
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/22d4d624
Branch: refs/heads/master
Commit: 22d4d62420908ba3451409fa7c72cd26a009a858
Parents: 6510f04
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sat Jan 11 16:07:03 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sat Jan 11 16:07:03 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/22d4d624/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 5ccef7f..ee6b433 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")
[2/3] git commit: Revert "Fix default TTL for metadata cleaner"
Posted by pw...@apache.org.
Revert "Fix default TTL for metadata cleaner"
This reverts commit 669ba4caa95014f4511f842206c3e506f1a41a7a.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/07b952e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/07b952e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/07b952e1
Branch: refs/heads/master
Commit: 07b952e1d1fa5257b0f781fe30d16d26dde91774
Parents: 22d4d62
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sat Jan 11 16:07:10 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sat Jan 11 16:07:10 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/07b952e1/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 ac07a55..3d1e90a 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 =
[3/3] git commit: Merge pull request #393 from pwendell/revert-381
Posted by pw...@apache.org.
Merge pull request #393 from pwendell/revert-381
Revert PR 381
This PR missed a bunch of test cases that require "spark.cleaner.ttl". I think it is what is causing test failures on Jenkins right now (though it's a bit hard to tell because the DNS for cs.berkeley.edu is down).
I'm submitting this to see if it fixes jeknins. I did try just patching various tests but it was taking a really long time because there are a bunch of them, so for now I'm just seeing if a revert works.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/409866b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/409866b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/409866b3
Branch: refs/heads/master
Commit: 409866b35150193a8adf10010fa4ee2d1736f495
Parents: 6510f04 07b952e
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sat Jan 11 17:12:06 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sat Jan 11 17:12:06 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(-)
----------------------------------------------------------------------