diff --git a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java index 5863b85de24..45851bbf3ec 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java +++ b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java @@ -357,7 +357,7 @@ final class ShardLeaderElectionContext extends ShardLeaderElectionContextBase { log.info("After core={} coreNodeName={} was elected leader, it was found in state: " + lirState + " and needing recovery.", coreName, coreNodeName); List replicaProps = - zkController.getZkStateReader().getReplicaProps(collection, shardId, coreNodeName, null); + zkController.getZkStateReader().getReplicaProps(collection, shardId, coreNodeName); if (replicaProps != null && replicaProps.size() > 0) { ZkCoreNodeProps coreNodeProps = null; diff --git a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java index 54ae5f6c6af..3a886dab691 100644 --- a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java +++ b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java @@ -150,8 +150,7 @@ public class SyncStrategy { private boolean syncWithReplicas(ZkController zkController, SolrCore core, ZkNodeProps props, String collection, String shardId, boolean peerSyncOnlyWithActive) { List nodes = zkController.getZkStateReader() - .getReplicaProps(collection, shardId,core.getCoreDescriptor().getCloudDescriptor().getCoreNodeName(), - props.getStr(ZkStateReader.CORE_NAME_PROP)); + .getReplicaProps(collection, shardId,core.getCoreDescriptor().getCloudDescriptor().getCoreNodeName()); if (nodes == null) { // I have no replicas @@ -178,8 +177,7 @@ public class SyncStrategy { List nodes = zkController .getZkStateReader() .getReplicaProps(collection, shardId, - cd.getCloudDescriptor().getCoreNodeName(), - leaderProps.getStr(ZkStateReader.CORE_NAME_PROP)); + cd.getCloudDescriptor().getCoreNodeName()); if (nodes == null) { log.info(ZkCoreNodeProps.getCoreUrl(leaderProps) + " has no replicas"); return; diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java index 667d59ebc0b..4f7b52d98ec 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java +++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java @@ -623,8 +623,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor { forwardToLeader = false; List replicaProps = zkController.getZkStateReader() - .getReplicaProps(collection, shardId, leaderReplica.getName(), - req.getCore().getName()); + .getReplicaProps(collection, shardId, leaderReplica.getName()); if (replicaProps != null) { nodes = new ArrayList<>(replicaProps.size()); for (ZkCoreNodeProps props : replicaProps) {