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/08 03:32:27 UTC
[1/2] git commit: Fix BlockManagerSuite#after
Updated Branches:
refs/heads/master b2e690f83 -> 61674bcad
Fix BlockManagerSuite#after
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/86ed1ad2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/86ed1ad2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/86ed1ad2
Branch: refs/heads/master
Commit: 86ed1ad2520662f4a16e535cc05bf2296e6053df
Parents: 7d5fa17
Author: Mark Hamstra <ma...@gmail.com>
Authored: Tue Jan 7 16:39:37 2014 -0800
Committer: Mark Hamstra <ma...@gmail.com>
Committed: Tue Jan 7 16:39:37 2014 -0800
----------------------------------------------------------------------
.../org/apache/spark/storage/BlockManagerSuite.scala | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/86ed1ad2/core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala b/core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala
index a0fc344..fded582 100644
--- a/core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala
@@ -40,8 +40,6 @@ class BlockManagerSuite extends FunSuite with BeforeAndAfter with PrivateMethodT
var actorSystem: ActorSystem = null
var master: BlockManagerMaster = null
var oldArch: String = null
- var oldOops: String = null
- var oldHeartBeat: String = null
// Reuse a serializer across tests to avoid creating a new thread-local buffer on each test
conf.set("spark.kryoserializer.buffer.mb", "1")
@@ -61,7 +59,7 @@ class BlockManagerSuite extends FunSuite with BeforeAndAfter with PrivateMethodT
Left(actorSystem.actorOf(Props(new BlockManagerMasterActor(true, conf)))), conf)
// Set the arch to 64-bit and compressedOops to true to get a deterministic test-case
- System.setProperty("os.arch", "amd64")
+ oldArch = System.setProperty("os.arch", "amd64")
conf.set("os.arch", "amd64")
conf.set("spark.test.useCompressedOops", "true")
conf.set("spark.storage.disableBlockManagerHeartBeat", "true")
@@ -94,11 +92,7 @@ class BlockManagerSuite extends FunSuite with BeforeAndAfter with PrivateMethodT
System.clearProperty("os.arch")
}
- if (oldOops != null) {
- conf.set("spark.test.useCompressedOops", oldOops)
- } else {
- System.clearProperty("spark.test.useCompressedOops")
- }
+ System.clearProperty("spark.test.useCompressedOops")
}
test("StorageLevel object caching") {
[2/2] git commit: Merge pull request #352 from markhamstra/oldArch
Posted by pw...@apache.org.
Merge pull request #352 from markhamstra/oldArch
Don't leave os.arch unset after BlockManagerSuite
Recent SparkConf changes meant that BlockManagerSuite was now leaving the os.arch System.property unset. That's a problem for any subsequent tests that rely upon having a valid os.arch. This is true for CompressionCodecSuite in the usual maven build test order, even though it isn't usually true for the sbt build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/61674bca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/61674bca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/61674bca
Branch: refs/heads/master
Commit: 61674bcadfe64e0d8e05f3daab3274af3023dffa
Parents: b2e690f 86ed1ad
Author: Patrick Wendell <pw...@gmail.com>
Authored: Tue Jan 7 18:32:13 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Tue Jan 7 18:32:13 2014 -0800
----------------------------------------------------------------------
.../org/apache/spark/storage/BlockManagerSuite.scala | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------