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/04/23 04:38:31 UTC
git commit: [FIX: SPARK-1376] use --arg instead of --args in
SparkSubmit to avoid warning messages
Repository: spark
Updated Branches:
refs/heads/master f3d19a9f1 -> 662c860eb
[FIX: SPARK-1376] use --arg instead of --args in SparkSubmit to avoid warning messages
Even if users use `--arg`, `SparkSubmit` still uses `--args` for child args internally, which triggers a warning message that may confuse users:
~~~
--args is deprecated. Use --arg instead.
~~~
@sryza Does it look good to you?
Author: Xiangrui Meng <me...@databricks.com>
Closes #485 from mengxr/submit-arg and squashes the following commits:
5e1b9fe [Xiangrui Meng] update test
cebbeb7 [Xiangrui Meng] use --arg instead of --args in SparkSubmit to avoid warning messages
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/662c860e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/662c860e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/662c860e
Branch: refs/heads/master
Commit: 662c860ebcec5565493a7dff4812e6b7a37b1d7d
Parents: f3d19a9
Author: Xiangrui Meng <me...@databricks.com>
Authored: Tue Apr 22 19:38:27 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Tue Apr 22 19:38:27 2014 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala | 2 +-
core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/662c860e/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
index 1b1e0fc..a2efddb 100644
--- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
@@ -196,7 +196,7 @@ object SparkSubmit {
childArgs ++= appArgs.childArgs
} else if (clusterManager == YARN) {
for (arg <- appArgs.childArgs) {
- childArgs += ("--args", arg)
+ childArgs += ("--arg", arg)
}
}
}
http://git-wip-us.apache.org/repos/asf/spark/blob/662c860e/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala b/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala
index f82d717..657b446 100644
--- a/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala
+++ b/core/src/test/scala/org/apache/spark/deploy/SparkSubmitSuite.scala
@@ -110,7 +110,7 @@ class SparkSubmitSuite extends FunSuite with ShouldMatchers {
childArgsStr should include ("--executor-memory 5g")
childArgsStr should include ("--driver-memory 4g")
childArgsStr should include ("--executor-cores 5")
- childArgsStr should include ("--args arg1 --args arg2")
+ childArgsStr should include ("--arg arg1 --arg arg2")
childArgsStr should include ("--queue thequeue")
childArgsStr should include ("--files file1.txt,file2.txt")
childArgsStr should include ("--archives archive1.txt,archive2.txt")