You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2019/12/17 04:11:37 UTC
[lucene-solr] 01/02: fix DUP
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch jira/solr14089
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 905b4ccb0aaaafe989b3e09ae65b9e1a6ce6c30d
Author: noble <no...@apache.org>
AuthorDate: Tue Dec 17 15:09:10 2019 +1100
fix DUP
---
.../org/apache/solr/update/processor/DistributedZkUpdateProcessor.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
index 510a04f..40bad52 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
@@ -820,7 +820,6 @@ public class DistributedZkUpdateProcessor extends DistributedUpdateProcessor {
}
protected List<SolrCmdDistributor.Node> getReplicaNodesForLeader(String shardId, Replica leaderReplica) {
- ShardStateProvider ssp = zkController.getZkStateReader().getShardStateProvider(leaderReplica.collection);
String leaderCoreNodeName = leaderReplica.getName();
List<Replica> replicas = clusterState.getCollection(collection)
.getSlice(shardId)
@@ -850,7 +849,7 @@ public class DistributedZkUpdateProcessor extends DistributedUpdateProcessor {
log.debug("skip url:{} cause its term is less than leader", replica.getCoreUrl());
skippedCoreNodeNames.add(replica.getName());
} else if (!clusterState.getLiveNodes().contains(replica.getNodeName())
- || ssp.getState(replica) == Replica.State.DOWN) {
+ || req.getCore().getShardStateProvider().getState(replica) == Replica.State.DOWN) {
skippedCoreNodeNames.add(replica.getName());
} else {
nodes.add(new SolrCmdDistributor.StdNode(new ZkCoreNodeProps(replica), collection, shardId));