Use ThreadLocal for serializer instance in CoarseGrainedExecutorBackend

apache · Apr 21, 2015 · 64f8398 · 64f8398
1 parent aeb680e
commit 64f8398
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala b/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala
@@ -48,7 +48,10 @@ private[spark] class CoarseGrainedExecutorBackend(
   var executor: Executor = null
   @volatile var driver: Option[RpcEndpointRef] = None
 
-  private[this] val ser: SerializerInstance = env.closureSerializer.newInstance()
+  // This is a thread-local in case we ever decide to change this to a non-thread-safe RpcEndpoint
+  private[this] val ser: ThreadLocal[SerializerInstance] = new ThreadLocal[SerializerInstance] {
+    override def initialValue: SerializerInstance = env.closureSerializer.newInstance()
+  }
 
   override def onStart() {
     import scala.concurrent.ExecutionContext.Implicits.global
@@ -86,7 +89,7 @@ private[spark] class CoarseGrainedExecutorBackend(
         logError("Received LaunchTask command but executor was null")
         System.exit(1)
       } else {
-        val taskDesc = ser.deserialize[TaskDescription](data.value)
+        val taskDesc = ser.get().deserialize[TaskDescription](data.value)
         logInfo("Got assigned task " + taskDesc.taskId)
         executor.launchTask(this, taskId = taskDesc.taskId, attemptNumber = taskDesc.attemptNumber,
           taskDesc.name, taskDesc.serializedTask)