You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by no...@apache.org on 2023/07/19 12:47:25 UTC
[solr] branch main updated: SOLR-16871: Fix for duplicated replica added from first coordinator node (#1794)
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 9cdf0e4c13e SOLR-16871: Fix for duplicated replica added from first coordinator node (#1794)
9cdf0e4c13e is described below
commit 9cdf0e4c13eefb7fc2ec1771b5a41888f0102568
Author: patsonluk <pa...@users.noreply.github.com>
AuthorDate: Wed Jul 19 05:47:20 2023 -0700
SOLR-16871: Fix for duplicated replica added from first coordinator node (#1794)
---
.../solr/servlet/CoordinatorHttpSolrCall.java | 87 ++++++++++------------
1 file changed, 39 insertions(+), 48 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
index cef7270d943..cadb5a735c5 100644
--- a/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/CoordinatorHttpSolrCall.java
@@ -124,42 +124,48 @@ public class CoordinatorHttpSolrCall extends HttpSolrCall {
}
}
}
- List<Replica> nodeNameSyntheticReplicas =
- syntheticColl.getReplicas(solrCall.cores.getZkController().getNodeName());
- if (nodeNameSyntheticReplicas == null || nodeNameSyntheticReplicas.isEmpty()) {
- // this node does not have a replica. add one
- if (log.isInfoEnabled()) {
- log.info(
- "this node does not have a replica of the synthetic collection: {} , adding replica ",
- syntheticCollectionName);
+ synchronized (CoordinatorHttpSolrCall.class) {
+ // get docCollection again to ensure we get the fresh state
+ syntheticColl =
+ zkStateReader.getClusterState().getCollectionOrNull(syntheticCollectionName);
+ List<Replica> nodeNameSyntheticReplicas =
+ syntheticColl.getReplicas(solrCall.cores.getZkController().getNodeName());
+ if (nodeNameSyntheticReplicas == null || nodeNameSyntheticReplicas.isEmpty()) {
+ // this node does not have a replica. add one
+ if (log.isInfoEnabled()) {
+ log.info(
+ "this node does not have a replica of the synthetic collection: {} , adding replica ",
+ syntheticCollectionName);
+ }
+
+ addReplica(syntheticCollectionName, solrCall.cores);
}
- addReplica(syntheticCollectionName, solrCall.cores);
- }
- // still have to ensure that it's active, otherwise super.getCoreByCollection
- // will return null and then CoordinatorHttpSolrCall will call getCore again
- // hence creating a calling loop
- try {
- zkStateReader.waitForState(
- syntheticCollectionName,
- 10,
- TimeUnit.SECONDS,
- docCollection -> {
- for (Replica nodeNameSyntheticReplica :
- docCollection.getReplicas(solrCall.cores.getZkController().getNodeName())) {
- if (nodeNameSyntheticReplica.getState() == Replica.State.ACTIVE) {
- return true;
+ // still have to ensure that it's active, otherwise super.getCoreByCollection
+ // will return null and then CoordinatorHttpSolrCall will call getCore again
+ // hence creating a calling loop
+ try {
+ zkStateReader.waitForState(
+ syntheticCollectionName,
+ 10,
+ TimeUnit.SECONDS,
+ docCollection -> {
+ for (Replica nodeNameSyntheticReplica :
+ docCollection.getReplicas(solrCall.cores.getZkController().getNodeName())) {
+ if (nodeNameSyntheticReplica.getState() == Replica.State.ACTIVE) {
+ return true;
+ }
}
- }
- return false;
- });
- } catch (Exception e) {
- throw new SolrException(
- SolrException.ErrorCode.SERVER_ERROR,
- "Failed to wait for active replica for synthetic collection ["
- + syntheticCollectionName
- + "]",
- e);
+ return false;
+ });
+ } catch (Exception e) {
+ throw new SolrException(
+ SolrException.ErrorCode.SERVER_ERROR,
+ "Failed to wait for active replica for synthetic collection ["
+ + syntheticCollectionName
+ + "]",
+ e);
+ }
}
core = solrCall.getCoreByCollection(syntheticCollectionName, isPreferLeader);
@@ -212,12 +218,9 @@ public class CoordinatorHttpSolrCall extends HttpSolrCall {
private static void addReplica(String syntheticCollectionName, CoreContainer cores) {
SolrQueryResponse rsp = new SolrQueryResponse();
try {
- String coreName =
- syntheticCollectionName + "_" + cores.getZkController().getNodeName().replace(':', '_');
CollectionAdminRequest.AddReplica addReplicaRequest =
CollectionAdminRequest.addReplicaToShard(syntheticCollectionName, "shard1")
// we are fixing the name, so that no two replicas are created in the same node
- .setCoreName(coreName)
.setNode(cores.getZkController().getNodeName());
addReplicaRequest.setWaitForFinalState(true);
cores
@@ -228,18 +231,6 @@ public class CoordinatorHttpSolrCall extends HttpSolrCall {
SolrException.ErrorCode.SERVER_ERROR,
"Could not auto-create collection: " + Utils.toJSONString(rsp.getValues()));
}
- } catch (SolrException e) {
- if (e.getMessage().contains("replica with the same core name already exists")) {
- // another request has already created a replica for this synthetic collection
- if (log.isInfoEnabled()) {
- log.info(
- "A replica is already created in this node for synthetic collection: {}",
- syntheticCollectionName);
- }
- return;
- }
- throw e;
-
} catch (Exception e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
}