Merge branch 'wip-scala-2.10' into akka-bug-fix
This commit is contained in:
commit
c9cd2af71e
|
@ -36,7 +36,7 @@ private[spark] class SimrSchedulerBackend(
|
|||
override def start() {
|
||||
super.start()
|
||||
|
||||
val driverUrl = "akka://spark@%s:%s/user/%s".format(
|
||||
val driverUrl = "akka.tcp://spark@%s:%s/user/%s".format(
|
||||
System.getProperty("spark.driver.host"), System.getProperty("spark.driver.port"),
|
||||
CoarseGrainedSchedulerBackend.ACTOR_NAME)
|
||||
|
||||
|
|
|
@ -168,7 +168,7 @@ class WorkerLauncher(args: ApplicationMasterArguments, conf: Configuration) exte
|
|||
System.setProperty("spark.driver.host", driverHost)
|
||||
System.setProperty("spark.driver.port", driverPort.toString)
|
||||
|
||||
val driverUrl = "akka://spark@%s:%s/user/%s".format(
|
||||
val driverUrl = "akka.tcp://spark@%s:%s/user/%s".format(
|
||||
driverHost, driverPort.toString, CoarseGrainedSchedulerBackend.ACTOR_NAME)
|
||||
|
||||
actor = actorSystem.actorOf(Props(new MonitorActor(driverUrl)), name = "YarnAM")
|
||||
|
|
Loading…
Reference in a new issue