Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-1687 bin/hbase script doesn't allow for different memory settings for each daemon type 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@814056 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2009-09-11 22:17:05 +00:00
parent a629f5db3e
commit e91bb84c8a
3 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -39,6 +39,8 @@ Release 0.21.0 - Unreleased
HBASE-1800 Too many ZK connections HBASE-1800 Too many ZK connections
HBASE-1819 Update to 0.20.1 hadoop and zk 3.2.1 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-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 OPTIMIZATIONS

4
bin/hbase
View File

@ -188,16 +188,20 @@ if [ "$COMMAND" = "shell" ] ; then
CLASS="org.jruby.Main ${HBASE_HOME}/bin/hirb.rb" CLASS="org.jruby.Main ${HBASE_HOME}/bin/hirb.rb"
elif [ "$COMMAND" = "master" ] ; then elif [ "$COMMAND" = "master" ] ; then
CLASS='org.apache.hadoop.hbase.master.HMaster' CLASS='org.apache.hadoop.hbase.master.HMaster'
HBASE_OPTS="$HBASE_OPTS $HBASE_MASTER_OPTS"
elif [ "$COMMAND" = "regionserver" ] ; then elif [ "$COMMAND" = "regionserver" ] ; then
CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer' CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer'
HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS"
elif [ "$COMMAND" = "rest" ] ; then elif [ "$COMMAND" = "rest" ] ; then
CLASS='org.apache.hadoop.hbase.rest.Dispatcher' CLASS='org.apache.hadoop.hbase.rest.Dispatcher'
elif [ "$COMMAND" = "thrift" ] ; then elif [ "$COMMAND" = "thrift" ] ; then
CLASS='org.apache.hadoop.hbase.thrift.ThriftServer' CLASS='org.apache.hadoop.hbase.thrift.ThriftServer'
HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS"
elif [ "$COMMAND" = "migrate" ] ; then elif [ "$COMMAND" = "migrate" ] ; then
CLASS='org.apache.hadoop.hbase.util.Migrate' CLASS='org.apache.hadoop.hbase.util.Migrate'
elif [ "$COMMAND" = "zookeeper" ] ; then elif [ "$COMMAND" = "zookeeper" ] ; then
CLASS='org.apache.hadoop.hbase.zookeeper.HQuorumPeer' CLASS='org.apache.hadoop.hbase.zookeeper.HQuorumPeer'
HBASE_OPTS="$HBASE_OPTS $HBASE_ZOOKEEPER_OPTS"
else else
CLASS=$COMMAND CLASS=$COMMAND
fi fi

32
src/docs/src/documentation/content/xdocs/metrics.xml
View File

@ -123,8 +123,8 @@ controlRole readwrite
<section> <section>
<title>Configure JMX in HBase startup</title> <title>Configure JMX in HBase startup</title>
<p> <p>
Finally, edit the <code>$HBASE_HOME/conf/hbase-env.sh</code> and Finally, edit the <code>$HBASE_HOME/conf/hbase-env.sh</code>
<code>$HBASE_HOME/bin/hbase</code> scripts for JMX support: script to add JMX support:
</p> </p>
<dl> <dl>
<dt><code>$HBASE_HOME/conf/hbase-env.sh</code></dt> <dt><code>$HBASE_HOME/conf/hbase-env.sh</code></dt>
@ -139,34 +139,6 @@ export HBASE_MASTER_OPTS="$JMX_OPTS -Dcom.sun.management.jmxremote.port=10101"
export HBASE_REGIONSERVER_OPTS="$JMX_OPTS -Dcom.sun.management.jmxremote.port=10102" export HBASE_REGIONSERVER_OPTS="$JMX_OPTS -Dcom.sun.management.jmxremote.port=10102"
</source> </source>
</dd> </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> </dl>
<p> <p>
After restarting the processes you want to monitor, you should now be After restarting the processes you want to monitor, you should now be