Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 86561 invoked from network); 2 Nov 2006 22:40:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Nov 2006 22:40:19 -0000 Received: (qmail 13277 invoked by uid 500); 2 Nov 2006 22:40:30 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 13255 invoked by uid 500); 2 Nov 2006 22:40:30 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 13244 invoked by uid 99); 2 Nov 2006 22:40:30 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Nov 2006 14:40:30 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Nov 2006 14:40:18 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 096BB1A9846; Thu, 2 Nov 2006 14:39:54 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470573 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java Date: Thu, 02 Nov 2006 22:39:53 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061102223954.096BB1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Thu Nov 2 14:39:53 2006 New Revision: 470573 URL: http://svn.apache.org/viewvc?view=rev&rev=470573 Log: DERBY-801 (partial) Allow parallel access to data files DERBY-801-6.patch remedies the noise from the iosInProgress sanity checking by checking the committed drop state before croaking. Patch contributed by Anders Morken. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java?view=diff&rev=470573&r1=470572&r2=470573 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java Thu Nov 2 14:39:53 2006 @@ -132,7 +132,12 @@ synchronized void closeContainer() { if (SanityManager.DEBUG) { - SanityManager.ASSERT(iosInProgress == 0, + // Any IOs in progress to a container being dropped will be + // ignored, so we should not complain about starting a close + // while there are IOs in progress if it is being dropped + // anyway. + SanityManager.ASSERT( (iosInProgress == 0) + || getCommittedDropState(), "Container closed while IO operations are in progress. " + " This should not happen."); }