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 2021/11/12 00:57:59 UTC
[solr] branch jira/SOLR15794 created (now 67557be)
This is an automated email from the ASF dual-hosted git repository.
noble pushed a change to branch jira/SOLR15794
in repository https://gitbox.apache.org/repos/asf/solr.git.
at 67557be SOLR-15794 Switching a PRS collection from true -> false -> true results in INACTIVE replicas
This branch includes the following new commits:
new 67557be SOLR-15794 Switching a PRS collection from true -> false -> true results in INACTIVE replicas
The 1 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.
[solr] 01/01: SOLR-15794 Switching a PRS collection from true ->
false -> true results in INACTIVE replicas
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch jira/SOLR15794
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 67557bed2d5e75b2848dd2b2b2cfdf55ab01106e
Author: Noble Paul <no...@gmail.com>
AuthorDate: Fri Nov 12 11:57:15 2021 +1100
SOLR-15794
Switching a PRS collection from true -> false -> true results in INACTIVE replicas
---
.../apache/solr/common/cloud/PerReplicaStates.java | 4 ++
.../solr/common/cloud/PerReplicaStatesOps.java | 20 +++++++--
.../cloud/PerReplicaStatesIntegrationTest.java | 47 ++++++++++++++++++++++
3 files changed, 68 insertions(+), 3 deletions(-)
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStates.java b/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStates.java
index be40066..b63ed7c 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStates.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStates.java
@@ -320,6 +320,10 @@ public class PerReplicaStates implements ReflectMapWriter {
public int hashCode() {
return asString.hashCode();
}
+
+ public State getDuplicate() {
+ return duplicate;
+ }
}
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java b/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java
index 02bf6f9..eabec492 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java
@@ -134,13 +134,27 @@ public class PerReplicaStatesOps {
* Switch a collection from/to perReplicaState=true
*/
public static PerReplicaStatesOps modifyCollection(DocCollection coll, boolean enable, PerReplicaStates rs) {
- return new PerReplicaStatesOps(prs -> enable ? enable(coll) : disable(prs)).init(rs);
+ return new PerReplicaStatesOps(prs -> enable ?
+ enable(coll,prs) :
+ disable(prs))
+ .init(rs);
}
- private static List<PerReplicaStates.Operation> enable(DocCollection coll) {
+ private static List<PerReplicaStates.Operation> enable(DocCollection coll, PerReplicaStates prs) {
+ log.info("ENABLING_PRS ");
List<PerReplicaStates.Operation> result = new ArrayList<>();
- coll.forEachReplica((s, r) -> result.add(new PerReplicaStates.Operation(PerReplicaStates.Operation.Type.ADD, new PerReplicaStates.State(r.getName(), r.getState(), r.isLeader(), 0))));
+ coll.forEachReplica((s, r) -> {
+ PerReplicaStates.State st = prs.get(r.getName());
+ int newVer = 0;
+ if (st != null) {
+ result.add(new PerReplicaStates.Operation(PerReplicaStates.Operation.Type.DELETE, st));
+ newVer = st.version + 1;
+ }
+ result.add(new PerReplicaStates.Operation(PerReplicaStates.Operation.Type.ADD,
+ new PerReplicaStates.State(r.getName(), r.getState(), r.isLeader(), newVer)));
+ });
+ log.info("ENABLING_PRS OPS {}", result);
return result;
}
diff --git a/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java b/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java
index 94ae988..58ce5bf 100644
--- a/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java
@@ -20,6 +20,9 @@ package org.apache.solr.common.cloud;
import java.lang.invoke.MethodHandles;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -33,6 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.solr.client.solrj.SolrRequest.METHOD.POST;
+import static org.apache.solr.common.cloud.DocCollection.PER_REPLICA_STATE;
/**
@@ -155,4 +159,47 @@ public class PerReplicaStatesIntegrationTest extends SolrCloudTestCase {
}
}
+
+ public void testMultipleTransitions() throws Exception {
+ String COLL = "prs_modify_op_coll";
+ MiniSolrCloudCluster cluster =
+ configureCluster(2)
+ .withJettyConfig(jetty -> jetty.enableV2(true))
+ .addConfig("conf", getFile("solrj").toPath().resolve("solr").resolve("configsets").resolve("streaming").resolve("conf"))
+ .configure();
+ PerReplicaStates original = null;
+ try {
+ CollectionAdminRequest.createCollection(COLL, "conf", 3, 1)
+ .setPerReplicaState(Boolean.TRUE)
+ .process(cluster.getSolrClient());
+ cluster.waitForActiveCollection(COLL, 3, 3);
+
+ PerReplicaStates prs1 = original = PerReplicaStates.fetch(ZkStateReader.getCollectionPath(COLL), cluster.getZkClient(), null);
+ log.info("prs1 : {}", prs1);
+
+ CollectionAdminRequest.modifyCollection(COLL,
+ Collections.singletonMap(PER_REPLICA_STATE, "false"))
+ .process(cluster.getSolrClient());
+ cluster.getSolrClient().getZkStateReader().waitForState(COLL, 5, TimeUnit.SECONDS,
+ (liveNodes, collectionState) -> "false".equals(collectionState.getProperties().get(PER_REPLICA_STATE)));
+ CollectionAdminRequest.modifyCollection(COLL,
+ Collections.singletonMap(PER_REPLICA_STATE, "true"))
+ .process(cluster.getSolrClient());
+ cluster.getSolrClient().getZkStateReader().waitForState(COLL, 5, TimeUnit.SECONDS, (liveNodes, collectionState) -> {
+ AtomicBoolean anyFail = new AtomicBoolean(false);
+ PerReplicaStates prs2 = PerReplicaStates.fetch(ZkStateReader.getCollectionPath(COLL), cluster.getZkClient(), null);
+ prs2.states.forEachEntry((r, newState) -> {
+ if(newState.getDuplicate() !=null) anyFail.set(true);
+ });
+ return !anyFail.get();
+ });
+
+ } finally {
+ System.out.println("prs1 : "+ original);
+ System.out.println("prs2 : "+ PerReplicaStates.fetch(ZkStateReader.getCollectionPath(COLL), cluster.getZkClient(), null));
+ cluster.shutdown();
+
+ }
+
+ }
}