svn commit: r1378387 - /lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml

[ho...@apache.org]

Author: hossman
Date: Tue Aug 28 23:50:38 2012
New Revision: 1378387

URL: http://svn.apache.org/viewvc?rev=1378387&view=rev
Log:
SOLR-3757: reduce confusion if people go to enable master/slave replication by only having a single /replication handler in the example config

Modified:
    lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml

Modified: lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml?rev=1378387&r1=1378386&r2=1378387&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml Tue Aug 28 23:50:38 2012
@@ -1104,30 +1104,33 @@
 
        http://wiki.apache.org/solr/SolrReplication 
 
-       In the example below, remove the <lst name="master"> section if
-       this is just a slave and remove  the <lst name="slave"> section
-       if this is just a master.
+       It is also neccessary for SolrCloud to function (in Cloud mode, the 
+       replication handler is used to bulk transfer segments when nodes 
+       are added or need to recover).
+
+       https://wiki.apache.org/solr/SolrCloud/
     -->
-  <!--
-     <requestHandler name="/replication" class="solr.ReplicationHandler" >
+  <requestHandler name="/replication" class="solr.ReplicationHandler" > 
+    <!--
+       To enable simple master/slave replication, uncomment one of the 
+       sections below, depending on wether this solr instance should be 
+       the "master" or a "slave".  If this instance is a "slave" you will 
+       also need to fill in the masterUrl to point to a real machine.
+    -->
+    <!--
        <lst name="master">
          <str name="replicateAfter">commit</str>
          <str name="replicateAfter">startup</str>
          <str name="confFiles">schema.xml,stopwords.txt</str>
        </lst>
+    -->
+    <!--
        <lst name="slave">
-         <str name="masterUrl">http://localhost:8983/solr</str>
+         <str name="masterUrl">http://your-master-hostname:8983/solr</str>
          <str name="pollInterval">00:00:60</str>
        </lst>
-     </requestHandler>
-    -->
-    
-    <!-- Solr Replication for SolrCloud Recovery
-    
-         This is the config need for SolrCloud's recovery replication.
     -->
-	<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
-
+  </requestHandler>
 
   <!-- Search Components