You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/03/14 04:27:48 UTC

git commit: [bugfix] wrong client arg, should use executor-cores

Repository: spark
Updated Branches:
  refs/heads/master ca4bf8c57 -> 181b130a0


[bugfix] wrong client arg, should use executor-cores

client arg is wrong, it should be executor-cores. it causes executor fail to start when executor-cores is specified

Author: Tianshuo Deng <td...@twitter.com>

Closes #138 from tsdeng/bugfix_wrong_client_args and squashes the following commits:

304826d [Tianshuo Deng] wrong client arg, should use executor-cores


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/181b130a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/181b130a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/181b130a

Branch: refs/heads/master
Commit: 181b130a0c2a0752009fdf5602e5d6d87f5b1212
Parents: ca4bf8c
Author: Tianshuo Deng <td...@twitter.com>
Authored: Thu Mar 13 20:27:36 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Thu Mar 13 20:27:36 2014 -0700

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/181b130a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
----------------------------------------------------------------------
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
index a001060..c565f2d 100644
--- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
+++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientArguments.scala
@@ -95,7 +95,7 @@ class ClientArguments(val args: Array[String], val sparkConf: SparkConf) {
           executorMemory = value
           args = tail
 
-        case ("--worker-cores" | "--executor-memory") :: IntParam(value) :: tail =>
+        case ("--worker-cores" | "--executor-cores") :: IntParam(value) :: tail =>
           if (args(0) == "--worker-cores") {
             println("--worker-cores is deprecated. Use --executor-cores instead.")
           }