[lucene-solr] branch reference_impl_dev updated: @1378 Test hardening.

[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


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new 8ef9af4  @1378 Test hardening.
8ef9af4 is described below

commit 8ef9af495835546a4de6b1bcd7735ae078d77e0d
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Feb 21 18:45:51 2021 -0600

    @1378 Test hardening.
    
    Took 11 minutes
---
 solr/core/src/java/org/apache/solr/core/CoreContainer.java       | 7 ++++---
 .../src/test/org/apache/solr/core/TestMergePolicyConfig.java     | 2 ++
 .../test/org/apache/solr/client/solrj/SolrExampleTestsBase.java  | 9 +++++++++
 .../solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java    | 8 +++++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 7a2e14c..0750d46 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -1278,16 +1278,17 @@ public class CoreContainer implements Closeable {
     coreInitFailures.remove(cd.getName());
 
     if (old == null || old == core) {
-      log.info("registering core: " + cd.getName());
       return null;
     } else {
-      log.info("replacing core: " + cd.getName());
+      log.info("replacing core name={}", cd.getName());
       if (closeOld) {
         if (old != null) {
           SolrCore finalCore = old;
           try {
             Future<?> future = solrCoreExecutor.submit(() -> {
-              log.info("Closing replaced core {}", cd.getName());
+              if (log.isDebugEnabled()) {
+                log.debug("Closing replaced core {}", cd.getName());
+              }
               finalCore.close();
             });
           } catch (RejectedExecutionException e) {
diff --git a/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java b/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
index f8b2691..684231d 100644
--- a/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
@@ -62,6 +62,8 @@ public class TestMergePolicyConfig extends SolrTestCaseJ4 {
       TieredMergePolicy tieredMP = assertAndCast(TieredMergePolicy.class,
                                                  iwc.getMergePolicy());
       assertEquals(0.5D, tieredMP.getNoCFSRatio(), 0.0D);
+    } finally {
+      deleteCore();
     }
   }
 
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
index a263788..974025f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java
@@ -29,6 +29,7 @@ import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.TimeSource;
 import org.apache.solr.util.TimeOut;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -46,6 +47,14 @@ abstract public class SolrExampleTestsBase extends SolrJettyTestBase {
     jetty = createAndStartJetty(legacyExampleCollection1SolrHome());
   }
 
+  @AfterClass
+  public static void afterSolrExampleTestsBase() throws Exception {
+    if (jetty != null) {
+      jetty.stop();
+      jetty = null;
+    }
+  }
+
   @Before
   public void setUp() throws Exception {
     super.setUp();
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java
index e2d72e5..4688ea0 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/SelectWithEvaluatorsTest.java
@@ -34,6 +34,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.cloud.SolrCloudTestCase;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -53,7 +54,7 @@ public class SelectWithEvaluatorsTest extends SolrCloudTestCase {
   private static boolean useAlias;
 
   @BeforeClass
-  public static void setupCluster() throws Exception {
+  public static void beforeSelectWithEvaluatorsTest() throws Exception {
     configureCluster(4).formatZk(true)
         .addConfig("conf", SolrTestUtil.getFile("solrj").toPath().resolve("solr").resolve("configsets").resolve("streaming").resolve("conf"))
         .addConfig("ml", SolrTestUtil.getFile("solrj").toPath().resolve("solr").resolve("configsets").resolve("ml").resolve("conf"))
@@ -74,6 +75,11 @@ public class SelectWithEvaluatorsTest extends SolrCloudTestCase {
     }
   }
 
+  @AfterClass
+  public static void afterSelectWithEvaluatorsTest() throws Exception {
+    shutdownCluster();
+  }
+
   @Test
   public void testSelectWithEvaluatorsStream() throws Exception {