Return-Path: Delivered-To: apmail-hadoop-hbase-commits-archive@locus.apache.org Received: (qmail 79801 invoked from network); 17 Jul 2008 18:54:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Jul 2008 18:54:46 -0000 Received: (qmail 62778 invoked by uid 500); 17 Jul 2008 18:54:46 -0000 Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org Received: (qmail 62767 invoked by uid 500); 17 Jul 2008 18:54:46 -0000 Mailing-List: contact hbase-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hbase-dev@hadoop.apache.org Delivered-To: mailing list hbase-commits@hadoop.apache.org Received: (qmail 62758 invoked by uid 99); 17 Jul 2008 18:54:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jul 2008 11:54:46 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 17 Jul 2008 18:54:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4D04023889C0; Thu, 17 Jul 2008 11:54:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r677684 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java src/java/org/apache/hadoop/hbase/master/RegionManager.java Date: Thu, 17 Jul 2008 18:54:25 -0000 To: hbase-commits@hadoop.apache.org From: jimk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080717185426.4D04023889C0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jimk Date: Thu Jul 17 11:54:25 2008 New Revision: 677684 URL: http://svn.apache.org/viewvc?rev=677684&view=rev Log: HBASE-424 Should be able to enable/disable .META. table Modified: hadoop/hbase/trunk/CHANGES.txt hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java Modified: hadoop/hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=677684&r1=677683&r2=677684&view=diff ============================================================================== --- hadoop/hbase/trunk/CHANGES.txt (original) +++ hadoop/hbase/trunk/CHANGES.txt Thu Jul 17 11:54:25 2008 @@ -193,6 +193,7 @@ HBASE-34 Set memcache flush size per column (Andrew Purtell via Stack) HBASE-42 Set region split size on table creation (Andrew Purtell via Stack) HBASE-43 Add a read-only attribute to columns (Andrew Purtell via Stack) + HBASE-424 Should be able to enable/disable .META. table IMPROVEMENTS HBASE-559 MR example job to count table rows Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=677684&r1=677683&r2=677684&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Thu Jul 17 11:54:25 2008 @@ -312,7 +312,6 @@ if (this.master == null) { throw new MasterNotRunningException("master has been shut down"); } - HTableDescriptor.isLegalTableName(tableName); try { this.master.enableTable(tableName); } catch (RemoteException e) { @@ -373,7 +372,6 @@ if (this.master == null) { throw new MasterNotRunningException("master has been shut down"); } - HTableDescriptor.isLegalTableName(tableName); try { this.master.disableTable(tableName); } catch (RemoteException e) { Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java?rev=677684&r1=677683&r2=677684&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java Thu Jul 17 11:54:25 2008 @@ -519,15 +519,21 @@ byte [] firstMetaRegion = null; Set metaRegions = new HashSet(); - synchronized (onlineMetaRegions) { - if (onlineMetaRegions.size() == 1) { - firstMetaRegion = onlineMetaRegions.firstKey(); - } else if (onlineMetaRegions.containsKey(tableName)) { - firstMetaRegion = tableName; - } else { - firstMetaRegion = onlineMetaRegions.headMap(tableName).lastKey(); + if (Bytes.equals(tableName, HConstants.META_TABLE_NAME)) { + metaRegions.add(new MetaRegion(rootRegionLocation.get(), + HRegionInfo.ROOT_REGIONINFO.getRegionName())); + + } else { + synchronized (onlineMetaRegions) { + if (onlineMetaRegions.size() == 1) { + firstMetaRegion = onlineMetaRegions.firstKey(); + } else if (onlineMetaRegions.containsKey(tableName)) { + firstMetaRegion = tableName; + } else { + firstMetaRegion = onlineMetaRegions.headMap(tableName).lastKey(); + } + metaRegions.addAll(onlineMetaRegions.tailMap(firstMetaRegion).values()); } - metaRegions.addAll(onlineMetaRegions.tailMap(firstMetaRegion).values()); } return metaRegions; }