Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 390E44AA8 for ; Tue, 21 Jun 2011 23:47:00 +0000 (UTC) Received: (qmail 1978 invoked by uid 500); 21 Jun 2011 23:47:00 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 1954 invoked by uid 500); 21 Jun 2011 23:47:00 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 1941 invoked by uid 99); 21 Jun 2011 23:47:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jun 2011 23:47:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jun 2011 23:46:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D6D2723889D5; Tue, 21 Jun 2011 23:46:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Tue, 21 Jun 2011 23:46:36 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110621234636.D6D2723889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 #----------------------------------------------------------------------------------------------