Return-Path: X-Original-To: apmail-incubator-flume-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-flume-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 72ED09729 for ; Sun, 1 Apr 2012 23:56:06 +0000 (UTC) Received: (qmail 22333 invoked by uid 500); 1 Apr 2012 23:56:06 -0000 Delivered-To: apmail-incubator-flume-commits-archive@incubator.apache.org Received: (qmail 22307 invoked by uid 500); 1 Apr 2012 23:56:06 -0000 Mailing-List: contact flume-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: flume-dev@incubator.apache.org Delivered-To: mailing list flume-commits@incubator.apache.org Received: (qmail 22298 invoked by uid 99); 1 Apr 2012 23:56:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2012 23:56:06 +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; Sun, 01 Apr 2012 23:56:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B2860238890B; Sun, 1 Apr 2012 23:55:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1308221 - in /incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src: main/java/org/apache/flume/channel/recoverable/memory/wal/WAL.java test/java/org/apache/flume/channel/recoverable/memory/wal/TestWAL.java Date: Sun, 01 Apr 2012 23:55:42 -0000 To: flume-commits@incubator.apache.org From: arvind@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120401235542.B2860238890B@eris.apache.org> Author: arvind Date: Sun Apr 1 23:55:42 2012 New Revision: 1308221 URL: http://svn.apache.org/viewvc?rev=1308221&view=rev Log: FLUME-1088. TestWAL.testThreadedAppend fails on jenkins build server. (Brock Noland via Arvind Prabhakar) Modified: incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/wal/WAL.java incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/test/java/org/apache/flume/channel/recoverable/memory/wal/TestWAL.java Modified: incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/wal/WAL.java URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/wal/WAL.java?rev=1308221&r1=1308220&r2=1308221&view=diff ============================================================================== --- incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/wal/WAL.java (original) +++ incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/main/java/org/apache/flume/channel/recoverable/memory/wal/WAL.java Sun Apr 1 23:55:42 2012 @@ -125,13 +125,12 @@ public class WAL imp * @param clazz * @param rollSize * bytes - max size of a single file before we roll - * @param isRollRequiredInterval - * ms - how often we check the size of a log * @param maxLogsSize * bytes - total amount of logs to keep excluding the current log * @param minLogRentionPeriod * ms - minimum amount of time to keep a log * @param workerInterval + * ms - how often the background worker checks for old logs * @throws IOException */ public WAL(File path, Class clazz, long rollSize, Modified: incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/test/java/org/apache/flume/channel/recoverable/memory/wal/TestWAL.java URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/test/java/org/apache/flume/channel/recoverable/memory/wal/TestWAL.java?rev=1308221&r1=1308220&r2=1308221&view=diff ============================================================================== --- incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/test/java/org/apache/flume/channel/recoverable/memory/wal/TestWAL.java (original) +++ incubator/flume/trunk/flume-ng-channels/flume-recoverable-memory-channel/src/test/java/org/apache/flume/channel/recoverable/memory/wal/TestWAL.java Sun Apr 1 23:55:42 2012 @@ -185,7 +185,7 @@ public class TestWAL { t.setDaemon(true); t.start(); } - Assert.assertTrue(stopLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(stopLatch.await(15, TimeUnit.SECONDS)); Assert.assertEquals(Collections.EMPTY_LIST, errors); wal.close(); wal = new WAL(dataDir, Text.class);