Skip to content

[SPARK-4096][YARN]let ApplicationMaster accept executor memory argument in same format as JVM memory strings #2955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
WangTaoTheTonic wants to merge 2 commits into from
Closed

[SPARK-4096][YARN]let ApplicationMaster accept executor memory argument in same format as JVM memory strings #2955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3779767
Update executor memory description in the help message
WangTaoTheTonic Oct 27, 2014
ab98c70
append parameter passed in
WangTaoTheTonic Oct 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMasterArguments.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.spark.deploy.yarn

import org.apache.spark.util.IntParam
import org.apache.spark.util.{MemoryParam, IntParam}
import collection.mutable.ArrayBuffer

class ApplicationMasterArguments(val args: Array[String]) {
Expand Down Expand Up @@ -55,7 +55,7 @@ class ApplicationMasterArguments(val args: Array[String]) {
numExecutors = value
args = tail

case ("--worker-memory" | "--executor-memory") :: IntParam(value) :: tail =>
case ("--worker-memory" | "--executor-memory") :: MemoryParam(value) :: tail =>
executorMemory = value
args = tail

Expand Down
2 changes: 1 addition & 1 deletion yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ private[spark] trait ClientBase extends Logging {
val amArgs =
Seq(amClass) ++ userClass ++ userJar ++ userArgs ++
Seq(
"--executor-memory", args.executorMemory.toString,
"--executor-memory", args.executorMemory.toString + "m",
"--executor-cores", args.executorCores.toString,
"--num-executors ", args.numExecutors.toString)

Expand Down