Return-Path: Delivered-To: apmail-hadoop-hbase-commits-archive@minotaur.apache.org Received: (qmail 12415 invoked from network); 2 Apr 2009 07:28:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Apr 2009 07:28:47 -0000 Received: (qmail 99069 invoked by uid 500); 2 Apr 2009 07:28:47 -0000 Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org Received: (qmail 99035 invoked by uid 500); 2 Apr 2009 07:28:47 -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 99026 invoked by uid 99); 2 Apr 2009 07:28:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 07:28:47 +0000 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, 02 Apr 2009 07:28:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 703CC2388A04; Thu, 2 Apr 2009 07:28:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761189 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegionServer.java Date: Thu, 02 Apr 2009 07:28:26 -0000 To: hbase-commits@hadoop.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090402072826.703CC2388A04@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Thu Apr 2 07:28:25 2009 New Revision: 761189 URL: http://svn.apache.org/viewvc?rev=761189&view=rev Log: HBASE-1303 Secondary index configuration prevents HBase from starting Modified: hadoop/hbase/trunk/CHANGES.txt hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegionServer.java Modified: hadoop/hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=761189&r1=761188&r2=761189&view=diff ============================================================================== --- hadoop/hbase/trunk/CHANGES.txt (original) +++ hadoop/hbase/trunk/CHANGES.txt Thu Apr 2 07:28:25 2009 @@ -68,6 +68,8 @@ HBASE-1150 HMsg carries safemode flag; remove (Nitay Joffe via Stack) HBASE-1232 zookeeper client wont reconnect if there is a problem (Nitay Joffe via Andrew Purtell) + HBASE-1303 Secondary index configuration prevents HBase from starting + (Ken Weiner via Stack) IMPROVEMENTS HBASE-1089 Add count of regions on filesystem to master UI; add percentage Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegionServer.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegionServer.java?rev=761189&r1=761188&r2=761189&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegionServer.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/tableindexed/IndexedRegionServer.java Thu Apr 2 07:28:25 2009 @@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.transactional.TransactionalRegionServer; import org.apache.hadoop.util.Progressable; +import org.apache.hadoop.hbase.ipc.HBaseRPCProtocolVersion; /** * RegionServer which maintains secondary indexes. @@ -48,6 +49,15 @@ } @Override + public long getProtocolVersion(final String protocol, final long clientVersion) + throws IOException { + if (protocol.equals(IndexedRegionInterface.class.getName())) { + return HBaseRPCProtocolVersion.versionID; + } + return super.getProtocolVersion(protocol, clientVersion); + } + + @Override protected HRegion instantiateRegion(final HRegionInfo regionInfo) throws IOException { HRegion r = new IndexedRegion(HTableDescriptor.getTableDir(super