ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srima...@apache.org
Subject ambari git commit: AMBARI-17074. Expose Spark daemon memory in Spark2 (Weiqing Yang via srimanth)
Date Thu, 23 Jun 2016 21:34:51 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 15225354c -> 79962b25b


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/79962b25
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/79962b25
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/79962b25

Branch: refs/heads/branch-2.4
Commit: 79962b25bc6083ff08fcd661ab097bc61c6e9ef1
Parents: 1522535
Author: Srimanth Gunturi <sgunturi@hortonworks.com>
Authored: Thu Jun 23 14:34:06 2016 -0700
Committer: Srimanth Gunturi <sgunturi@hortonworks.com>
Committed: Thu Jun 23 14:34:40 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/79962b25/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..5a3edef 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,16 @@
     </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="true"/>
+  </property>
   <!-- spark-env.sh -->
   <property>
     <name>content</name>
@@ -91,6 +101,9 @@ export SPARK_LOG_DIR={{spark_log_dir}}
 # Where the pid file is stored. (Default: /tmp)
 export SPARK_PID_DIR={{spark_pid_dir}}
 
+#Memory for Master, Worker and history server (default: 1024MB)
+export SPARK_DAEMON_MEMORY={{spark_daemon_memory}}m
+
 # A string representing this instance of spark.(Default: $USER)
 SPARK_IDENT_STRING=$USER
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/79962b25/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 be464e4..4d67d19 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
@@ -69,6 +69,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']
 


Mime
View raw message