[lucene-solr] branch reference_impl_dev updated: @513 Slightly better shutdown in test zkserver and until I figure out this lazy ref issue, let it use the cache.

[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 7ea4b41  @513 Slightly better shutdown in test zkserver and until I figure out this lazy ref issue, let it use the cache.
7ea4b41 is described below

commit 7ea4b414e846e86291b19e9ab0aa4215160d210d
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Aug 11 17:54:47 2020 -0500

    @513 Slightly better shutdown in test zkserver and until I figure out this lazy ref issue, let it use the cache.
---
 solr/core/src/java/org/apache/solr/core/SolrCore.java                | 2 +-
 solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index b97c63f..aee3a15 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -1148,7 +1148,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
 
       // ZK pre-register would have already happened so we read slice properties now
       final ClusterState clusterState = coreContainer.getZkController().getClusterState();
-      final DocCollection collection = clusterState.getCollection(coreDescriptor.getCloudDescriptor().getCollectionName());
+      final DocCollection collection = clusterState.getCollectionOrNull(coreDescriptor.getCloudDescriptor().getCollectionName(), true);
       final Slice slice = collection.getSlice(coreDescriptor.getCloudDescriptor().getShardId());
       if (slice.getState() == Slice.State.CONSTRUCTION) {
         // set update log to buffer before publishing the core
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
index af877cb..985a8a4 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
@@ -404,9 +404,9 @@ public class ZkTestServer implements Closeable {
 
             return zooKeeperServer;
           }, () -> {
+            zkServer.zooKeeperServer.getSessionTracker().shutdown();
             cnxnFactory.shutdown();
             cnxnFactory.join();
-            zkServer.zooKeeperServer.getSessionTracker().shutdown();
          //   ((Thread)zkServer.zooKeeperServer.getSessionTracker()).interrupt();
             ((Thread)zkServer.zooKeeperServer.getSessionTracker()).join();
             return cnxnFactory;