You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/09/15 00:02:41 UTC
spark git commit: [SPARK-10594] [YARN] Remove reference to
--num-executors, add --properties-file
Repository: spark
Updated Branches:
refs/heads/master 217e49644 -> 16b6d1861
[SPARK-10594] [YARN] Remove reference to --num-executors, add --properties-file
`ApplicationMaster` no longer has the `--num-executors` flag, and had an undocumented `--properties-file` configuration option.
cc srowen
Author: Erick Tryzelaar <er...@gmail.com>
Closes #8754 from erickt/master.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/16b6d186
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/16b6d186
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/16b6d186
Branch: refs/heads/master
Commit: 16b6d18613e150c7038c613992d80a7828413e66
Parents: 217e496
Author: Erick Tryzelaar <er...@gmail.com>
Authored: Mon Sep 14 15:02:38 2015 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Mon Sep 14 15:02:38 2015 -0700
----------------------------------------------------------------------
.../org/apache/spark/deploy/yarn/ApplicationMasterArguments.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/16b6d186/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMasterArguments.scala
----------------------------------------------------------------------
diff --git a/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMasterArguments.scala b/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMasterArguments.scala
index b084124..17d9943 100644
--- a/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMasterArguments.scala
+++ b/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMasterArguments.scala
@@ -105,9 +105,9 @@ class ApplicationMasterArguments(val args: Array[String]) {
| place on the PYTHONPATH for Python apps.
| --args ARGS Arguments to be passed to your application's main class.
| Multiple invocations are possible, each will be passed in order.
- | --num-executors NUM Number of executors to start (Default: 2)
| --executor-cores NUM Number of cores for the executors (Default: 1)
| --executor-memory MEM Memory per executor (e.g. 1000M, 2G) (Default: 1G)
+ | --properties-file FILE Path to a custom Spark properties file.
""".stripMargin)
// scalastyle:on println
System.exit(exitCode)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org