Do not include hyphens in actor name

Hopefully this allows the tests to run succesfully...
apache · Aug 8, 2014 · c8c6a62 · c8c6a62
1 parent 1c1b42e
commit c8c6a62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala
@@ -146,7 +146,7 @@ object SparkEnv extends Logging {
     }
 
     val securityManager = new SecurityManager(conf)
-    val actorSystemName = if (isDriver) "driver-actor" else "executor-actor"
+    val actorSystemName = if (isDriver) "driverActor" else "executorActor"
     val (actorSystem, boundPort) = AkkaUtils.createActorSystem(
       actorSystemName, hostname, port, conf, securityManager)
 

diff --git a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala
@@ -53,7 +53,7 @@ private[spark] object AkkaUtils extends Logging {
     val startService: Int => (ActorSystem, Int) = { actualPort =>
       doCreateActorSystem(name, host, actualPort, conf, securityManager)
     }
-    Utils.startServiceOnPort(port, startService, name.replaceAll("-", " "))
+    Utils.startServiceOnPort(port, startService, name)
   }
 
   private def doCreateActorSystem(