falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From suh...@apache.org
Subject incubator-falcon git commit: FALCON-952. If hadoop home is set, use $HADOOP_HOME to set falcon classpath. Contributed by Balu Vellanki.
Date Mon, 29 Dec 2014 10:43:18 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master b18ed3ed2 -> 157d2cadc


FALCON-952. If hadoop home is set, use $HADOOP_HOME to set falcon classpath. Contributed by
Balu Vellanki.


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/157d2cad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/157d2cad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/157d2cad

Branch: refs/heads/master
Commit: 157d2cadca4735b80c59724ccc4b2af99af034e8
Parents: b18ed3e
Author: Suhas V <suhas.v@inmobi.com>
Authored: Mon Dec 29 16:13:00 2014 +0530
Committer: Suhas V <suhas.v@inmobi.com>
Committed: Mon Dec 29 16:13:00 2014 +0530

----------------------------------------------------------------------
 CHANGES.txt              | 3 +++
 src/bin/falcon-config.sh | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/157d2cad/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2316094..299f0b2 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,9 @@ Trunk (Unreleased)
   NEW FEATURES
 
   IMPROVEMENTS
+   FALCON-952 If hadoop home is set, use $HADOOP_HOME to set falcon classpath
+   (Balu Vellanki via Suhas Vasu)
+
    FALCON-935 Feed and process late rerun failed in falcon trunk
    (Shaik Idris Ali via Suhas Vasu)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/157d2cad/src/bin/falcon-config.sh
----------------------------------------------------------------------
diff --git a/src/bin/falcon-config.sh b/src/bin/falcon-config.sh
index 8591c7c..d97356b 100644
--- a/src/bin/falcon-config.sh
+++ b/src/bin/falcon-config.sh
@@ -80,12 +80,12 @@ case $type in
     fi
     FALCONCPPATH="$FALCON_CONF" 
     HADOOPDIR=`which hadoop`
-    if [ "$HADOOPDIR" != "" ]; then
-      echo "Hadoop is installed, adding hadoop classpath to falcon classpath"
-      FALCONCPPATH="${FALCONCPPATH}:`hadoop classpath`"
-    elif [ "$HADOOP_HOME" != "" ]; then
+    if [ "$HADOOP_HOME" != "" ]; then
       echo "Hadoop home is set, adding libraries from '${HADOOP_HOME}/bin/hadoop classpath'
into falcon classpath"
       FALCONCPPATH="${FALCONCPPATH}:`${HADOOP_HOME}/bin/hadoop classpath`"
+    elif [ "$HADOOPDIR" != "" ]; then
+      echo "Hadoop is installed, adding hadoop classpath to falcon classpath"
+      FALCONCPPATH="${FALCONCPPATH}:`hadoop classpath`"
     else
       echo "Could not find installed hadoop and HADOOP_HOME is not set."
       echo "Using the default jars bundled in ${BASEDIR}/hadooplibs/"


Mime
View raw message