[lucene-solr] branch reference_impl_dev updated: @533 Always stop an existing background replication if exists when starting a new one.

[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 812cbad  @533 Always stop an existing background replication if exists when starting a new one.
812cbad is described below

commit 812cbadbb64643d8d1a57e7e66c2a523f0c1b776
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Aug 12 10:28:25 2020 -0500

    @533 Always stop an existing background replication if exists when starting a new one.
---
 solr/core/src/java/org/apache/solr/cloud/ZkController.java | 3 +++
 solr/core/src/java/org/apache/solr/core/CoreContainer.java | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

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 e41d1e0..fe10880 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1631,6 +1631,9 @@ public class ZkController implements Closeable {
   public void startReplicationFromLeader(String coreName, boolean switchTransactionLog) throws InterruptedException {
     if (isClosed()) throw new AlreadyClosedException();
     log.info("{} starting background replication from leader", coreName);
+
+    stopReplicationFromLeader(coreName);
+
     ReplicateFromLeader replicateFromLeader = new ReplicateFromLeader(cc, coreName);
 
     ReplicateFromLeader prev = replicateFromLeaders.putIfAbsent(coreName, replicateFromLeader);
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 282ac68..cc79160 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -1688,7 +1688,6 @@ public class CoreContainer implements Closeable {
             }
 
           } else if (replica.getType() == Replica.Type.PULL) {
-            getZkController().stopReplicationFromLeader(core.getName());
             getZkController().startReplicationFromLeader(newCore.getName(), false);
           }
         }