Remove am-class from doc and fix yarn-alpha

sryza · sryza · commit bfc8fe0450d9 · 2014-03-12T18:53:24.000-07:00
diff --git a/docs/running-on-yarn.md b/docs/running-on-yarn.md
@@ -61,7 +61,6 @@ The command to launch the Spark application on the cluster is as follows:
       --class <APP_MAIN_CLASS> \
       --args <APP_MAIN_ARGUMENTS> \
       --num-executors <NUMBER_OF_EXECUTOR_PROCESSES> \
-      --am-class <ApplicationMaster_CLASS>
       --driver-memory <MEMORY_FOR_ApplicationMaster> \
       --executor-memory <MEMORY_PER_EXECUTOR> \
       --executor-cores <CORES_PER_EXECUTOR> \
diff --git a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorLauncher.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorLauncher.scala
@@ -228,7 +228,7 @@ class ExecutorLauncher(args: ApplicationMasterArguments, conf: Configuration, sp
     val t = new Thread {
       override def run() {
         while (!driverClosed) {
-          val missingExecutorCount = args.numExecutors - yarnAllocator.getnumExecutorsRunning
+          val missingExecutorCount = args.numExecutors - yarnAllocator.getNumExecutorsRunning
           if (missingExecutorCount > 0) {
             logInfo("Allocating " + missingExecutorCount + " containers to make up for (potentially ?) lost containers")
             yarnAllocator.allocateContainers(missingExecutorCount)
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
@@ -362,7 +362,7 @@ trait ClientBase extends Logging {
         userArgsToString(args) +
         " --executor-memory " + args.executorMemory +
         " --executor-cores " + args.executorCores +
-        " --num-executor " + args.numExecutors +
+        " --num-executors " + args.numExecutors +
         " 1> " + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stdout" +
         " 2> " + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stderr")
 
