ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'wip-scala-2.10' into akka-bug-fix

Browse source
This commit is contained in:
Prashant Sharma 2013-12-06 13:32:15 +05:30
parent 09e8be9a62 4e70480038
commit c9cd2af71e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/scala/org/apache/spark/scheduler/cluster/SimrSchedulerBackend.scala
View file

@ -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)

2
yarn/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala
View file

@ -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")