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:36 UTC
[lucene-solr] branch jira/solr14089 updated (fcb6447 -> b42cb55)
This is an automated email from the ASF dual-hosted git repository.
noble pushed a change to branch jira/solr14089
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from fcb6447 fix DUP
new 905b4cc fix DUP
new b42cb55 fix DUP
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/solr/update/processor/DistributedZkUpdateProcessor.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
[lucene-solr] 01/02: fix DUP
Posted by no...@apache.org.
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));
[lucene-solr] 02/02: fix DUP
Posted by no...@apache.org.
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 b42cb55a3867d78e60e1c9998449eecc11af9594
Author: noble <no...@apache.org>
AuthorDate: Tue Dec 17 15:11:07 2019 +1100
fix DUP
---
.../org/apache/solr/update/processor/DistributedZkUpdateProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 40bad52..ffa0a23 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
@@ -926,7 +926,7 @@ public class DistributedZkUpdateProcessor extends DistributedUpdateProcessor {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"No active slices serving " + id + " found for target collection: " + rule.getTargetCollectionName());
}
- Replica targetLeader = targetColl.getLeader(activeSlices.iterator().next().getName());
+ Replica targetLeader = req.getCore().getShardStateProvider().getLeader(activeSlices.iterator().next());
nodes = new ArrayList<>(1);
nodes.add(new SolrCmdDistributor.StdNode(new ZkCoreNodeProps(targetLeader)));
break;