You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jy...@apache.org on 2013/04/04 22:46:55 UTC
svn commit: r1464738 - in /hbase/branches/0.95: bin/hbase-config.sh
bin/hbase-daemon.sh conf/hbase-env.sh
Author: jyates
Date: Thu Apr 4 20:46:55 2013
New Revision: 1464738
URL: http://svn.apache.org/r1464738
Log:
HBASE-7817: Suggested JDWP debug options in hbase-env.sh are wrong (Vasu Mariyala)
Modified:
hbase/branches/0.95/bin/hbase-config.sh
hbase/branches/0.95/bin/hbase-daemon.sh
hbase/branches/0.95/conf/hbase-env.sh
Modified: hbase/branches/0.95/bin/hbase-config.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/bin/hbase-config.sh?rev=1464738&r1=1464737&r2=1464738&view=diff
==============================================================================
--- hbase/branches/0.95/bin/hbase-config.sh (original)
+++ hbase/branches/0.95/bin/hbase-config.sh Thu Apr 4 20:46:55 2013
@@ -94,8 +94,10 @@ if [ -z "$HBASE_REST_OPTS" ]; then
fi
# Source the hbase-env.sh. Will have JAVA_HOME defined.
-if [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
+# HBASE-7817 - Source the hbase-env.sh only if it has not already been done. HBASE_ENV_INIT keeps track of it.
+if [ -z "$HBASE_ENV_INIT" ] && [ -f "${HBASE_CONF_DIR}/hbase-env.sh" ]; then
. "${HBASE_CONF_DIR}/hbase-env.sh"
+ export HBASE_ENV_INIT="true"
fi
# Set default value for regionserver uid if not present
Modified: hbase/branches/0.95/bin/hbase-daemon.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/bin/hbase-daemon.sh?rev=1464738&r1=1464737&r2=1464738&view=diff
==============================================================================
--- hbase/branches/0.95/bin/hbase-daemon.sh (original)
+++ hbase/branches/0.95/bin/hbase-daemon.sh Thu Apr 4 20:46:55 2013
@@ -153,9 +153,11 @@ pid=$HBASE_PID_DIR/hbase-$HBASE_IDENT_ST
export HBASE_ZNODE_FILE=$HBASE_PID_DIR/hbase-$HBASE_IDENT_STRING-$command.znode
export HBASE_START_FILE=$HBASE_PID_DIR/hbase-$HBASE_IDENT_STRING-$command.autorestart
-
-if [ "$HBASE_USE_GC_LOGFILE" = "true" ]; then
- export HBASE_GC_OPTS=" -Xloggc:${loggc}"
+if [ -n "$SERVER_GC_OPTS" ]; then
+ export SERVER_GC_OPTS=${SERVER_GC_OPTS/"-Xloggc:<FILE-PATH>"/"-Xloggc:${loggc}"}
+fi
+if [ -n "$CLIENT_GC_OPTS" ]; then
+ export CLIENT_GC_OPTS=${CLIENT_GC_OPTS/"-Xloggc:<FILE-PATH>"/"-Xloggc:${loggc}"}
fi
# Set default scheduling priority
Modified: hbase/branches/0.95/conf/hbase-env.sh
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/conf/hbase-env.sh?rev=1464738&r1=1464737&r2=1464738&view=diff
==============================================================================
--- hbase/branches/0.95/conf/hbase-env.sh (original)
+++ hbase/branches/0.95/conf/hbase-env.sh Thu Apr 4 20:46:55 2013
@@ -40,20 +40,31 @@
# see http://wiki.apache.org/hadoop/PerformanceTuning
export HBASE_OPTS="-XX:+UseConcMarkSweepGC"
-# Uncomment below to enable java garbage collection logging for the server-side processes
-# this enables basic gc logging for the server processes to the .out file
-# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps $HBASE_GC_OPTS"
-
-# this enables gc logging using automatic GC log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+. Either use this set of options or the one above
-# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M $HBASE_GC_OPTS"
-
-# Uncomment below to enable java garbage collection logging for the client processes in the .out file.
-# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps $HBASE_GC_OPTS"
-
-# Uncomment below (along with above GC logging) to put GC information in its own logfile (will set HBASE_GC_OPTS).
-# This applies to both the server and client GC options above
-# export HBASE_USE_GC_LOGFILE=true
+# Uncomment one of the below three options to enable java garbage collection logging for the server-side processes.
+# This enables basic gc logging to the .out file.
+# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
+
+# This enables basic gc logging to its own file.
+# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
+# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH>"
+
+# This enables basic GC logging to its own file with automatic log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+.
+# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
+# export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH> -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M"
+
+# Uncomment one of the below three options to enable java garbage collection logging for the client processes.
+
+# This enables basic gc logging to the .out file.
+# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
+
+# This enables basic gc logging to its own file.
+# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
+# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH>"
+
+# This enables basic GC logging to its own file with automatic log rolling. Only applies to jdk 1.6.0_34+ and 1.7.0_2+.
+# If FILE-PATH is not replaced, the log file(.gc) would still be generated in the HBASE_LOG_DIR .
+# export CLIENT_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<FILE-PATH> -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=1 -XX:GCLogFileSize=512M"
# Uncomment below if you intend to use the EXPERIMENTAL off heap cache.
# export HBASE_OPTS="$HBASE_OPTS -XX:MaxDirectMemorySize="