falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shweth...@apache.org
Subject git commit: FALCON-223 hive-exec bundles protobuf-2.4.1 which is incompatible with hadoop-2 requiring protobuf-2.5. Contributed by Arpit Gupta
Date Fri, 27 Dec 2013 06:14:46 GMT
Updated Branches:
  refs/heads/master aa8383b77 -> 3a345c9cf


FALCON-223 hive-exec bundles protobuf-2.4.1 which is incompatible with hadoop-2 requiring
protobuf-2.5. Contributed by  Arpit Gupta


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

Branch: refs/heads/master
Commit: 3a345c9cfa6b3a242c4c205f8e6823d49ec80d04
Parents: aa8383b
Author: Shwetha GS <shwethags@gmail.com>
Authored: Fri Dec 27 11:44:33 2013 +0530
Committer: Shwetha GS <shwethags@gmail.com>
Committed: Fri Dec 27 11:44:33 2013 +0530

----------------------------------------------------------------------
 CHANGES.txt              |  2 ++
 src/bin/falcon-config.sh | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3a345c9c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 23315e3..46d390a 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -133,6 +133,8 @@ Release Version: 0.4-incubating
 
   BUG FIXES
 
+    FALCON-223: hive-exec bundles protobuf-2.4.1 which is incompatible with hadoop-2 requiring
protobuf-2.5
+
     FALCON-213: Validating Storage Exists (table) should be called only from the server (not
from prism)
 
     FALCON-24: Allow re-run of timedout instances

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3a345c9c/src/bin/falcon-config.sh
----------------------------------------------------------------------
diff --git a/src/bin/falcon-config.sh b/src/bin/falcon-config.sh
index 3f4616a..412a994 100644
--- a/src/bin/falcon-config.sh
+++ b/src/bin/falcon-config.sh
@@ -73,19 +73,7 @@ case $type in
       echo "Invalid option for app: ${app}. Valid choices are falcon and prism"
       exit 1
     fi
-    FALCON_EXPANDED_WEBAPP_DIR=${FALCON_EXPANDED_WEBAPP_DIR:-${BASEDIR}/server/webapp}
-    export FALCON_EXPANDED_WEBAPP_DIR
-    # set the server classpath
-    if [ ! -d ${FALCON_EXPANDED_WEBAPP_DIR}/$app/WEB-INF ]; then
-      mkdir -p ${FALCON_EXPANDED_WEBAPP_DIR}/$app
-      cd ${FALCON_EXPANDED_WEBAPP_DIR}/$app
-      $JAR_BIN -xf ${BASEDIR}/server/webapp/$app.war
-      cd -
-    fi
-    
-    FALCONCPPATH="$FALCON_CONF:${FALCON_EXPANDED_WEBAPP_DIR}/$app/WEB-INF/classes"
-    FALCONCPPATH="${FALCONCPPATH}:${FALCON_EXPANDED_WEBAPP_DIR}/$app/WEB-INF/lib/*:${BASEDIR}/libext/*"
-    
+    FALCONCPPATH="$FALCON_CONF" 
     HADOOPDIR=`which hadoop`
     if [ "$HADOOPDIR" != "" ]; then
       echo "Hadoop is installed, adding hadoop classpath to falcon classpath"
@@ -98,6 +86,18 @@ case $type in
       echo "Using the default jars bundled in ${BASEDIR}/hadooplibs/"
       FALCONCPPATH="${FALCONCPPATH}:${BASEDIR}/hadooplibs/*"
     fi
+    FALCON_EXPANDED_WEBAPP_DIR=${FALCON_EXPANDED_WEBAPP_DIR:-${BASEDIR}/server/webapp}
+    export FALCON_EXPANDED_WEBAPP_DIR
+    # set the server classpath
+    if [ ! -d ${FALCON_EXPANDED_WEBAPP_DIR}/$app/WEB-INF ]; then
+      mkdir -p ${FALCON_EXPANDED_WEBAPP_DIR}/$app
+      cd ${FALCON_EXPANDED_WEBAPP_DIR}/$app
+      $JAR_BIN -xf ${BASEDIR}/server/webapp/$app.war
+      cd -
+    fi
+    FALCONCPPATH="${FALCONCPPATH}:${FALCON_EXPANDED_WEBAPP_DIR}/$app/WEB-INF/classes"
+    FALCONCPPATH="${FALCONCPPATH}:${FALCON_EXPANDED_WEBAPP_DIR}/$app/WEB-INF/lib/*:${BASEDIR}/libext/*"
+    
     # log and pid dirs for applications
     FALCON_LOG_DIR="${FALCON_LOG_DIR:-$BASEDIR/logs}"
     export FALCON_LOG_DIR


Mime
View raw message