svn commit: r1511138 - /lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml

[ho...@apache.org]

Author: hossman
Date: Tue Aug  6 22:26:50 2013
New Revision: 1511138

URL: http://svn.apache.org/r1511138
Log:
SOLR-4952: TestSolrDeletionPolicy2 can't directly use solrconfig.snippet.randomindexconfig.xml - but it can leverage the random sys props directly

Modified:
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml?rev=1511138&r1=1511137&r2=1511138&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml Tue Aug  6 22:26:50 2013
@@ -21,7 +21,22 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
   <indexConfig>
+
+    <!-- we can't include solrconfig.snippet.randomindexconfig.xml because we need
+         to configure an explicit deletion policy, but we still wnat to randomize as much 
+         as possible. 
+    -->
+    <mergePolicy class="${solr.tests.mergePolicy:org.apache.solr.util.RandomMergePolicy}" />
     <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
+
+    <maxBufferedDocs>${solr.tests.maxBufferedDocs}</maxBufferedDocs>
+    <maxIndexingThreads>${solr.tests.maxIndexingThreads}</maxIndexingThreads>
+    <ramBufferSizeMB>${solr.tests.ramBufferSizeMB}</ramBufferSizeMB>
+    
+    <mergeScheduler class="${solr.tests.mergeScheduler}" />
+    
+    <lockType>single</lockType>
+
     <deletionPolicy class="org.apache.solr.core.FakeDeletionPolicy">
       <str name="var1">value1</str>
 		  <str name="var2">value2</str>