You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/03/03 13:51:49 UTC
lucene-solr git commit: SOLR-8722: Don't force a full ZkStateReader
refresh on every Overseer operation (cherry picked from commit 93133f5)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x d346af399 -> e4712bb02
SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation
(cherry picked from commit 93133f5)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e4712bb0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e4712bb0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e4712bb0
Branch: refs/heads/branch_6x
Commit: e4712bb028849f9a9b202651728c1f5c0a224374
Parents: d346af3
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Mar 3 18:20:04 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Mar 3 18:21:16 2016 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../org/apache/solr/cloud/OverseerCollectionMessageHandler.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e4712bb0/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9e5eadc..b0a4085 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -28,6 +28,8 @@ Bug Fixes
Optimizations
----------------------
+* SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation.
+ (Scott Blum via shalin)
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e4712bb0/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
----------------------------------------------------------------------
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 2f7a14e..fed92bb 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,