You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2016/09/12 11:53:46 UTC
[22/50] ambari git commit: AMBARI-18112. Fix
spark.executor.extraLibraryPath to include native gpl library (Weiqing Yang
via smohanty)
AMBARI-18112. Fix spark.executor.extraLibraryPath to include native gpl library (Weiqing Yang via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8558721d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8558721d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8558721d
Branch: refs/heads/AMBARI-2.4.0.2
Commit: 8558721d0b54cede770c1098d09f3ec9a5c2d090
Parents: 031f821
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Aug 22 14:17:28 2016 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Aug 22 19:27:15 2016 -0700
----------------------------------------------------------------------
.../SPARK/1.2.1/configuration/spark-defaults.xml | 8 ++++++++
.../SPARK/1.5.2/configuration/spark-thrift-sparkconf.xml | 10 +++++++++-
.../SPARK2/2.0.0/configuration/spark2-defaults.xml | 10 +++++++++-
.../2.0.0/configuration/spark2-thrift-sparkconf.xml | 8 ++++++++
4 files changed, 34 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8558721d/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml
index 748c270..d8ab28c 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml
@@ -38,6 +38,14 @@
<on-ambari-upgrade add="true"/>
</property>
<property>
+ <name>spark.executor.extraLibraryPath</name>
+ <value>{{spark_hadoop_lib_native}}</value>
+ <description>
+ Set a special library path to use when launching the executor JVM.
+ </description>
+ <on-ambari-upgrade add="true"/>
+ </property>
+ <property>
<name>spark.yarn.driver.memoryOverhead</name>
<value>384</value>
<description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8558721d/ambari-server/src/main/resources/common-services/SPARK/1.5.2/configuration/spark-thrift-sparkconf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.5.2/configuration/spark-thrift-sparkconf.xml b/ambari-server/src/main/resources/common-services/SPARK/1.5.2/configuration/spark-thrift-sparkconf.xml
index 42ed316..3ec8b94 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.5.2/configuration/spark-thrift-sparkconf.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.5.2/configuration/spark-thrift-sparkconf.xml
@@ -33,7 +33,15 @@
<name>spark.driver.extraLibraryPath</name>
<value>{{spark_hadoop_lib_native}}</value>
<description>
- \u2002\u2002\u2002Set a special library path to use when launching the driver JVM.
+ Set a special library path to use when launching the driver JVM.
+ </description>
+ <on-ambari-upgrade add="true"/>
+ </property>
+ <property>
+ <name>spark.executor.extraLibraryPath</name>
+ <value>{{spark_hadoop_lib_native}}</value>
+ <description>
+ Set a special library path to use when launching the executor JVM.
</description>
<on-ambari-upgrade add="true"/>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8558721d/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-defaults.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-defaults.xml b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-defaults.xml
index 4c28d46..a5115af 100755
--- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-defaults.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-defaults.xml
@@ -37,7 +37,15 @@
<name>spark.driver.extraLibraryPath</name>
<value>{{spark_hadoop_lib_native}}</value>
<description>
- \u2002Set a special library path to use when launching the driver JVM.
+ Set a special library path to use when launching the driver JVM.
+ </description>
+ <on-ambari-upgrade add="true"/>
+ </property>
+ <property>
+ <name>spark.executor.extraLibraryPath</name>
+ <value>{{spark_hadoop_lib_native}}</value>
+ <description>
+ Set a special library path to use when launching the executor JVM.
</description>
<on-ambari-upgrade add="true"/>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8558721d/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-thrift-sparkconf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-thrift-sparkconf.xml b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-thrift-sparkconf.xml
index 6d73946..e47a72e 100755
--- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-thrift-sparkconf.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-thrift-sparkconf.xml
@@ -42,6 +42,14 @@
<on-ambari-upgrade add="true"/>
</property>
<property>
+ <name>spark.executor.extraLibraryPath</name>
+ <value>{{spark_hadoop_lib_native}}</value>
+ <description>
+ Set a special library path to use when launching the executor JVM.
+ </description>
+ <on-ambari-upgrade add="true"/>
+ </property>
+ <property>
<name>spark.history.provider</name>
<value>org.apache.spark.deploy.history.FsHistoryProvider</value>
<description>Name of history provider class</description>