svn commit: r1230690 - in /lucene/dev/branches/solrcloud/solr/core/src: java/org/apache/solr/update/UpdateLog.java test/org/apache/solr/search/TestRecovery.java

[yo...@apache.org]

Author: yonik
Date: Thu Jan 12 18:36:47 2012
New Revision: 1230690

URL: http://svn.apache.org/viewvc?rev=1230690&view=rev
Log:
better error handling for corrupt tlogs on startup

Modified:
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/UpdateLog.java
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestRecovery.java

Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/UpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/UpdateLog.java?rev=1230690&r1=1230689&r2=1230690&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/UpdateLog.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/UpdateLog.java Thu Jan 12 18:36:47 2012
@@ -151,11 +151,11 @@ public class UpdateLog implements Plugin
       File f = new File(tlogDir, oldLogName);
       try {
         oldLog = new TransactionLog( f, null, true );
-      } catch (IOException e) {
+        addOldLog(oldLog);
+      } catch (Exception e) {
         log.warn("Failure to open existing log file " + f, e);
         f.delete();
       }
-      addOldLog(oldLog);
     }
     newestLogOnStartup = oldLog;
 

Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestRecovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestRecovery.java?rev=1230690&r1=1230689&r2=1230690&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestRecovery.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestRecovery.java Thu Jan 12 18:36:47 2012
@@ -30,6 +30,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
+import java.io.RandomAccessFile;
 import java.util.*;
 import java.util.concurrent.Future;
 import java.util.concurrent.Semaphore;
@@ -426,6 +427,25 @@ public class TestRecovery extends SolrTe
 
       // previous logs should be gone now
       assertEquals(1, UpdateLog.getLogList(logDir).length);
+
+      //
+      // test that a corrupt tlog file doesn't stop us
+      //
+      addDocs(1, start, new LinkedList<Long>()); // don't add this to the versions list because we are going to lose it...
+      h.close();
+      files = UpdateLog.getLogList(logDir);
+      Arrays.sort(files);
+      RandomAccessFile raf = new RandomAccessFile(new File(logDir, files[files.length-1]), "rw");
+      raf.writeChars("This is a trashed log file that really shouldn't work at all, but we'll see...");
+      raf.close();
+
+      createCore();
+      // we should still be able to get the list of versions (not including the trashed log file)
+      assertJQ(req("qt", "/get", "getVersions", "" + maxReq), "/versions==" + versions.subList(0, Math.min(maxReq, start)));
+
+
+
+
     } finally {
       DirectUpdateHandler2.commitOnClose = true;
       UpdateLog.testing_logReplayHook = null;