[lucene-solr] branch reference_impl_dev updated: @445 Harden test.

[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 7256799  @445 Harden test.
7256799 is described below

commit 725679981f366c991e980b9942dae921054e7a31
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 28 21:15:29 2020 -0500

    @445 Harden test.
---
 solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 2 +-
 solr/core/src/java/org/apache/solr/core/CoreContainer.java           | 5 +++--
 .../src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java    | 3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
index a889884..07c1342 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
@@ -190,7 +190,7 @@ public class ZkStateWriter {
         DocCollection c = entry.getValue();
         Integer prevVersion = -1;
         if (lastUpdatedTime == -1) {
-          prevVersion = 0;
+          prevVersion = -1;
         }
         Stat stat = new Stat();
 
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 ce5e970..b170673 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -1258,6 +1258,7 @@ public class CoreContainer implements Closeable {
     if (isShutDown) {
       throw new AlreadyClosedException();
     }
+    SolrCore core = null;
     CoreDescriptor cd = new CoreDescriptor(coreName, instancePath, parameters, getContainerProperties(), getZkController());
 
     // TODO: There's a race here, isn't there?
@@ -1286,7 +1287,6 @@ public class CoreContainer implements Closeable {
       // first and clean it up if there's an error.
       coresLocator.create(this, cd);
 
-      SolrCore core = null;
       try {
         solrCores.waitAddPendingCoreOps(cd.getName());
         core = createFromDescriptor(cd, true, newCollection);
@@ -1314,6 +1314,7 @@ public class CoreContainer implements Closeable {
         }
       }
 
+      ParWork.close(core);
       Throwable tc = ex;
       Throwable c = null;
       do {
@@ -1409,7 +1410,7 @@ public class CoreContainer implements Closeable {
       solrCores.removeCoreDescriptor(dcore);
       final SolrException solrException = new SolrException(ErrorCode.SERVER_ERROR, "Unable to create core [" + dcore.getName() + "]", e);
       if (core != null && !core.isClosed())
-        IOUtils.closeQuietly(core);
+        ParWork.close(core);
       throw solrException;
     } catch (Throwable t) {
       log.error("Unable to create SolrCore", t);
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java
index c62e098..0705511 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java
@@ -63,9 +63,6 @@ public class DeleteInactiveReplicaTest extends SolrCloudTestCase {
     CollectionAdminRequest.createCollection(collectionName, "conf", numShards, replicationFactor)
         .setMaxShardsPerNode(maxShardsPerNode)
         .process(cluster.getSolrClient());
-    waitForState("Expected a cluster of 2 shards and 2 replicas", collectionName, (n, c) -> {
-      return DocCollection.isFullyActive(n, c, numShards, replicationFactor);
-    });
 
     DocCollection collectionState = getCollectionState(collectionName);