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 A62AECB6B for ; Thu, 27 Jun 2013 16:25:25 +0000 (UTC) Received: (qmail 69308 invoked by uid 500); 27 Jun 2013 16:25:25 -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 69301 invoked by uid 99); 27 Jun 2013 16:25:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jun 2013 16:25:25 +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; Thu, 27 Jun 2013 16:25:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0B1DE2388906; Thu, 27 Jun 2013 16:25:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1497425 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Date: Thu, 27 Jun 2013 16:25:02 -0000 To: commits@lucene.apache.org From: rmuir@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130627162503.0B1DE2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmuir Date: Thu Jun 27 16:25:02 2013 New Revision: 1497425 URL: http://svn.apache.org/r1497425 Log: randomize CMS a little bit Modified: lucene/dev/branches/branch_4x/ (props changed) lucene/dev/branches/branch_4x/lucene/ (props changed) lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed) lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1497425&r1=1497424&r2=1497425&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original) +++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Thu Jun 27 16:25:02 2013 @@ -737,6 +737,13 @@ public abstract class LuceneTestCase ext if (r.nextBoolean()) { c.setMergeScheduler(new SerialMergeScheduler()); + } else if (rarely(r)) { + int maxThreadCount = _TestUtil.nextInt(random(), 1, 4); + int maxMergeCount = _TestUtil.nextInt(random(), maxThreadCount, maxThreadCount+4); + ConcurrentMergeScheduler cms = new ConcurrentMergeScheduler(); + cms.setMaxMergeCount(maxMergeCount); + cms.setMaxThreadCount(maxThreadCount); + c.setMergeScheduler(cms); } if (r.nextBoolean()) { if (rarely(r)) {