Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 40851 invoked from network); 28 Apr 2009 15:13:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Apr 2009 15:13:15 -0000 Received: (qmail 73548 invoked by uid 500); 28 Apr 2009 15:13:15 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 73505 invoked by uid 500); 28 Apr 2009 15:13:15 -0000 Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-commits@lucene.apache.org Received: (qmail 73458 invoked by uid 99); 28 Apr 2009 15:13:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2009 15:13:15 +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; Tue, 28 Apr 2009 15:13:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 92CC1238896C; Tue, 28 Apr 2009 15:12:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r769431 - /lucene/java/trunk/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Date: Tue, 28 Apr 2009 15:12:54 -0000 To: java-commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090428151254.92CC1238896C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Tue Apr 28 15:12:53 2009 New Revision: 769431 URL: http://svn.apache.org/viewvc?rev=769431&view=rev Log: make default exception handler in ConcurrentMergeHandler pause for 250 msec after each exception, to prevent saturating CPU Modified: lucene/java/trunk/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Modified: lucene/java/trunk/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java?rev=769431&r1=769430&r2=769431&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Tue Apr 28 15:12:53 2009 @@ -340,6 +340,13 @@ /** Called when an exception is hit in a background merge * thread */ protected void handleMergeException(Throwable exc) { + try { + Thread.sleep(250); + } catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + // In 3.0 this will throw InterruptedException + throw new RuntimeException(ie); + } throw new MergePolicy.MergeException(exc, dir); }