[lucene-solr] branch reference_impl_dev updated: @980 This should be done after leader election and everything.

[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 0f23fe6  @980 This should be done after leader election and everything.
0f23fe6 is described below

commit 0f23fe6d0979b675c2bef7413a9a7291c57005b3
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Oct 13 08:47:40 2020 -0500

    @980 This should be done after leader election and everything.
---
 .../core/src/java/org/apache/solr/cloud/ZkController.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 2e86eab..291abcd 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1486,14 +1486,6 @@ public class ZkController implements Closeable, Runnable {
       assert coreZkNodeName != null : "we should have a coreNodeName by now";
       log.info("Register SolrCore, baseUrl={} collection={}, shard={} coreNodeName={}", baseUrl, collection, shardId, coreZkNodeName);
 
-      // make sure we don't stop watching our own collection after a collection delete -> create
-
-      // the watcher is added to a set so multiple calls of this method will left only one watcher
-      getZkStateReader().registerCore(cloudDesc.getCollectionName());
-      // the watcher is added to a set so multiple calls of this method will left only one watcher
-
-      // nocommit
-      registerUnloadWatcher(cloudDesc.getCollectionName(), cloudDesc.getShardId(), cloudDesc.getCoreNodeName(), desc.getName());
 
       // check replica's existence in clusterstate first
       try {
@@ -1605,6 +1597,13 @@ public class ZkController implements Closeable, Runnable {
           shardTerms.addListener(new RecoveringCoreTermWatcher(core.getCoreDescriptor(), getCoreContainer()));
         }
         desc.getCloudDescriptor().setHasRegistered(true);
+
+        // the watcher is added to a set so multiple calls of this method will left only one watcher
+        getZkStateReader().registerCore(cloudDesc.getCollectionName());
+        // the watcher is added to a set so multiple calls of this method will left only one watcher
+        // nocommit
+        registerUnloadWatcher(cloudDesc.getCollectionName(), cloudDesc.getShardId(), cloudDesc.getCoreNodeName(), desc.getName());
+
       } catch (Exception e) {
         SolrZkClient.checkInterrupted(e);
         unregister(coreName, desc, false);