Author: stack
Date: Fri Sep 11 22:17:05 2009
New Revision: 814056
URL: http://svn.apache.org/viewvc?rev=814056&view=rev
Log:
HBASE-1687 bin/hbase script doesn't allow for different memory settings for
each daemon type
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/bin/hbase
hadoop/hbase/trunk/src/docs/src/documentation/content/xdocs/metrics.xml
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=814056&r1=814055&r2=814056&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Sep 11 22:17:05 2009
@@ -39,6 +39,8 @@
HBASE-1800 Too many ZK connections
HBASE-1819 Update to 0.20.1 hadoop and zk 3.2.1
HBASE-1820 Update jruby from 1.2 to 1.3.1
+ HBASE-1687 bin/hbase script doesn't allow for different memory settings for
+ each daemon type
OPTIMIZATIONS
Modified: hadoop/hbase/trunk/bin/hbase
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/hbase?rev=814056&r1=814055&r2=814056&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/hbase (original)
+++ hadoop/hbase/trunk/bin/hbase Fri Sep 11 22:17:05 2009
@@ -188,16 +188,20 @@
CLASS="org.jruby.Main ${HBASE_HOME}/bin/hirb.rb"
elif [ "$COMMAND" = "master" ] ; then
CLASS='org.apache.hadoop.hbase.master.HMaster'
+ HBASE_OPTS="$HBASE_OPTS $HBASE_MASTER_OPTS"
elif [ "$COMMAND" = "regionserver" ] ; then
CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer'
+ HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS"
elif [ "$COMMAND" = "rest" ] ; then
CLASS='org.apache.hadoop.hbase.rest.Dispatcher'
elif [ "$COMMAND" = "thrift" ] ; then
CLASS='org.apache.hadoop.hbase.thrift.ThriftServer'
+ HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS"
elif [ "$COMMAND" = "migrate" ] ; then
CLASS='org.apache.hadoop.hbase.util.Migrate'
elif [ "$COMMAND" = "zookeeper" ] ; then
CLASS='org.apache.hadoop.hbase.zookeeper.HQuorumPeer'
+ HBASE_OPTS="$HBASE_OPTS $HBASE_ZOOKEEPER_OPTS"
else
CLASS=$COMMAND
fi
Modified:
hadoop/hbase/trunk/src/docs/src/documentation/content/xdocs/metrics.xml
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/docs/src/documentation/content/xdocs/metrics.xml?rev=814056&r1=814055&r2=814056&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/docs/src/documentation/content/xdocs/metrics.xml
(original)
+++ hadoop/hbase/trunk/src/docs/src/documentation/content/xdocs/metrics.xml Fri
Sep 11 22:17:05 2009
@@ -123,8 +123,8 @@
<section>
<title>Configure JMX in HBase startup</title>
<p>
- Finally, edit the <code>$HBASE_HOME/conf/hbase-env.sh</code> and
- <code>$HBASE_HOME/bin/hbase</code> scripts for JMX support:
+ Finally, edit the <code>$HBASE_HOME/conf/hbase-env.sh</code>
+ script to add JMX support:
</p>
<dl>
<dt><code>$HBASE_HOME/conf/hbase-env.sh</code></dt>
@@ -139,34 +139,6 @@
export HBASE_REGIONSERVER_OPTS="$JMX_OPTS
-Dcom.sun.management.jmxremote.port=10102"
</source>
</dd>
- <dt><code>$HBASE_HOME/bin/hbase</code></dt>
- <dd>
- <p>Towards the end of the script, replace the lines:</p>
- <source>
- # figure out which class to run
-if [ "$COMMAND" = "shell" ] ; then
- CLASS="org.jruby.Main ${HBASE_HOME}/bin/hirb.rb"
-elif [ "$COMMAND" = "master" ] ; then
- CLASS='org.apache.hadoop.hbase.master.HMaster'
-elif [ "$COMMAND" = "regionserver" ] ; then
- CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer'
- </source>
- <p>
- with the lines: (adding the "HBASE_OPTS=..." lines for "master" and
- "regionserver" commands)
- </p>
- <source>
- # figure out which class to run
-if [ "$COMMAND" = "shell" ] ; then
- CLASS="org.jruby.Main ${HBASE_HOME}/bin/hirb.rb"
-elif [ "$COMMAND" = "master" ] ; then
- CLASS='org.apache.hadoop.hbase.master.HMaster'
- HBASE_OPTS="$HBASE_OPTS $HBASE_MASTER_OPTS"
-elif [ "$COMMAND" = "regionserver" ] ; then
- CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer'
- HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS"
- </source>
- </dd>
</dl>
<p>
After restarting the processes you want to monitor, you should now be
