svn commit: r1212709 - /hbase/branches/0.89-fb/bin/hbase

[ns...@apache.org]

Author: nspiegelberg
Date: Sat Dec 10 01:52:23 2011
New Revision: 1212709

URL: http://svn.apache.org/viewvc?rev=1212709&view=rev
Log:
HBASE-4884 allow commands to have their own shell settings

Summary:
for example, we might want a smaller heap for thrift compared to the
regionserver.

This might help with an OOM situation we have been hitting on ERIS and HASHOUT,
but even if not it's a useful knob to have.

Test Plan:
* tested with file missing.  no problem, used default conf/hbase-env.sh
settings.

* tested with conf/hbase-env-thrift.sh file with heap size of 1234.  ps axww
showed -Xmx1234m

* started regionserver using bin/hadoop-daemon.sh

* started hbase shell

* ran some jruby scripts via bin/hbase org.jruby.Main

Reviewers: dhruba, kranganathan, mbautin, paultuckfield

Reviewed By: paultuckfield

CC: hbase-ops@lists, dsp, hbase-eng@lists, paultuckfield, dhruba

Differential Revision: 364007

Modified:
    hbase/branches/0.89-fb/bin/hbase

Modified: hbase/branches/0.89-fb/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/bin/hbase?rev=1212709&r1=1212708&r2=1212709&view=diff
==============================================================================
--- hbase/branches/0.89-fb/bin/hbase (original)
+++ hbase/branches/0.89-fb/bin/hbase Sat Dec 10 01:52:23 2011
@@ -96,6 +96,11 @@ if [ "$MAVEN_HOME" != "" ]; then
   MVN=${MAVEN_HOME}/bin/mvn
 fi
 
+# override default settings for this command, if applicable
+if [ -f "$HBASE_HOME/conf/hbase-env-$COMMAND.sh" ]; then
+  . "$HBASE_HOME/conf/hbase-env-$COMMAND.sh"
+fi
+
 # check envvars which might override default args
 if [ "$HBASE_HEAPSIZE" != "" ]; then
   #echo "run with heapsize $HBASE_HEAPSIZE"