Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 90125 invoked from network); 3 Feb 2010 16:14:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Feb 2010 16:14:17 -0000 Received: (qmail 30928 invoked by uid 500); 3 Feb 2010 16:14:17 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 30869 invoked by uid 500); 3 Feb 2010 16:14:17 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 30860 invoked by uid 99); 3 Feb 2010 16:14:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Feb 2010 16:14:17 +0000 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; Wed, 03 Feb 2010 16:14:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D80BF2388993; Wed, 3 Feb 2010 16:13:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r906104 - /activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java Date: Wed, 03 Feb 2010 16:13:46 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100203161346.D80BF2388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dejanb Date: Wed Feb 3 16:13:46 2010 New Revision: 906104 URL: http://svn.apache.org/viewvc?rev=906104&view=rev Log: merging 903758 - resolve intermitent failure on loaded machines, consumer could complete before producer thread got to do any work at all Modified: activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java Modified: activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java?rev=906104&r1=906103&r2=906104&view=diff ============================================================================== --- activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java (original) +++ activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java Wed Feb 3 16:13:46 2010 @@ -18,7 +18,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; + import java.io.File; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import javax.jms.Connection; import javax.jms.DeliveryMode; @@ -81,6 +84,7 @@ final Connection producerConnection = factory.createConnection(); producerConnection.start(); + final CountDownLatch producerHasSentTenMessages = new CountDownLatch(10); Thread producingThread = new Thread("Producing thread") { public void run() { try { @@ -92,10 +96,12 @@ producer.send(message); messagesSent.incrementAndGet(); + producerHasSentTenMessages.countDown(); Thread.sleep(10); - LOG.info("Sent Message " + idx); - LOG.info("Temp Store Usage " + broker.getSystemUsage().getTempUsage().getUsage()); - + if (idx != 0 && idx%100 == 0) { + LOG.info("Sent Message " + idx); + LOG.info("Temp Store Usage " + broker.getSystemUsage().getTempUsage().getUsage()); + } } producer.close(); session.close(); @@ -106,12 +112,16 @@ }; producingThread.start(); + assertTrue("producer has sent 10 in a reasonable time", producerHasSentTenMessages.await(30, TimeUnit.SECONDS)); + int count = 0; Message m = null; while ((m = consumer.receive(messageReceiveTimeout)) != null) { count++; - LOG.info("Recieved Message (" + count + "):" + m); + if (count != 0 && count%10 == 0) { + LOG.info("Recieved Message (" + count + "):" + m); + } messagesConsumed.incrementAndGet(); try { Thread.sleep(100); @@ -120,19 +130,13 @@ } } - LOG.info("Connection Timeout: Retrying"); - - // session.close(); - // consumerConnection.close(); - // - // consumerConnection2.start(); - // session2 = consumerConnection2.createSession(false, - // Session.AUTO_ACKNOWLEDGE); - // consumer = session2.createConsumer(destination); + LOG.info("Connection Timeout: Retrying.. count: " + count); while ((m = consumer.receive(messageReceiveTimeout)) != null) { count++; - LOG.info("Recieved Message (" + count + "):" + m); + if (count != 0 && count%10 == 0) { + LOG.info("Recieved Message (" + count + "):" + m); + } messagesConsumed.incrementAndGet(); try { Thread.sleep(100);