Repository: ambari Updated Branches: refs/heads/trunk 9d789a374 -> 3b6003229
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/3b600322 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b600322 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b600322 Branch: refs/heads/trunk Commit: 3b600322937f3a0c95f3079c08bd3a9580f535c4 Parents: 9d789a3 Author: Sumit Mohanty <[email protected]> Authored: Mon Aug 22 14:17:28 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Aug 22 14:17:28 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/3b600322/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 a746e86..b85cf50 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/3b600322/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 e70aacd..1da189c 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> - âââSet 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/3b600322/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> - âSet 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/3b600322/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>
