From c8c6a6271ad4a9dd3edb005a6b900b3295ee729b Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Thu, 7 Aug 2014 19:18:43 -0700 Subject: [PATCH] Do not include hyphens in actor name Hopefully this allows the tests to run succesfully... --- core/src/main/scala/org/apache/spark/SparkEnv.scala | 2 +- core/src/main/scala/org/apache/spark/util/AkkaUtils.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala index ef78df63ef6c6..68d7b65433603 100644 --- 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 index 01b326b2093be..d6afb73b74242 100644 --- 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(