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-14037. Hdfs operations show "/usr/share/java: No such file or directory", but work.(vbrodetskyi)
Date Tue, 24 Nov 2015 13:54:24 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 f5f129d5e -> d6694a569


AMBARI-14037. Hdfs operations show "/usr/share/java: No such file or directory", but work.(vbrodetskyi)


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

Branch: refs/heads/branch-2.1
Commit: d6694a5691be04123da1fc61a7c40903fdc0ffbc
Parents: f5f129d
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Tue Nov 24 12:55:47 2015 +0200
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Tue Nov 24 12:55:47 2015 +0200

----------------------------------------------------------------------
 .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml           | 10 ++++++----
 .../HDP/2.2/services/HDFS/configuration/hadoop-env.xml    | 10 ++++++----
 .../HDP/2.3/services/HDFS/configuration/hadoop-env.xml    | 10 ++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d6694a56/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
index 37f2ee0..34bb032 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
@@ -308,10 +308,12 @@ export HADOOP_IDENT_STRING=$USER
 
 # Add database libraries
 JAVA_JDBC_LIBS=""
-for jarFile in `ls /usr/share/java | grep -E "(mysql|ojdbc|postgresql|sqljdbc)" 2>/dev/null`
-do
-  JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
-done
+if [ -d "/usr/share/java" ]; then
+  for jarFile in `ls /usr/share/java | grep -E "(mysql|ojdbc|postgresql|sqljdbc)" 2>/dev/null`
+  do
+    JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
+  done
+fi
 
 # Add libraries required by nodemanager
 MAPREDUCE_LIBS={{mapreduce_libs_path}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/d6694a56/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
index 41783f4..7429738 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml
@@ -142,10 +142,12 @@ export HADOOP_IDENT_STRING=$USER
 
 # Add database libraries
 JAVA_JDBC_LIBS=""
-for jarFile in `ls /usr/share/java | grep -E "(mysql|ojdbc|postgresql|sqljdbc)" 2>/dev/null`
-do
-  JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
-done
+if [ -d "/usr/share/java" ]; then
+  for jarFile in `ls /usr/share/java | grep -E "(mysql|ojdbc|postgresql|sqljdbc)" 2>/dev/null`
+  do
+    JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
+  done
+fi
 
 # Add libraries required by nodemanager
 MAPREDUCE_LIBS={{mapreduce_libs_path}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/d6694a56/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
index 6d840a4..80b545c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml
@@ -129,10 +129,12 @@ export HADOOP_IDENT_STRING=$USER
 
 # Add database libraries
 JAVA_JDBC_LIBS=""
-for jarFile in `ls /usr/share/java | grep -E "(mysql|ojdbc|postgresql|sqljdbc)" 2>/dev/null`
-do
-  JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
-done
+if [ -d "/usr/share/java" ]; then
+  for jarFile in `ls /usr/share/java | grep -E "(mysql|ojdbc|postgresql|sqljdbc)" 2>/dev/null`
+  do
+    JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
+  done
+fi
 
 # Add libraries to the hadoop classpath - some may not need a colon as they already include
it
 export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}${JAVA_JDBC_LIBS}


Mime
View raw message