Return-Path: Delivered-To: apmail-hadoop-hbase-commits-archive@locus.apache.org Received: (qmail 46598 invoked from network); 12 Aug 2008 17:23:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Aug 2008 17:23:33 -0000 Received: (qmail 69525 invoked by uid 500); 12 Aug 2008 17:23:32 -0000 Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org Received: (qmail 69513 invoked by uid 500); 12 Aug 2008 17:23:32 -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 69504 invoked by uid 99); 12 Aug 2008 17:23:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Aug 2008 10:23:32 -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; Tue, 12 Aug 2008 17:22:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 103E3238899F; Tue, 12 Aug 2008 10:23:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r685234 - in /hadoop/hbase: branches/0.2/CHANGES.txt branches/0.2/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java trunk/CHANGES.txt trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java Date: Tue, 12 Aug 2008 17:23:12 -0000 To: hbase-commits@hadoop.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080812172313.103E3238899F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Tue Aug 12 10:23:11 2008 New Revision: 685234 URL: http://svn.apache.org/viewvc?rev=685234&view=rev Log: HBASE-820 Need mainline to flush when 'Blocking updates' goes up. Modified: hadoop/hbase/branches/0.2/CHANGES.txt hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java hadoop/hbase/trunk/CHANGES.txt hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java Modified: hadoop/hbase/branches/0.2/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.2/CHANGES.txt?rev=685234&r1=685233&r2=685234&view=diff ============================================================================== --- hadoop/hbase/branches/0.2/CHANGES.txt (original) +++ hadoop/hbase/branches/0.2/CHANGES.txt Tue Aug 12 10:23:11 2008 @@ -12,6 +12,8 @@ HBASE-819 Remove DOS-style ^M carriage returns from all code where found (Jonathan Gray via Jim Kellerman) HBASE-818 Deadlock running 'flushSomeRegions' (Andrew Purtell via Stack) + HBASE-821 Need mainline to flush when 'Blocking updates' goes up. + (Jean-Daniel Cryans via Stack) IMPROVEMENTS HBASE-801 When a table haven't disable, shell could response in a "user Modified: hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=685234&r1=685233&r2=685234&view=diff ============================================================================== --- hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original) +++ hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java Tue Aug 12 10:23:11 2008 @@ -1423,7 +1423,14 @@ * this and the synchronize on 'this' inside in internalFlushCache to send * the notify. */ - private synchronized void checkResources() { + private void checkResources() { + if (this.memcacheSize.get() > this.blockingMemcacheSize) { + requestFlush(); + doBlocking(); + } + } + + private synchronized void doBlocking() { boolean blocked = false; while (this.memcacheSize.get() > this.blockingMemcacheSize) { if (!blocked) { Modified: hadoop/hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=685234&r1=685233&r2=685234&view=diff ============================================================================== --- hadoop/hbase/trunk/CHANGES.txt (original) +++ hadoop/hbase/trunk/CHANGES.txt Tue Aug 12 10:23:11 2008 @@ -12,6 +12,8 @@ HBASE-819 Remove DOS-style ^M carriage returns from all code where found (Jonathan Gray via Jim Kellerman) HBASE-818 Deadlock running 'flushSomeRegions' (Andrew Purtell via Stack) + HBASE-821 Need mainline to flush when 'Blocking updates' goes up. + (Jean-Daniel Cryans via Stack) IMPROVEMENTS HBASE-801 When a table haven't disable, shell could response in a "user Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=685234&r1=685233&r2=685234&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java Tue Aug 12 10:23:11 2008 @@ -1423,7 +1423,14 @@ * this and the synchronize on 'this' inside in internalFlushCache to send * the notify. */ - private synchronized void checkResources() { + private void checkResources() { + if (this.memcacheSize.get() > this.blockingMemcacheSize) { + requestFlush(); + doBlocking(); + } + } + + private synchronized void doBlocking() { boolean blocked = false; while (this.memcacheSize.get() > this.blockingMemcacheSize) { if (!blocked) {