HBASE-1507 iCMS as default JVM

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@783990 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -319,6 +319,7 @@ Release 0.20.0 - Unreleased
    HBASE-1489  Basic git ignores for people who use git and eclipse
    HBASE-1453  Add HADOOP-4681 to our bundled hadoop, add to 'gettting started'
                recommendation that hbase users backport 
+   HBASE-1507  iCMS as default JVM
 
   OPTIMIZATIONS
    HBASE-1412  Change values for delete column and column family in KeyValue

bin/hbase

@@ -206,7 +206,7 @@ fi
 # and are named like the following: java_pid21612.hprof. Apparently it doesn't
 # 'cost' to have this flag enabled. Its a 1.6 flag only. See:
 # http://blogs.sun.com/alanb/entry/outofmemoryerror_looks_a_bit_better
-HBASE_OPTS="$HBASE_OPTS -XX:+HeapDumpOnOutOfMemoryError"
+HBASE_OPTS="$HBASE_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
 HBASE_OPTS="$HBASE_OPTS -Dhbase.log.dir=$HBASE_LOG_DIR"
 HBASE_OPTS="$HBASE_OPTS -Dhbase.log.file=$HBASE_LOGFILE"
 HBASE_OPTS="$HBASE_OPTS -Dhbase.home.dir=$HBASE_HOME"

conf/hbase-env.sh

@@ -30,8 +30,10 @@
 # The maximum amount of heap to use, in MB. Default is 1000.
 # export HBASE_HEAPSIZE=1000
 
-# Extra Java runtime options.  Empty by default.
-# export HBASE_OPTS=-server
+# Extra Java runtime options.
+# Below are what we set by default.  For more on why as well as other possible
+# settings, see http://wiki.apache.org/hadoop/PerformanceTuning
+# export HBASE_OPTS="$HBASE_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
 
 # File naming hosts on which HRegionServers will run.  $HBASE_HOME/conf/regionservers by default.
 # export HBASE_REGIONSERVERS=${HBASE_HOME}/conf/regionservers