Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 07AF5200AE4 for ; Fri, 10 Jun 2016 00:21:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 063C1160A59; Thu, 9 Jun 2016 22:21:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4F77E160A58 for ; Fri, 10 Jun 2016 00:21:02 +0200 (CEST) Received: (qmail 34622 invoked by uid 500); 9 Jun 2016 22:21:01 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 34593 invoked by uid 99); 9 Jun 2016 22:21:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jun 2016 22:21:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4BB43DFE5F; Thu, 9 Jun 2016 22:21:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alejandro@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-16715. Wrong memory conf in spark-env.xml (Weiqing Yang via alejandro) Date: Thu, 9 Jun 2016 22:21:01 +0000 (UTC) archived-at: Thu, 09 Jun 2016 22:21:03 -0000 Repository: ambari Updated Branches: refs/heads/trunk 3303cdce3 -> 9b116fb28 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/9b116fb2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9b116fb2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9b116fb2 Branch: refs/heads/trunk Commit: 9b116fb28db774bb30a2d0c8e2f070e3b7c6d55d Parents: 3303cdc Author: Alejandro Fernandez Authored: Thu Jun 9 15:22:20 2016 -0700 Committer: Alejandro Fernandez Committed: Thu Jun 9 15:22:20 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/9b116fb2/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/9b116fb2/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.