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

[ho...@apache.org]

Author: hossman
Date: Tue Aug  6 21:43:54 2013
New Revision: 1511128

URL: http://svn.apache.org/r1511128
Log:
SOLR-4952: TestSolrDeletionPolicy1 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-delpolicy1.xml

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml?rev=1511128&r1=1511127&r2=1511128&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml Tue Aug  6 21:43:54 2013
@@ -25,12 +25,27 @@
   <requestHandler name="standard" class="solr.StandardRequestHandler"/>
 
   <indexConfig>
-   <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
-   <deletionPolicy class="solr.SolrDeletionPolicy">
-    <str name="keepOptimizedOnly">true</str>
-    <str name="maxCommitsToKeep">3</str>
-    <str name="maxCommitAge">100MILLISECONDS</str>
-   </deletionPolicy>
+    <!-- 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="solr.SolrDeletionPolicy">
+      <str name="keepOptimizedOnly">true</str>
+      <str name="maxCommitsToKeep">3</str>
+      <str name="maxCommitAge">100MILLISECONDS</str>
+    </deletionPolicy>
   </indexConfig>
 
 </config>