hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdcry...@apache.org
Subject svn commit: r902239 - in /hadoop/hbase/trunk: CHANGES.txt bin/hbase
Date Fri, 22 Jan 2010 19:26:09 GMT
Author: jdcryans
Date: Fri Jan 22 19:26:09 2010
New Revision: 902239

URL: http://svn.apache.org/viewvc?rev=902239&view=rev
Log:
HBASE-2057  Cluster won't stop (Gary Helmling and JD via JD)

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/bin/hbase

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=902239&r1=902238&r2=902239&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Jan 22 19:26:09 2010
@@ -135,7 +135,6 @@
    HBASE-1960  Master should wait for DFS to come up when creating
                hbase.version
    HBASE-2054  memstore size 0 is >= than blocking -2.0g size
-   HBASE-2057  Cluster won't stop
    HBASE-2064  Cannot disable a table if at the same the Master is moving 
                its regions around
    HBASE-2065  Cannot disable a table if any of its region is opening 
@@ -189,6 +188,7 @@
    HBASE-2152  Add default jmxremote.{access|password} files into conf
                (Lars George and Gary Helmling via Stack)
    HBASE-2156  HBASE-2037 broke Scan - only a test for trunk
+   HBASE-2057  Cluster won't stop (Gary Helmling and JD via JD)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: hadoop/hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/hbase?rev=902239&r1=902238&r2=902239&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/hbase (original)
+++ hadoop/hbase/trunk/bin/hbase Fri Jan 22 19:26:09 2010
@@ -173,18 +173,26 @@
   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"
+  if [ "$1" != "stop" ] ; then
+    HBASE_OPTS="$HBASE_OPTS $HBASE_MASTER_OPTS"
+  fi
 elif [ "$COMMAND" = "regionserver" ] ; then
   CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer'
-  HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS"
+  if [ "$1" != "stop" ] ; then
+    HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS"
+  fi
 elif [ "$COMMAND" = "thrift" ] ; then
   CLASS='org.apache.hadoop.hbase.thrift.ThriftServer'
-  HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS"
+  if [ "$1" != "stop" ] ; then
+    HBASE_OPTS="$HBASE_OPTS $HBASE_THRIFT_OPTS"
+  fi
 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"
+  if [ "$1" != "stop" ] ; then
+    HBASE_OPTS="$HBASE_OPTS $HBASE_ZOOKEEPER_OPTS"
+  fi
 else
   CLASS=$COMMAND
 fi



Mime
View raw message