Return-Path: <commits-return-29809-archive-asf-public=cust-asf.ponee.io@ambari.apache.org>
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 88C40200B17
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue, 21 Jun 2016 22:35:16 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 87395160A4F; Tue, 21 Jun 2016 20:35:16 +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 CFD52160A07
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 21 Jun 2016 22:35:15 +0200 (CEST)
Received: (qmail 26814 invoked by uid 500); 21 Jun 2016 20:35:14 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 26805 invoked by uid 99); 21 Jun 2016 20:35:14 -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; Tue, 21 Jun 2016 20:35:14 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 88E03E020A; Tue, 21 Jun 2016 20:35:14 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: srimanth@apache.org
To: commits@ambari.apache.org
Message-Id: <30e0e2e91da048f49b59586a0120f425@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-17074. Expose Spark daemon memory in Spark2
 (Weiqing Yang via srimanth)
Date: Tue, 21 Jun 2016 20:35:14 +0000 (UTC)
archived-at: Tue, 21 Jun 2016 20:35:16 -0000

Repository: ambari
Updated Branches:
  refs/heads/trunk ff0f5c008 -> 706946e84


AMBARI-17074. Expose Spark daemon memory in Spark2 (Weiqing Yang via srimanth)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/706946e8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/706946e8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/706946e8

Branch: refs/heads/trunk
Commit: 706946e84cf8c1b6e9121da3ed08516c9d1329c8
Parents: ff0f5c0
Author: Srimanth Gunturi <sgunturi@hortonworks.com>
Authored: Tue Jun 21 13:35:01 2016 -0700
Committer: Srimanth Gunturi <sgunturi@hortonworks.com>
Committed: Tue Jun 21 13:35:01 2016 -0700

----------------------------------------------------------------------
 .../SPARK2/2.0.0/configuration/spark2-env.xml         | 14 ++++++++++++++
 .../SPARK2/2.0.0/package/scripts/params.py            |  1 +
 2 files changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/706946e8/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 76c670a..d895798 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
@@ -59,6 +59,17 @@
     </value-attributes>
     <on-ambari-upgrade add="true"/>
   </property>
+  <property>
+    <name>spark_daemon_memory</name>
+    <value>1024</value>
+    <description>Memory for Master, Worker and history server (default: 1G)</description>
+    <value-attributes>
+      <type>int</type>
+      <unit>MB</unit>
+    </value-attributes>
+    <on-ambari-upgrade add="false" change="true" delete="true"/>
+    <on-stack-upgrade add="true" change="true" delete="false"/>
+  </property>
   <!-- spark-env.sh -->
   <property>
     <name>content</name>
@@ -94,6 +105,9 @@ export SPARK_PID_DIR={{spark_pid_dir}}
 # A string representing this instance of spark.(Default: $USER)
 SPARK_IDENT_STRING=$USER
 
+#Memory for Master, Worker and history server (default: 1024MB)
+export SPARK_DAEMON_MEMORY={{spark_daemon_memory}}m
+
 # The scheduling priority for daemons. (Default: 0)
 SPARK_NICENESS=0
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/706946e8/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
index a0d91c7..78feef3 100755
--- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
@@ -64,6 +64,7 @@ if stack_version_formatted and check_stack_feature(StackFeature.ROLLING_UPGRADE,
   spark_pid_dir = status_params.spark_pid_dir
   spark_home = format("{stack_root}/current/{component_directory}")
 
+spark_daemon_memory = config['configurations']['spark2-env']['spark_daemon_memory']
 spark_thrift_server_conf_file = spark_conf + "/spark-thrift-sparkconf.conf"
 java_home = config['hostLevelParams']['java_home']