More trivial cleanup.

Marcelo Vanzin · Marcelo Vanzin · commit ecb23cd84463 · 2014-08-18T14:15:11.000-07:00
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -115,7 +115,7 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
       } else {
         actorSystem = AkkaUtils.createActorSystem("sparkYarnAM", Utils.localHostName, 0,
           conf = sparkConf, securityManager = securityMgr)._1
-        waitForSparkMaster()
+        waitForSparkDriver()
         addAmIpFilter()
         (null, sparkConf.get("spark.driver.appUIAddress", ""), "")
       }
@@ -292,7 +292,7 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
     }
   }
 
-  private def waitForSparkMaster() {
+  private def waitForSparkDriver() {
     logInfo("Waiting for Spark driver to be reachable.")
     var driverUp = false
     val hostport = args.userArgs(0)

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,`
`115`	`115`	`} else {`
`116`	`116`	`actorSystem = AkkaUtils.createActorSystem("sparkYarnAM", Utils.localHostName, 0,`
`117`	`117`	`conf = sparkConf, securityManager = securityMgr)._1`
`118`		`- waitForSparkMaster()`
	`118`	`+ waitForSparkDriver()`
`119`	`119`	`addAmIpFilter()`
`120`	`120`	`(null, sparkConf.get("spark.driver.appUIAddress", ""), "")`
`121`	`121`	`}`
`@@ -292,7 +292,7 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`
`295`		`- private def waitForSparkMaster() {`
	`295`	`+ private def waitForSparkDriver() {`
`296`	`296`	`logInfo("Waiting for Spark driver to be reachable.")`
`297`	`297`	`var driverUp = false`
`298`	`298`	`val hostport = args.userArgs(0)`