svn commit: r1367317 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java

[ma...@apache.org]

Author: markrmiller
Date: Mon Jul 30 21:30:36 2012
New Revision: 1367317

URL: http://svn.apache.org/viewvc?rev=1367317&view=rev
Log:
on an error getting recent versions in recovery, log the error and act as if we found no versions

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java?rev=1367317&r1=1367316&r2=1367317&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java Mon Jul 30 21:30:36 2012
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
  */
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -243,7 +244,10 @@ public class RecoveryStrategy extends Th
     UpdateLog.RecentUpdates recentUpdates = ulog.getRecentUpdates();
     try {
       recentVersions = recentUpdates.getVersions(ulog.numRecordsToKeep);
-    } finally {
+    } catch (Throwable t) {
+      SolrException.log(log, "Corrupt tlog - ignoring", t);
+      recentVersions = new ArrayList<Long>(0);
+    }finally {
       recentUpdates.close();
     }