Repository: falcon Updated Branches: refs/heads/master 732395765 -> 51a09451e
FALCON-2208 Cli config changes to load hadoop class path to falcon client classpath Author: sandeep <[email protected]> Reviewers: @pallavi-rao Closes #311 from sandeepSamudrala/FALCON-2208 and squashes the following commits: 0011a15 [sandeep] Merge branch 'master' of https://github.com/apache/falcon into FALCON-2208 100f129 [sandeep] FALCON-2208 Falcon Cli changes to add hadoop classpath to falcon classpath f96a084 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 9cf36e9 [sandeep] Merge branch 'master' of https://github.com/apache/falcon bbca081 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 48f6afa [sandeep] Merge branch 'master' of https://github.com/apache/falcon 250cc46 [sandeep] Merge branch 'master' of https://github.com/apache/falcon d0393e9 [sandeep] Merge branch 'master' of https://github.com/apache/falcon a178805 [sandeep] Merge branch 'master' of https://github.com/apache/falcon d6dc8bf [sandeep] Merge branch 'master' of https://github.com/apache/falcon 1bb8d3c [sandeep] Merge branch 'master' of https://github.com/apache/falcon c065566 [sandeep] reverting last line changes made 1a4dcd2 [sandeep] rebased and resolved the conflicts from master 271318b [sandeep] FALCON-2097. Adding UT to the new method for getting next instance time with Delay. a94d4fe [sandeep] rebasing from master 9e68a57 [sandeep] FALCON-298. Feed update with replication delay creates holes Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/51a09451 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/51a09451 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/51a09451 Branch: refs/heads/master Commit: 51a09451e9b1438909a1cc0393b05343b6d11714 Parents: 7323957 Author: sandeep <[email protected]> Authored: Fri Dec 2 12:31:45 2016 +0530 Committer: Pallavi Rao <[email protected]> Committed: Fri Dec 2 12:31:45 2016 +0530 ---------------------------------------------------------------------- src/bin/falcon-config.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/51a09451/src/bin/falcon-config.sh ---------------------------------------------------------------------- diff --git a/src/bin/falcon-config.sh b/src/bin/falcon-config.sh index 20f04af..f350404 100644 --- a/src/bin/falcon-config.sh +++ b/src/bin/falcon-config.sh @@ -65,6 +65,18 @@ case $type in client) # set the client class path FALCONCPPATH="$FALCON_CONF:${BASEDIR}/client/lib/*" + HADOOPDIR=`which hadoop` + 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/" + FALCONCPPATH="${FALCONCPPATH}:${BASEDIR}/hadooplibs/*" + fi for i in `ls ${BASEDIR}/server/webapp`; do FALCONCPPATH="${FALCONCPPATH}:${i}/WEB-INF/lib/*" done
