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 2011/06/22 01:46:36 UTC

svn commit: r1138249 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java src/main/ruby/hbase/admin.rb

Author: stack
Date: Tue Jun 21 23:46:36 2011
New Revision: 1138249

URL: http://svn.apache.org/viewvc?rev=1138249&view=rev
Log:
HBASE-4005 close_region bugs

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
    hbase/branches/0.90/src/main/ruby/hbase/admin.rb

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1138249&r1=1138248&r2=1138249&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Tue Jun 21 23:46:36 2011
@@ -43,6 +43,7 @@ Release 0.90.4 - Unreleased
    HBASE-3995  HBASE-3946 broke TestMasterFailover
    HBASE-2077  NullPointerException with an open scanner that expired causing
                an immediate region server shutdown -- part 2.
+   HBASE-4005  close_region bugs
 
 
   IMPROVEMENT

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1138249&r1=1138248&r2=1138249&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Tue Jun 21 23:46:36 2011
@@ -784,7 +784,7 @@ public class HBaseAdmin implements Abort
     }
   }
 
-  private void closeRegion(final HServerAddress hsa, final HRegionInfo hri)
+  public void closeRegion(final HServerAddress hsa, final HRegionInfo hri)
   throws IOException {
     HRegionInterface rs = this.connection.getHRegionConnection(hsa);
     // Close the region without updating zk state.

Modified: hbase/branches/0.90/src/main/ruby/hbase/admin.rb
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/ruby/hbase/admin.rb?rev=1138249&r1=1138248&r2=1138249&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/ruby/hbase/admin.rb (original)
+++ hbase/branches/0.90/src/main/ruby/hbase/admin.rb Tue Jun 21 23:46:36 2011
@@ -161,7 +161,7 @@ module Hbase
     #----------------------------------------------------------------------------------------------
     # Closes a region
     def close_region(region_name, server = nil)
-      @admin.closeRegion(region_name, server ? [server].to_java : nil)
+      @admin.closeRegion(region_name, server)
     end
 
     #----------------------------------------------------------------------------------------------