Return-Path: <commits-return-32092-archive-asf-public=cust-asf.ponee.io@ambari.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id BE4B8200B81
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue, 30 Aug 2016 03:25:29 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id BC642160AB8; Tue, 30 Aug 2016 01:25:29 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id B4593160AC8
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 30 Aug 2016 03:25:28 +0200 (CEST)
Received: (qmail 33918 invoked by uid 500); 30 Aug 2016 01:25:27 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 33843 invoked by uid 99); 30 Aug 2016 01:25:27 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Aug 2016 01:25:27 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id A86D1E055E; Tue, 30 Aug 2016 01:25:27 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: smohanty@apache.org
To: commits@ambari.apache.org
Date: Tue, 30 Aug 2016 01:25:30 -0000
Message-Id: <27608efc5ef443d9b9f6ea00af0d0910@git.apache.org>
In-Reply-To: <aa7edc83bb0e4ed8a5e7a0dd3c66495c@git.apache.org>
References: <aa7edc83bb0e4ed8a5e7a0dd3c66495c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [4/5] ambari git commit: AMBARI-18112. Fix
 spark.executor.extraLibraryPath to include native gpl library (Weiqing Yang
 via smohanty)
archived-at: Tue, 30 Aug 2016 01:25:29 -0000

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

Branch: refs/heads/branch-2.4
Commit: dd225554a8ba13f17a81d24442fa892d7cc0e14c
Parents: 01ba82b
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Mon Aug 22 14:17:28 2016 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Mon Aug 29 18:22:41 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/dd225554/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/dd225554/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>
-       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/dd225554/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/dd225554/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>