From 93133f54fd8cad47d7638c50a2360e3eb9daeb14 Mon Sep 17 00:00:00 2001 From: Shalin Shekhar Mangar Date: Thu, 3 Mar 2016 18:20:04 +0530 Subject: [PATCH] SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation --- solr/CHANGES.txt | 2 ++ .../apache/solr/cloud/OverseerCollectionMessageHandler.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 3989a6b08a1..cb3030eea35 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -31,6 +31,8 @@ Bug Fixes Optimizations ---------------------- +* SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation. + (Scott Blum via shalin) Other Changes ---------------------- diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java index 2f7a14edf8d..fed92bbf4b9 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java @@ -208,8 +208,6 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler NamedList results = new NamedList(); try { - // force update the cluster state - zkStateReader.updateClusterState(); CollectionParams.CollectionAction action = CollectionParams.CollectionAction.get(operation); if (action == null) { throw new SolrException(ErrorCode.BAD_REQUEST, "Unknown operation:" + operation); @@ -2120,6 +2118,8 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler sendShardRequest(node, params, shardHandler, asyncId, requestMap); processResponses(results, shardHandler, true, "ADDREPLICA failed to create replica", asyncId, requestMap); + + waitForCoreNodeName(collection, node, coreName); } private void processResponses(NamedList results, ShardHandler shardHandler, boolean abortOnError, String msgOnError,