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 76AA9DCBB for ; Thu, 3 Jan 2013 05:32:39 +0000 (UTC) Received: (qmail 93273 invoked by uid 500); 3 Jan 2013 05:32:39 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 93149 invoked by uid 500); 3 Jan 2013 05:32:39 -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 93125 invoked by uid 99); 3 Jan 2013 05:32:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2013 05:32:38 +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, 03 Jan 2013 05:32:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B14C923888D2; Thu, 3 Jan 2013 05:32:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1428168 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java Date: Thu, 03 Jan 2013 05:32:17 -0000 To: commits@hbase.apache.org From: larsh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130103053217.B14C923888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: larsh Date: Thu Jan 3 05:32:17 2013 New Revision: 1428168 URL: http://svn.apache.org/viewvc?rev=1428168&view=rev Log: HBASE-7485 TestSplitLogManager is still flaky on windows (Enis) Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java?rev=1428168&r1=1428167&r2=1428168&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java Thu Jan 3 05:32:17 2013 @@ -220,7 +220,7 @@ public class TestSplitLogManager { slm = new SplitLogManager(zkw, conf, stopper, master, DUMMY_MASTER, null); slm.finishInitialization(); - waitForCounter(tot_mgr_orphan_task_acquired, 0, 1, 100); + waitForCounter(tot_mgr_orphan_task_acquired, 0, 1, to/2); Task task = slm.findOrCreateOrphanTask(tasknode); assertTrue(task.isOrphan()); waitForCounter(tot_mgr_heartbeat, 0, 1, to/2); @@ -508,7 +508,7 @@ public class TestSplitLogManager { LOG.info("testVanishingTaskZNode"); conf.setInt("hbase.splitlog.manager.unassigned.timeout", 0); - + conf.setInt("hbase.splitlog.manager.timeoutmonitor.period", 1000); slm = new SplitLogManager(zkw, conf, stopper, master, DUMMY_MASTER, null); slm.finishInitialization(); FileSystem fs = TEST_UTIL.getTestFileSystem(); @@ -537,7 +537,7 @@ public class TestSplitLogManager { // remove the task znode, to finish the distributed log splitting ZKUtil.deleteNode(zkw, znode); waitForCounter(tot_mgr_get_data_nonode, 0, 1, 30000); - waitForCounter(tot_mgr_log_split_batch_success, 0, 1, 1000); + waitForCounter(tot_mgr_log_split_batch_success, 0, 1, to/2); assertTrue(fs.exists(logFile)); } finally { if (thread != null) {