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 03EE77DF0 for ; Wed, 20 Jul 2011 10:36:10 +0000 (UTC) Received: (qmail 96510 invoked by uid 500); 20 Jul 2011 10:36:09 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 96340 invoked by uid 500); 20 Jul 2011 10:35:50 -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 96291 invoked by uid 99); 20 Jul 2011 10:35:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jul 2011 10:35:48 +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; Wed, 20 Jul 2011 10:35:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7BD8523889B2 for ; Wed, 20 Jul 2011 10:35:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1148691 - in /hbase/trunk/src: main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java Date: Wed, 20 Jul 2011 10:35:23 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110720103523.7BD8523889B2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tedyu Date: Wed Jul 20 10:35:22 2011 New Revision: 1148691 URL: http://svn.apache.org/viewvc?rev=1148691&view=rev Log: HBASE-4095 make cacheFlushLock.waittime longer Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=1148691&r1=1148690&r2=1148691&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java Wed Jul 20 10:35:22 2011 @@ -346,7 +346,7 @@ public class HLog implements Syncable { this.optionalFlushInterval = conf.getLong("hbase.regionserver.optionallogflushinterval", 1 * 1000); this.cacheFlushLockWaitTime = - conf.getLong("hbase.regionserver.cacheFlushLock.waittime", 5000); + conf.getLong("hbase.regionserver.cacheFlushLock.waittime", 25000); if (failIfLogDirExists && fs.exists(dir)) { throw new IOException("Target HLog directory already exists: " + dir); } Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java?rev=1148691&r1=1148690&r2=1148691&view=diff ============================================================================== --- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java (original) +++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java Wed Jul 20 10:35:22 2011 @@ -314,7 +314,8 @@ public class TestLogRolling { writeData(table, 2); long newFilenum = log.getFilenum(); - assertTrue("Missing datanode should've triggered a log roll", + assertTrue("Missing datanode should've triggered a log roll: " + newFilenum + + " " + oldFilenum + " " + curTime, newFilenum > oldFilenum && newFilenum > curTime); // write some more log data (this should use a new hdfs_out)