Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-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 8AB1111634 for ; Thu, 24 Apr 2014 12:45:09 +0000 (UTC) Received: (qmail 17583 invoked by uid 500); 24 Apr 2014 12:45:08 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 17465 invoked by uid 500); 24 Apr 2014 12:45:02 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 17401 invoked by uid 99); 24 Apr 2014 12:44:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Apr 2014 12:44:59 +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; Thu, 24 Apr 2014 12:44:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CB89E238890D; Thu, 24 Apr 2014 12:44:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1589694 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorPeriodicCheckTest.java Date: Thu, 24 Apr 2014 12:44:34 -0000 To: commits@zookeeper.apache.org From: ivank@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140424124434.CB89E238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ivank Date: Thu Apr 24 12:44:34 2014 New Revision: 1589694 URL: http://svn.apache.org/r1589694 Log: BOOKKEEPER-743: Periodic ledger check running too often as doc doesn't match implementation. (ivank) Modified: zookeeper/bookkeeper/trunk/CHANGES.txt zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorPeriodicCheckTest.java Modified: zookeeper/bookkeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1589694&r1=1589693&r2=1589694&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/CHANGES.txt (original) +++ zookeeper/bookkeeper/trunk/CHANGES.txt Thu Apr 24 12:44:34 2014 @@ -180,6 +180,8 @@ Trunk (unreleased changes) BOOKKEEPER-742: Fix for empty ledgers losing quorum. (ivank) + BOOKKEEPER-743: Periodic ledger check running too often as doc doesn't match implementation. (ivank) + hedwig-server: BOOKKEEPER-601: readahead cache size isn't updated correctly (sijie via fpj) Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java?rev=1589694&r1=1589693&r2=1589694&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java (original) +++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java Thu Apr 24 12:44:34 2014 @@ -224,7 +224,7 @@ public class Auditor implements BookiesL +"running periodic check", ue); } } - }, interval, interval, TimeUnit.MILLISECONDS); + }, interval, interval, TimeUnit.SECONDS); } else { LOG.info("Periodic checking disabled"); } Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorPeriodicCheckTest.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorPeriodicCheckTest.java?rev=1589694&r1=1589693&r2=1589694&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorPeriodicCheckTest.java (original) +++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorPeriodicCheckTest.java Thu Apr 24 12:44:34 2014 @@ -64,7 +64,7 @@ public class AuditorPeriodicCheckTest ex private HashMap auditorElectors = new HashMap(); private List zkClients = new LinkedList(); - private final static int CHECK_INTERVAL = 100; // run every 100ms + private final static int CHECK_INTERVAL = 1; // run every second public AuditorPeriodicCheckTest() { super(3); @@ -151,7 +151,7 @@ public class AuditorPeriodicCheckTest ex if (underReplicatedLedger != -1) { break; } - Thread.sleep(CHECK_INTERVAL); + Thread.sleep(CHECK_INTERVAL * 1000); } assertEquals("Ledger should be under replicated", ledgerId, underReplicatedLedger); underReplicationManager.close(); @@ -199,7 +199,7 @@ public class AuditorPeriodicCheckTest ex if (underReplicatedLedger != -1) { break; } - Thread.sleep(CHECK_INTERVAL); + Thread.sleep(CHECK_INTERVAL * 1000); } assertEquals("Ledger should be under replicated", ledgerToCorrupt, underReplicatedLedger); underReplicationManager.close(); @@ -256,14 +256,14 @@ public class AuditorPeriodicCheckTest ex bsConfs.add(conf); bs.add(startBookie(conf, deadBookie)); - Thread.sleep(CHECK_INTERVAL * 2); + Thread.sleep(CHECK_INTERVAL * 2000); assertEquals("Nothing should have tried to read", 0, numReads.get()); underReplicationManager.enableLedgerReplication(); - Thread.sleep(CHECK_INTERVAL * 2); // give it time to run + Thread.sleep(CHECK_INTERVAL * 2000); // give it time to run underReplicationManager.disableLedgerReplication(); // give it time to stop, from this point nothing new should be marked - Thread.sleep(CHECK_INTERVAL * 2); + Thread.sleep(CHECK_INTERVAL * 2000); int numUnderreplicated = 0; long underReplicatedLedger = -1; @@ -277,7 +277,7 @@ public class AuditorPeriodicCheckTest ex underReplicationManager.markLedgerReplicated(underReplicatedLedger); } while (underReplicatedLedger != -1); - Thread.sleep(CHECK_INTERVAL * 2); // give a chance to run again (it shouldn't, it's disabled) + Thread.sleep(CHECK_INTERVAL * 2000); // give a chance to run again (it shouldn't, it's disabled) // ensure that nothing is marked as underreplicated underReplicatedLedger = underReplicationManager.pollLedgerToRereplicate();