From 11049ae7e40730cda95d9ec885d022c354200fba Mon Sep 17 00:00:00 2001
From: Andrew Kyle Purtell <apurtell@apache.org>
Date: Thu, 31 Dec 2009 20:48:12 +0000
Subject: [PATCH] increase region server heap size to 2000m default

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@894936 13f79535-47bb-0310-9956-ffa450edef68
---
 src/contrib/ec2/bin/hbase-ec2-init-remote.sh        | 4 ++--
 src/contrib/ec2/bin/image/create-hbase-image-remote | 5 +++--
 src/contrib/ec2/bin/launch-hbase-zookeeper          | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/contrib/ec2/bin/hbase-ec2-init-remote.sh b/src/contrib/ec2/bin/hbase-ec2-init-remote.sh
index 63407284fa4..4d5e7dd1527 100644
--- a/src/contrib/ec2/bin/hbase-ec2-init-remote.sh
+++ b/src/contrib/ec2/bin/hbase-ec2-init-remote.sh
@@ -201,8 +201,8 @@ cat > $HBASE_HOME/conf/hbase-site.xml <<EOF
 EOF
 # Override JVM options
 cat >> $HBASE_HOME/conf/hbase-env.sh <<EOF
-export HBASE_MASTER_OPTS="-XX:+UseConcMarkSweepGC -XX:+DoEscapeAnalysis -XX:+AggressiveOpts -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:/mnt/hbase/logs/hbase-master-gc.log"
-export HBASE_REGIONSERVER_OPTS="-XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=88 -XX:+DoEscapeAnalysis -XX:+AggressiveOpts -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:/mnt/hbase/logs/hbase-regionserver-gc.log"
+export HBASE_MASTER_OPTS="-Xmx1000m -XX:+UseConcMarkSweepGC -XX:+DoEscapeAnalysis -XX:+AggressiveOpts -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:/mnt/hbase/logs/hbase-master-gc.log"
+export HBASE_REGIONSERVER_OPTS="-Xmx2000m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=88 -XX:NewSize=64m -XX:MaxNewSize=64m -XX:+DoEscapeAnalysis -XX:+AggressiveOpts -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:/mnt/hbase/logs/hbase-regionserver-gc.log"
 EOF
 # Configure HBase for Ganglia
 cat > $HBASE_HOME/conf/hadoop-metrics.properties <<EOF
diff --git a/src/contrib/ec2/bin/image/create-hbase-image-remote b/src/contrib/ec2/bin/image/create-hbase-image-remote
index b545b4bea02..940ac8a5412 100755
--- a/src/contrib/ec2/bin/image/create-hbase-image-remote
+++ b/src/contrib/ec2/bin/image/create-hbase-image-remote
@@ -73,7 +73,7 @@ rm -f hbase-$HBASE_VERSION.tar.gz
 # Configure HBase
 sed -i \
   -e "s|# export JAVA_HOME=.*|export JAVA_HOME=/usr/local/jdk${JAVA_VERSION}|" \
-  -e 's|# export HBASE_OPTS=.*|export HBASE_OPTS="$HBASE_OPTS -server -XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=90 -XX:NewSize=64m -XX:MaxNewSize=64m -XX:+DoEscapeAnalysis -XX:+AggressiveOpts"|' \
+  -e 's|# export HBASE_OPTS=.*|export HBASE_OPTS="$HBASE_OPTS -server -XX:+HeapDumpOnOutOfMemoryError"|' \
   -e 's|# export HBASE_LOG_DIR=.*|export HBASE_LOG_DIR=/mnt/hbase/logs|' \
   -e 's|# export HBASE_SLAVE_SLEEP=.*|export HBASE_SLAVE_SLEEP=1|' \
   /usr/local/hbase-$HBASE_VERSION/conf/hbase-env.sh
@@ -83,7 +83,8 @@ chmod +x /etc/init.d/ec2-run-user-data
 echo "/etc/init.d/ec2-run-user-data" >> /etc/rc.d/rc.local
 
 # Setup root user bash environment
-echo "export JAVA_HOME=/usr/local/jdk${JAVA_VERSION}" >> /root/.bash_profile
+
+  echo "export JAVA_HOME=/usr/local/jdk${JAVA_VERSION}" >> /root/.bash_profile
 echo "export HADOOP_HOME=/usr/local/hadoop-${HADOOP_VERSION}" >> /root/.bash_profile
 echo "export HBASE_HOME=/usr/local/hbase-${HBASE_VERSION}" >> /root/.bash_profile
 echo 'export PATH=$JAVA_HOME/bin:$HADOOP_HOME/bin:$HBASE_HOME/bin:$PATH' >> /root/.bash_profile
diff --git a/src/contrib/ec2/bin/launch-hbase-zookeeper b/src/contrib/ec2/bin/launch-hbase-zookeeper
index 42560020ba6..d7fe961ced6 100755
--- a/src/contrib/ec2/bin/launch-hbase-zookeeper
+++ b/src/contrib/ec2/bin/launch-hbase-zookeeper
@@ -77,6 +77,7 @@ echo "ZooKeeper quorum is $ZOOKEEPER_QUORUM."
 
 # Start Zookeeper quorum
 
+sleep 10
 echo "Initializing the ZooKeeper quorum ensemble."
 
 for host in $public_names ; do