ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
Subject ambari git commit: AMBARI-14561. Configuration changes of spark thrift server for Spark 1.6.(Jeff Zhang via vbrodetskyi)
Date Thu, 21 Jan 2016 17:58:06 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 913282f13 -> 02e0dfd84


AMBARI-14561. Configuration changes of spark thrift server for Spark 1.6.(Jeff Zhang via vbrodetskyi)


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

Branch: refs/heads/branch-2.2
Commit: 02e0dfd8476ababaf42b12126b3ac252648f7adc
Parents: 913282f
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Thu Jan 21 17:16:42 2016 +0200
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Thu Jan 21 17:16:42 2016 +0200

----------------------------------------------------------------------
 .../SPARK/1.2.0.2.2/package/scripts/params.py          |  5 +++++
 .../stacks/HDP/2.4/services/SPARK/metainfo.xml         | 13 +++++++++++++
 2 files changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/02e0dfd8/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index c160bee..2af47bf 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -149,6 +149,11 @@ if security_enabled:
 # thrift server support - available on HDP 2.3 or higher
 spark_thrift_sparkconf = None
 spark_thrift_cmd_opts_properties = ''
+spark_thrift_fairscheduler_content = None
+spark_thrift_master = "yarn-client"
+if 'nm_hosts' in config['clusterHostInfo'] and len(config['clusterHostInfo']['nm_hosts'])
== 1:
+  # use local mode when there's only one nodemanager
+  spark_thrift_master = "local[4]"
 
 spark_thrift_fairscheduler_content = None
 if has_spark_thriftserver and 'spark-thrift-sparkconf' in config['configurations']:

http://git-wip-us.apache.org/repos/asf/ambari/blob/02e0dfd8/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
index adcf59e..8fcfe50 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
@@ -24,6 +24,19 @@
         <service>
           <name>SPARK</name>
           <version>1.6.0.2.4</version>
+          <configuration-dependencies>
+            <config-type>spark-defaults</config-type>
+            <config-type>spark-env</config-type>
+            <config-type>spark-log4j-properties</config-type>
+            <config-type>spark-metrics-properties</config-type>
+            <config-type>spark-thrift-sparkconf</config-type>
+            <config-type>spark-hive-site-override</config-type>
+            <config-type>spark-thrift-fairscheduler</config-type>
+          </configuration-dependencies>
+          <requiredServices>
+            <service>HDFS</service>
+            <service>YARN</service>
+          </requiredServices>
           <osSpecifics>
             <osSpecific>
               <osFamily>redhat7,redhat6,suse11</osFamily>


Mime
View raw message