svn commit: r1548593 - in /lucene/dev/trunk/solr: CHANGES.txt example/solr/collection1/conf/solrconfig.xml

[ma...@apache.org]

Author: markrmiller
Date: Fri Dec  6 16:49:18 2013
New Revision: 1548593

URL: http://svn.apache.org/r1548593
Log:
SOLR-5533: Improve out of the box support for running Solr on hdfs with SolrCloud.

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

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1548593&r1=1548592&r2=1548593&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Dec  6 16:49:18 2013
@@ -234,6 +234,9 @@ Other Changes
 
 * SOLR-5539: Admin UI - Remove ability to create/modify files (steffkes)
 
+* SOLR-5533: Improve out of the box support for running Solr on hdfs with 
+  SolrCloud. (Mark Miller)
+
 ==================  4.6.0 ==================
 
 Versions of Major Components

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=1548593&r1=1548592&r2=1548593&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml Fri Dec  6 16:49:18 2013
@@ -117,7 +117,20 @@
        persistent, and doesn't work with replication.
     -->
   <directoryFactory name="DirectoryFactory" 
-                    class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/> 
+                    class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
+    
+         
+    <!-- These will be used if you are using the solr.HdfsDirectoryFactory,
+         otherwise they will be ignored. If you don't plan on using hdfs,
+         you can safely remove this section. -->      
+    <!-- The root directory that collection data should be written to. -->     
+    <str name="solr.hdfs.home">${solr.hdfs.home:}</str>
+    <!-- The hadoop configuration files to use for the hdfs client. -->    
+    <str name="solr.hdfs.confdir">${solr.hdfs.confdir:}</str>
+    <!-- Enable/Disable the hdfs cache. -->    
+    <str name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</str>
+    
+  </directoryFactory> 
 
   <!-- The CodecFactory for defining the format of the inverted index.
        The default implementation is SchemaCodecFactory, which is the official Lucene