aboutsummaryrefslogtreecommitdiff
path: root/streaming
diff options
context:
space:
mode:
authorAaron Davidson <aaron@databricks.com>2014-11-12 18:46:37 -0800
committerReynold Xin <rxin@databricks.com>2014-11-12 18:47:17 -0800
commit70efcd88694f20d14085d1ec895a8d38f38784fb (patch)
treeb6382cffeabea805ae725cb72ef3773485d8073e /streaming
parent5f14cdeaa9bfaa05f01a9f9fe77386c46f511805 (diff)
downloadspark-70efcd88694f20d14085d1ec895a8d38f38784fb.tar.gz
spark-70efcd88694f20d14085d1ec895a8d38f38784fb.tar.bz2
spark-70efcd88694f20d14085d1ec895a8d38f38784fb.zip
[SPARK-4370] [Core] Limit number of Netty cores based on executor size
Author: Aaron Davidson <aaron@databricks.com> Closes #3155 from aarondav/conf and squashes the following commits: 7045e77 [Aaron Davidson] Add mesos comment 4770f6e [Aaron Davidson] [SPARK-4370] [Core] Limit number of Netty cores based on executor size (cherry picked from commit b9e1c2eb9b6f7fb609718ef20048a8da452d881b) Signed-off-by: Reynold Xin <rxin@databricks.com>
Diffstat (limited to 'streaming')
-rw-r--r--streaming/src/test/scala/org/apache/spark/streaming/ReceivedBlockHandlerSuite.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming/src/test/scala/org/apache/spark/streaming/ReceivedBlockHandlerSuite.scala b/streaming/src/test/scala/org/apache/spark/streaming/ReceivedBlockHandlerSuite.scala
index 9efe15d01e..3661e16a9e 100644
--- a/streaming/src/test/scala/org/apache/spark/streaming/ReceivedBlockHandlerSuite.scala
+++ b/streaming/src/test/scala/org/apache/spark/streaming/ReceivedBlockHandlerSuite.scala
@@ -73,7 +73,7 @@ class ReceivedBlockHandlerSuite extends FunSuite with BeforeAndAfter with Matche
blockManager = new BlockManager("bm", actorSystem, blockManagerMaster, serializer,
blockManagerSize, conf, mapOutputTracker, shuffleManager,
- new NioBlockTransferService(conf, securityMgr), securityMgr)
+ new NioBlockTransferService(conf, securityMgr), securityMgr, 0)
blockManager.initialize("app-id")
tempDirectory = Files.createTempDir()