You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2013/01/16 05:02:12 UTC
svn commit: r1433818 - in /lucene/dev/branches/lucene_solr_4_1: ./
dev-tools/ lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/codecs/ lucene/core/ lucene/core/src/test/org/ap...
Author: yonik
Date: Wed Jan 16 04:02:10 2013
New Revision: 1433818
URL: http://svn.apache.org/viewvc?rev=1433818&view=rev
Log:
docs: update description of updateLog / autoCommit in solrconfig
Modified:
lucene/dev/branches/lucene_solr_4_1/ (props changed)
lucene/dev/branches/lucene_solr_4_1/dev-tools/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/BUILD.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/CHANGES.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/analysis/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/backwards/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/codecs/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/demo/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/facet/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/grouping/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/join/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/memory/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/misc/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/module-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/queries/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/site/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/spatial/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/suggest/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/tools/ (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/CHANGES.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/cloud-dev/ (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/example/ (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/example/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene_solr_4_1/solr/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/scripts/ (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/site/ (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/testlogging.properties (props changed)
lucene/dev/branches/lucene_solr_4_1/solr/webapp/ (props changed)
Modified: lucene/dev/branches/lucene_solr_4_1/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_1/solr/example/solr/collection1/conf/solrconfig.xml?rev=1433818&r1=1433817&r2=1433818&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_1/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene_solr_4_1/solr/example/solr/collection1/conf/solrconfig.xml Wed Jan 16 04:02:10 2013
@@ -304,6 +304,16 @@
<!-- The default high-performance update handler -->
<updateHandler class="solr.DirectUpdateHandler2">
+ <!-- Enables a transaction log, used for real-time get, durability, and
+ and solr cloud replica recovery. The log can grow as big as
+ uncommitted changes to the index, so use of a hard autoCommit
+ is recommended (see below).
+ "dir" - the target directory for transaction logs, defaults to the
+ solr data directory. -->
+ <updateLog>
+ <str name="dir">${solr.ulog.dir:}</str>
+ </updateLog>
+
<!-- AutoCommit
Perform a hard commit automatically under certain conditions.
@@ -319,8 +329,11 @@
since a document was added before automaticly
triggering a new commit.
openSearcher - if false, the commit causes recent index changes
- to be flushed to stable storage, but does not cause a new
- searcher to be opened to make those changes visible.
+ to be flushed to stable storage, but does not cause a new
+ searcher to be opened to make those changes visible.
+
+ If the updateLog is enabled, then it's highly recommended to
+ have some sort of hard autoCommit to limit the log size.
-->
<autoCommit>
<maxTime>15000</maxTime>
@@ -370,14 +383,6 @@
</listener>
-->
- <!-- Enables a transaction log, currently used for real-time get.
- "dir" - the target directory for transaction logs, defaults to the
- solr data directory. -->
- <updateLog>
- <str name="dir">${solr.ulog.dir:}</str>
- </updateLog>
-
-
</updateHandler>
<!-- IndexReaderFactory