svn commit: r1384394 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java

[yo...@apache.org]

Author: yonik
Date: Thu Sep 13 16:24:03 2012
New Revision: 1384394

URL: http://svn.apache.org/viewvc?rev=1384394&view=rev
Log:
tests: additional corrupt tlog test

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java?rev=1384394&r1=1384393&r2=1384394&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java Thu Sep 13 16:24:03 2012
@@ -872,26 +872,6 @@ public class TestRecovery extends SolrTe
   public void testCorruptLog() throws Exception {
     try {
       DirectUpdateHandler2.commitOnClose = false;
-      final Semaphore logReplay = new Semaphore(0);
-      final Semaphore logReplayFinish = new Semaphore(0);
-
-      UpdateLog.testing_logReplayHook = new Runnable() {
-        @Override
-        public void run() {
-          try {
-            assertTrue(logReplay.tryAcquire(timeout, TimeUnit.SECONDS));
-          } catch (Exception e) {
-            throw new RuntimeException(e);
-          }
-        }
-      };
-
-      UpdateLog.testing_logReplayFinishHook = new Runnable() {
-        @Override
-        public void run() {
-          logReplayFinish.release();
-        }
-      };
 
       File logDir = h.getCore().getUpdateHandler().getUpdateLog().getLogDir();
 
@@ -911,8 +891,7 @@ public class TestRecovery extends SolrTe
       raf.write(new byte[(int)len]);  // zero out file
       raf.close();
 
-      logReplay.release(1000);
-      logReplayFinish.release(1);
+
       ignoreException("Failure to open existing log file");  // this is what the corrupted log currently produces... subject to change.
       createCore();
       resetExceptionIgnores();
@@ -932,6 +911,10 @@ public class TestRecovery extends SolrTe
       // assertJQ(req("qt","/get", "getVersions","6"), "/versions==[106,105,104]");
       assertJQ(req("qt","/get", "getVersions","3"), "/versions==[106,105,104]");
 
+      assertU(commit());
+
+      assertJQ(req("q","*:*") ,"/response/numFound==3");
+
     } finally {
       DirectUpdateHandler2.commitOnClose = true;
       UpdateLog.testing_logReplayHook = null;