[lucene-solr] 03/03: @1029 Some test work around updatelog.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 3333492ccd48100e63124ffd3f2e95895926200c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Oct 19 17:20:12 2020 -0500

    @1029 Some test work around updatelog.
---
 solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java | 4 +---
 solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java | 5 ++---
 solr/core/src/java/org/apache/solr/update/UpdateLog.java            | 1 +
 solr/core/src/test/org/apache/solr/search/TestRecovery.java         | 5 ++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
index e4c6815..db218ba 100644
--- a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
+++ b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
@@ -109,12 +109,10 @@ public final class DefaultSolrCoreState extends SolrCoreState implements Recover
         // indexWriter may be null if there was a failure in opening the search during core init,
         // such as from an index corruption issue (see TestCoreAdmin#testReloadCoreAfterFailure)
         if (indexWriter != null) {
-          indexWriter.commit();
+          closer.closeWriter(indexWriter);
         }
-        closer.closeWriter(indexWriter);
       } else if (indexWriter != null) {
         log.debug("closing IndexWriter...");
-        indexWriter.commit();
         indexWriter.close();
       }
       indexWriter = null;
diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
index c6624475..8ed4ac2 100644
--- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
+++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
@@ -894,10 +894,9 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreState
     } finally {
       if (clearRequestInfo) SolrRequestInfo.clearRequestInfo();
     }
-    // we went through the normal process to commit, so we don't have to artificially
-    // cap any ulog files.
+
     try {
-      if (ulog != null) ulog.close(false);
+      if (ulog != null) ulog.close(true);
     } catch (Throwable th) {
       log.error("Error closing log files", th);
       if (th instanceof OutOfMemoryError) {
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
index 8e3098e..7b64fcd 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@ -1460,6 +1460,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {
   }
 
   public void close(boolean committed, boolean deleteOnClose) {
+    log.info("Close UpdateLog committed={}, deleteOnClose={}", committed, deleteOnClose);
     this.isClosed = true;
     tlogLock.lock();
     try {
diff --git a/solr/core/src/test/org/apache/solr/search/TestRecovery.java b/solr/core/src/test/org/apache/solr/search/TestRecovery.java
index 4815ad8..4847c04 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRecovery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRecovery.java
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
 import static org.apache.solr.search.TestRecovery.VersionProvider.getNextVersion;
 import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
 
-@LuceneTestCase.Nightly // nocommit speedup
+@LuceneTestCase.Nightly // nocommit speedup / debug due to changes
 public class TestRecovery extends SolrTestCaseJ4 {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
@@ -77,7 +77,7 @@ public class TestRecovery extends SolrTestCaseJ4 {
 
   @Before
   public void beforeTest() throws Exception {
-    System.clearProperty("solr.skipCommitOnClose");
+    System.setProperty("solr.skipCommitOnClose", "false");
     savedFactory = System.getProperty("solr.DirectoryFactory");
     // mockdir will say files are left open
     // System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory");
@@ -380,7 +380,6 @@ public class TestRecovery extends SolrTestCaseJ4 {
   }
 
   @Test
-  @Ignore // nocommit debug
   public void testLogReplayWithReorderedDBQ() throws Exception {
     testLogReplayWithReorderedDBQWrapper(() -> {
           String v1010 = getNextVersion();