You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2009/09/12 00:15:51 UTC
svn commit: r814055 - in /hadoop/hbase/branches/0.20: CHANGES.txt bin/hbase

Author: stack
Date: Fri Sep 11 22:15:51 2009
New Revision: 814055

URL: http://svn.apache.org/viewvc?rev=814055&view=rev
Log:
HBASE-1687 bin/hbase script doesn't allow for different memory settings for each daemon type

Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    hadoop/hbase/branches/0.20/bin/hbase

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=814055&r1=814054&r2=814055&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Fri Sep 11 22:15:51 2009
@@ -12,6 +12,8 @@
    HBASE-1819  Update to 0.20.1 hadoop and zk 3.2.1
    HBASE-1765  Delay Result deserialization until asked for and permit
                access to the raw binary to prevent forced deserialization
+   HBASE-1687  bin/hbase script doesn't allow for different memory settings for
+               each daemon type
 
 Release 0.20.0 - Tue Sep  8 12:48:41 PDT 2009
 

Modified: hadoop/hbase/branches/0.20/bin/hbase
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/bin/hbase?rev=814055&r1=814054&r2=814055&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/bin/hbase (original)
+++ hadoop/hbase/branches/0.20/bin/hbase Fri Sep 11 22:15:51 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