You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2015/05/06 21:43:34 UTC
hive git commit: HIVE-10633 : LLAP: remove default GC setting from
runLlapDaemon (Sergey Shelukhin)
Repository: hive
Updated Branches:
refs/heads/llap 8a62fc9c6 -> d755140d6
HIVE-10633 : LLAP: remove default GC setting from runLlapDaemon (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/d755140d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/d755140d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/d755140d
Branch: refs/heads/llap
Commit: d755140d621d0d850c68c0018a79722f761cbff8
Parents: 8a62fc9
Author: Sergey Shelukhin <se...@apache.org>
Authored: Wed May 6 12:41:31 2015 -0700
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Wed May 6 12:41:31 2015 -0700
----------------------------------------------------------------------
llap-server/bin/runLlapDaemon.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/d755140d/llap-server/bin/runLlapDaemon.sh
----------------------------------------------------------------------
diff --git a/llap-server/bin/runLlapDaemon.sh b/llap-server/bin/runLlapDaemon.sh
index c7ec661..dd59439 100755
--- a/llap-server/bin/runLlapDaemon.sh
+++ b/llap-server/bin/runLlapDaemon.sh
@@ -48,7 +48,7 @@ shift
JAVA=$JAVA_HOME/bin/java
LOG_LEVEL_DEFAULT="INFO,console"
-JAVA_OPTS_BASE="-server -Djava.net.preferIPv4Stack=true -XX:+UseNUMA -XX:+UseParallelGC -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps"
+JAVA_OPTS_BASE="-server -Djava.net.preferIPv4Stack=true -XX:+UseNUMA -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps"
# CLASSPATH initially contains $HADOOP_CONF_DIR & $YARN_CONF_DIR
if [ ! -d "$HADOOP_CONF_DIR" ]; then
@@ -107,6 +107,14 @@ elif [ "$COMMAND" = "run" ] ; then
fi
LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} ${JAVA_OPTS_BASE}"
+
+# Set the default GC option if none set
+if [[ ! "$LLAP_DAEMON_OPTS" =~ \+Use[^[:space:]]+GC ]]
+then
+ LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -XX:+UseParallelGC"
+fi
+
+
LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dlog4j.configuration=llap-daemon-log4j.properties"
LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dllap.daemon.log.dir=${LLAP_DAEMON_LOG_DIR}"
LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dllap.daemon.log.file=${LLAP_DAEMON_LOG_FILE}"