You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/08/21 21:19:21 UTC

svn commit: r1375723 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/update/UpdateLog.java example/solr/collection1/conf/schema.xml

Author: hossman
Date: Tue Aug 21 19:19:21 2012
New Revision: 1375723

URL: http://svn.apache.org/viewvc?rev=1375723&view=rev
Log:
SOLR-3746: more context to error message

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java
    lucene/dev/trunk/solr/example/solr/collection1/conf/schema.xml

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java?rev=1375723&r1=1375722&r2=1375723&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java Tue Aug 21 19:19:21 2012
@@ -211,8 +211,13 @@ public class UpdateLog implements Plugin
       newestLogsOnStartup.addFirst(ll);
       if (newestLogsOnStartup.size() >= 2) break;
     }
-    
-    versionInfo = new VersionInfo(this, 256);
+
+    try {
+      versionInfo = new VersionInfo(this, 256);
+    } catch (SolrException e) {
+      throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
+                              "Unable to use updateLog: " + e.getMessage(), e);
+    }
 
     // TODO: these startingVersions assume that we successfully recover from all non-complete tlogs.
     UpdateLog.RecentUpdates startingUpdates = getRecentUpdates();

Modified: lucene/dev/trunk/solr/example/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/collection1/conf/schema.xml?rev=1375723&r1=1375722&r2=1375723&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/example/solr/collection1/conf/schema.xml Tue Aug 21 19:19:21 2012
@@ -148,7 +148,7 @@
 
    <field name="payloads" type="payloads" indexed="true" stored="true"/>
 
-   <field name="_version_" type="long" indexed="true" stored="true"/>
+   <!-- field name="_version_" type="long" indexed="true" stored="true"/ -->
 
    <!-- Uncommenting the following will create a "timestamp" field using
         a default value of "NOW" to indicate when each document was indexed.