Repository: hive Updated Branches: refs/heads/branch-2.1 904fe52bc -> 06d5ef61c
HIVE-14041. llap scripts should not add hadoop and other libraries from the cluster. (Siddharth Seth, reviewed by Gopal V) (cherry picked from commit 2e35bac54a915a0f2013e506cc07e9e3301fef8f) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/06d5ef61 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/06d5ef61 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/06d5ef61 Branch: refs/heads/branch-2.1 Commit: 06d5ef61c1d7e7703095a96a1484c798eb0a2089 Parents: 904fe52 Author: Siddharth Seth <ss...@apache.org> Authored: Tue Jun 21 16:24:54 2016 -0700 Committer: Siddharth Seth <ss...@apache.org> Committed: Tue Jun 21 16:26:54 2016 -0700 ---------------------------------------------------------------------- llap-server/bin/runLlapDaemon.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/06d5ef61/llap-server/bin/runLlapDaemon.sh ---------------------------------------------------------------------- diff --git a/llap-server/bin/runLlapDaemon.sh b/llap-server/bin/runLlapDaemon.sh index d9bfd8f..79f0ccf 100755 --- a/llap-server/bin/runLlapDaemon.sh +++ b/llap-server/bin/runLlapDaemon.sh @@ -53,13 +53,6 @@ LOG_LEVEL_DEFAULT="INFO" LOGGER_DEFAULT="console" JAVA_OPTS_BASE="-server -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+PrintGCDetails -verbose:gc -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=4 -XX:GCLogFileSize=100M" -# CLASSPATH initially contains $HADOOP_CONF_DIR & $YARN_CONF_DIR -if [ ! -d "$HADOOP_CONF_DIR" ]; then - echo No HADOOP_CONF_DIR set, or is not a directory. - echo Please specify it in the environment. - exit 1 -fi - if [ ! -d "${LLAP_DAEMON_HOME}" ]; then echo No LLAP_DAEMON_HOME set, or is not a directory. echo Please specify it in the environment. @@ -82,7 +75,7 @@ if [ ! -n "${LLAP_DAEMON_LOG_LEVEL}" ]; then LLAP_DAEMON_LOG_LEVEL=${LOG_LEVEL_DEFAULT} fi -CLASSPATH=${LLAP_DAEMON_CONF_DIR}:${LLAP_DAEMON_HOME}/lib/*:${LLAP_DAEMON_HOME}/lib/tez/*:`${HADOOP_PREFIX}/bin/hadoop classpath`:${LLAP_DAEMON_HOME}/lib/udfs/*:. +CLASSPATH=${LLAP_DAEMON_CONF_DIR}:${LLAP_DAEMON_HOME}/lib/*:${LLAP_DAEMON_HOME}/lib/tez/*:${LLAP_DAEMON_HOME}/lib/udfs/*:. if [ -n "LLAP_DAEMON_USER_CLASSPATH" ]; then CLASSPATH=${CLASSPATH}:${LLAP_DAEMON_USER_CLASSPATH}
