ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject ambari git commit: AMBARI-16755. Add spark.driver.extraLibraryPath (Weiqing Yang via alejandro)
Date Fri, 27 May 2016 21:53:32 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 48213b1b3 -> c0e8e43f0


AMBARI-16755. Add spark.driver.extraLibraryPath (Weiqing Yang via alejandro)


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

Branch: refs/heads/branch-2.4
Commit: c0e8e43f095079784f6b72b2e3e6b926d806eb9c
Parents: 48213b1
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Fri May 27 14:53:15 2016 -0700
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Fri May 27 14:53:15 2016 -0700

----------------------------------------------------------------------
 .../SPARK/1.2.1/configuration/spark-defaults.xml             | 8 ++++++++
 .../common-services/SPARK/1.2.1/package/scripts/params.py    | 1 +
 .../SPARK/1.5.2/configuration/spark-thrift-sparkconf.xml     | 8 ++++++++
 .../SPARK2/2.0.0/configuration/spark2-defaults.xml           | 8 ++++++++
 .../SPARK2/2.0.0/configuration/spark2-thrift-sparkconf.xml   | 8 ++++++++
 .../common-services/SPARK2/2.0.0/package/scripts/params.py   | 1 +
 6 files changed, 34 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c0e8e43f/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 b507d5e..bd6be0a 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
@@ -32,6 +32,14 @@
   </property>
 
   <property>
+     <name>spark.driver.extraLibraryPath</name>
+     <value>{{spark_hadoop_lib_native}}</value>
+     <description>
+       Set a special library path to use when launching the driver JVM.
+     </description>
+  </property>
+
+  <property>
     <name>spark.yarn.driver.memoryOverhead</name>
     <value>384</value>
     <description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c0e8e43f/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
index c5f3eb6..3f14955 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
@@ -93,6 +93,7 @@ spark_history_server_stop = format("{spark_home}/sbin/stop-history-server.sh")
 spark_thrift_server_start = format("{spark_home}/sbin/start-thriftserver.sh")
 spark_thrift_server_stop = format("{spark_home}/sbin/stop-thriftserver.sh")
 spark_logs_dir = format("{spark_home}/logs")
+spark_hadoop_lib_native = format("{stack_root}/current/hadoop-client/lib/native")
 
 spark_submit_cmd = format("{spark_home}/bin/spark-submit")
 spark_smoke_example = "org.apache.spark.examples.SparkPi"

http://git-wip-us.apache.org/repos/asf/ambari/blob/c0e8e43f/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 b5742ea..112a548 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
@@ -32,6 +32,14 @@
   </property>
 
   <property>
+    <name>spark.driver.extraLibraryPath</name>
+    <value>{{spark_hadoop_lib_native}}</value>
+    <description>
+       Set a special library path to use when launching the driver JVM.
+    </description>
+  </property>
+
+  <property>
     <name>spark.yarn.driver.memoryOverhead</name>
     <value>384</value>
     <description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c0e8e43f/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 5d6c781..fa54297 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
@@ -30,6 +30,14 @@
   </property>
 
   <property>
+    <name>spark.driver.extraLibraryPath</name>
+    <value>{{spark_hadoop_lib_native}}</value>
+    <description>
+       Set a special library path to use when launching the driver JVM.
+    </description>
+  </property>
+
+  <property>
     <name>spark.history.provider</name>
     <value>org.apache.spark.deploy.history.FsHistoryProvider</value>
     <description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c0e8e43f/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 ce1d159..543453b 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
@@ -30,6 +30,14 @@
   </property>
 
   <property>
+    <name>spark.driver.extraLibraryPath</name>
+    <value>{{spark_hadoop_lib_native}}</value>
+    <description>
+       Set a special library path to use when launching the driver JVM.
+    </description>
+  </property>
+
+  <property>
     <name>spark.history.provider</name>
     <value>org.apache.spark.deploy.history.FsHistoryProvider</value>
     <description>Name of history provider class</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/c0e8e43f/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 ded9959..3316f78 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
@@ -92,6 +92,7 @@ spark_history_server_stop = format("{spark_home}/sbin/stop-history-server.sh")
 
 spark_thrift_server_start = format("{spark_home}/sbin/start-thriftserver.sh")
 spark_thrift_server_stop = format("{spark_home}/sbin/stop-thriftserver.sh")
+spark_hadoop_lib_native = format("{stack_root}/current/hadoop-client/lib/native")
 
 run_example_cmd = format("{spark_home}/bin/run-example")
 spark_smoke_example = "SparkPi"


Mime
View raw message