Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-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 46CCCDB04 for ; Wed, 15 May 2013 13:58:49 +0000 (UTC) Received: (qmail 60805 invoked by uid 500); 15 May 2013 13:58:48 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 60666 invoked by uid 500); 15 May 2013 13:58:47 -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 60634 invoked by uid 99); 15 May 2013 13:58:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 May 2013 13:58:47 +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, 15 May 2013 13:58:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1E15823889E2; Wed, 15 May 2013 13:58:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1482845 - in /activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb: DBManager.scala LevelDBStore.scala Date: Wed, 15 May 2013 13:58:25 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130515135826.1E15823889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Wed May 15 13:58:25 2013 New Revision: 1482845 URL: http://svn.apache.org/r1482845 Log: Don't delay flushes for now. Seems to cause more harm than good. Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala?rev=1482845&r1=1482844&r2=1482845&view=diff ============================================================================== --- activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala (original) +++ activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala Wed May 15 13:58:25 2013 @@ -207,7 +207,7 @@ class DelayableUOW(val manager:DBManager } def completeAsap() = this.synchronized { disableDelay=true } - def delayable = !disableDelay && delayableActions>0 && manager.flushDelay>=0 + def delayable = !disableDelay && delayableActions>0 && manager.flushDelay>0 def rm(msg:MessageId) = { actions -= msg Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala?rev=1482845&r1=1482844&r2=1482845&view=diff ============================================================================== --- activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala (original) +++ activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala Wed May 15 13:58:25 2013 @@ -168,7 +168,7 @@ class LevelDBStore extends LockableServi @BeanProperty var indexCacheSize: Long = 1024 * 1024 * 256L @BeanProperty - var flushDelay = 1000*5 + var flushDelay = 0 @BeanProperty var asyncBufferSize = 1024*1024*4 @BeanProperty