Repository: ambari Updated Branches: refs/heads/branch-2.4 d86c84fd9 -> 078833a36
AMBARI-16715. Wrong memory conf in spark-env.xml (Weiqing Yang via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/078833a3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/078833a3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/078833a3 Branch: refs/heads/branch-2.4 Commit: 078833a360bd32c26349ba11b684f8344d173b84 Parents: d86c84f Author: Alejandro Fernandez <[email protected]> Authored: Thu Jun 9 15:23:21 2016 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Thu Jun 9 15:23:21 2016 -0700 ---------------------------------------------------------------------- .../common-services/SPARK/1.2.1/configuration/spark-env.xml | 2 +- .../common-services/SPARK2/2.0.0/configuration/spark2-env.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/078833a3/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml index 2dfcb23..832a8f5 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml @@ -84,7 +84,7 @@ #SPARK_EXECUTOR_INSTANCES="2" #Number of workers to start (Default: 2) #SPARK_EXECUTOR_CORES="1" #Number of cores for the workers (Default: 1). #SPARK_EXECUTOR_MEMORY="1G" #Memory per Worker (e.g. 1000M, 2G) (Default: 1G) -#SPARK_DRIVER_MEMORY="512 Mb" #Memory for Master (e.g. 1000M, 2G) (Default: 512 Mb) +#SPARK_DRIVER_MEMORY="512M" #Memory for Master (e.g. 1000M, 2G) (Default: 512 Mb) #SPARK_YARN_APP_NAME="spark" #The name of your application (Default: Spark) #SPARK_YARN_QUEUE="~@~Xdefault~@~Y" #The hadoop queue to use for allocation requests (Default: @~Xdefault~@~Y) #SPARK_YARN_DIST_FILES="" #Comma separated list of files to be distributed with the job. http://git-wip-us.apache.org/repos/asf/ambari/blob/078833a3/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml index 255e990..76c670a 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml @@ -73,7 +73,7 @@ #SPARK_EXECUTOR_INSTANCES="2" #Number of workers to start (Default: 2) #SPARK_EXECUTOR_CORES="1" #Number of cores for the workers (Default: 1). #SPARK_EXECUTOR_MEMORY="1G" #Memory per Worker (e.g. 1000M, 2G) (Default: 1G) -#SPARK_DRIVER_MEMORY="512Mb" #Memory for Master (e.g. 1000M, 2G) (Default: 512 Mb) +#SPARK_DRIVER_MEMORY="512M" #Memory for Master (e.g. 1000M, 2G) (Default: 512 Mb) #SPARK_YARN_APP_NAME="spark" #The name of your application (Default: Spark) #SPARK_YARN_QUEUE="default" #The hadoop queue to use for allocation requests (Default: default) #SPARK_YARN_DIST_FILES="" #Comma separated list of files to be distributed with the job.
