[lucene-solr] 05/05: @975 Attempt to harden fail around reusing async ids in replace node and hitting problems due to the async id no longer being available.

[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

commit a6336a012c21a8a5b7055984164e8eb2289a120b
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Oct 12 16:23:18 2020 -0500

    @975 Attempt to harden fail around reusing async ids in replace node and hitting problems due to the async id no longer being available.
---
 .../java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java
index 9c695ed..a36cfb2 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReplaceNodeCmd.java
@@ -126,7 +126,7 @@ public class ReplaceNodeCmd implements OverseerCollectionMessageHandler.Cmd {
           targetNode = assignStrategy.assign(ocmh.cloudManager, assignRequest).get(0).node;
         }
         ZkNodeProps msg = sourceReplica.plus("parallel", String.valueOf(parallel)).plus(CoreAdminParams.NODE, targetNode);
-        if (async != null) msg.getProperties().put(ASYNC, async);
+       // if (async != null) msg.getProperties().put(ASYNC, async);
         final ZkNodeProps addedReplica = ocmh.addReplica(clusterState,
             msg, nl, () -> {
               countDownLatch.countDown();
@@ -228,7 +228,7 @@ public class ReplaceNodeCmd implements OverseerCollectionMessageHandler.Cmd {
 
     // we have reached this far means all replicas could be recreated
     //now cleanup the replicas in the source node
-    DeleteNodeCmd.cleanupReplicas(results, state, sourceReplicas, ocmh, source, async);
+    DeleteNodeCmd.cleanupReplicas(results, state, sourceReplicas, ocmh, source, null);
     results.add("success", "REPLACENODE action completed successfully from  : " + source + " to : " + target);
   }