Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-4916: Merge out separate hdfs solrconfig.xml 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1499472 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2013-07-03 16:49:04 +00:00
parent df8e15a93b
commit 7dc5d67fe4
3 changed files with 8 additions and 1824 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
solr/build.xml
View File

@ -40,7 +40,7 @@
<!-- ========================================================================= --> <!-- ========================================================================= -->
<target name="example" description="Creates a runnable example configuration." <target name="example" description="Creates a runnable example configuration."
depends="dist-contrib,dist-war,setup-alt-examples"> depends="dist-contrib,dist-war">
<copy file="${dist}/${fullnamever}.war" <copy file="${dist}/${fullnamever}.war"
tofile="${example}/webapps/${ant.project.name}.war"/> tofile="${example}/webapps/${ant.project.name}.war"/>
<jar destfile="${example}/exampledocs/post.jar" <jar destfile="${example}/exampledocs/post.jar"
@ -56,15 +56,6 @@
<echo>See ${example}/README.txt for how to run the Solr example configuration.</echo> <echo>See ${example}/README.txt for how to run the Solr example configuration.</echo>
</target> </target>
<target name="setup-alt-examples">
<copy todir="${example}/hdfs" overwrite="true">
<fileset dir="${example}/solr"/>
</copy>
<copy todir="${example}/hdfs/collection1/conf" overwrite="true">
<fileset dir="${example}/alt-configs/hdfs"/>
</copy>
</target>
<target name="run-example" depends="example" <target name="run-example" depends="example"
description="Run Solr interactively, via Jetty. -Dexample.debug=true to enable JVM debugger"> description="Run Solr interactively, via Jetty. -Dexample.debug=true to enable JVM debugger">
<property name="example.solr.home" location="example/solr"/> <property name="example.solr.home" location="example/solr"/>

1807
solr/example/alt-configs/hdfs/solrconfig.xml
View File

File diff suppressed because it is too large Load Diff

14
solr/example/solr/collection1/conf/solrconfig.xml
View File

@ -184,7 +184,8 @@
maxBufferedDocs sets a limit on the number of documents buffered maxBufferedDocs sets a limit on the number of documents buffered
before flushing. before flushing.
If both ramBufferSizeMB and maxBufferedDocs is set, then If both ramBufferSizeMB and maxBufferedDocs is set, then
Lucene will flush based on whichever limit is hit first. --> Lucene will flush based on whichever limit is hit first.
The default is 100 MB. -->
<!-- <ramBufferSizeMB>100</ramBufferSizeMB> --> <!-- <ramBufferSizeMB>100</ramBufferSizeMB> -->
<!-- <maxBufferedDocs>1000</maxBufferedDocs> --> <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
@ -365,7 +366,7 @@
have some sort of hard autoCommit to limit the log size. have some sort of hard autoCommit to limit the log size.
--> -->
<autoCommit> <autoCommit>
<maxTime>15000</maxTime> <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
<openSearcher>false</openSearcher> <openSearcher>false</openSearcher>
</autoCommit> </autoCommit>
@ -374,11 +375,10 @@
but does not ensure that data is synced to disk. This is but does not ensure that data is synced to disk. This is
faster and more near-realtime friendly than a hard commit. faster and more near-realtime friendly than a hard commit.
--> -->
<!--
<autoSoftCommit> <autoSoftCommit>
<maxTime>1000</maxTime> <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
</autoSoftCommit> </autoSoftCommit>
-->
<!-- Update Related Event Listeners <!-- Update Related Event Listeners