Do not include hyphens in actor name

andrewor14 · andrewor14 · commit c8c6a6271ad4 · 2014-08-07T19:18:43.000-07:00
Hopefully this allows the tests to run succesfully...
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(

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ object SparkEnv extends Logging {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`val securityManager = new SecurityManager(conf)`
`149`		`- val actorSystemName = if (isDriver) "driver-actor" else "executor-actor"`
	`149`	`+ val actorSystemName = if (isDriver) "driverActor" else "executorActor"`
`150`	`150`	`val (actorSystem, boundPort) = AkkaUtils.createActorSystem(`
`151`	`151`	`actorSystemName, hostname, port, conf, securityManager)`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private[spark] object AkkaUtils extends Logging {`
`53`	`53`	`val startService: Int => (ActorSystem, Int) = { actualPort =>`
`54`	`54`	`doCreateActorSystem(name, host, actualPort, conf, securityManager)`
`55`	`55`	`}`
`56`		`- Utils.startServiceOnPort(port, startService, name.replaceAll("-", " "))`
	`56`	`+ Utils.startServiceOnPort(port, startService, name)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`private def doCreateActorSystem(`