Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-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 0CA1E953E for ; Wed, 13 Jun 2012 15:04:34 +0000 (UTC) Received: (qmail 42173 invoked by uid 500); 13 Jun 2012 15:04:33 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 42165 invoked by uid 99); 13 Jun 2012 15:04:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jun 2012 15:04:33 +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, 13 Jun 2012 15:04:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E19B6238899C; Wed, 13 Jun 2012 15:04:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1349898 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java Date: Wed, 13 Jun 2012 15:04:12 -0000 To: commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120613150412.E19B6238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Wed Jun 13 15:04:12 2012 New Revision: 1349898 URL: http://svn.apache.org/viewvc?rev=1349898&view=rev Log: fix intermittent test failure: make sure reader pooling is on before we start the index threads Modified: lucene/dev/branches/branch_4x/ (props changed) lucene/dev/branches/branch_4x/lucene/ (props changed) lucene/dev/branches/branch_4x/lucene/core/ (props changed) lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java?rev=1349898&r1=1349897&r2=1349898&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java (original) +++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java Wed Jun 13 15:04:12 2012 @@ -89,6 +89,14 @@ public class TestNRTThreads extends Thre assertFalse("saw non-zero open-but-deleted count", anyOpenDelFiles); } + @Override + protected void doAfterWriter(ExecutorService es) throws Exception { + // Force writer to do reader pooling, always, so that + // all merged segments, even for merges before + // doSearching is called, are warmed: + writer.getReader().close(); + } + private IndexSearcher fixedSearcher; protected IndexSearcher getCurrentSearcher() throws Exception {