Some tweaks to make Kryo cache work better

2 files changed, 4 insertions, 4 deletions

diff --git a/core/src/main/scala/spark/Executor.scala b/core/src/main/scala/spark/Executor.scala
index 3d994001f1..45408551b7 100644
--- a/core/src/main/scala/spark/Executor.scala
+++ b/core/src/main/scala/spark/Executor.scala
@@ -2,7 +2,7 @@ package spark
 
 import java.io.{File, FileOutputStream}
 import java.net.{URI, URL, URLClassLoader}
-import java.util.concurrent.{Executors, ExecutorService}
+import java.util.concurrent._
 
 import scala.collection.mutable.ArrayBuffer
 
@@ -32,7 +32,7 @@ class Executor extends mesos.Executor with Logging {
     Thread.currentThread.setContextClassLoader(classLoader)
     
     // Start worker thread pool (they will inherit our context ClassLoader)
-    threadPool = Executors.newCachedThreadPool()
+    threadPool = new ThreadPoolExecutor(1, 128, 600, TimeUnit.SECONDS, new LinkedBlockingQueue[Runnable])
   }
   
   override def launchTask(d: ExecutorDriver, desc: TaskDescription) {
diff --git a/core/src/main/scala/spark/KryoSerialization.scala b/core/src/main/scala/spark/KryoSerialization.scala
index 63e22ae4ae..54427ecf71 100644
--- a/core/src/main/scala/spark/KryoSerialization.scala
+++ b/core/src/main/scala/spark/KryoSerialization.scala
@@ -111,11 +111,11 @@ class KryoSerialization extends SerializationStrategy with Logging {
   val kryo = createKryo()
 
   val threadBuf = new ThreadLocal[ObjectBuffer] {
-    override def initialValue = new ObjectBuffer(kryo, 128*1024*1024)
+    override def initialValue = new ObjectBuffer(kryo, 257*1024*1024)
   }
 
   val threadByteBuf = new ThreadLocal[ByteBuffer] {
-    override def initialValue = ByteBuffer.allocate(128*1024*1024)
+    override def initialValue = ByteBuffer.allocate(257*1024*1024)
   }
 
   def createKryo(): Kryo = {