You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/05/05 00:13:17 UTC
[1/3] lucene-solr:jira/solr-10233: Don't run ChaosMonkey tests with
connection loss yet
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-10233 484263360 -> 873d1da0e
Don't run ChaosMonkey tests with connection loss yet
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a1421ea2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a1421ea2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a1421ea2
Branch: refs/heads/jira/solr-10233
Commit: a1421ea2b9375c80d77e35eb519f01010c059ad7
Parents: 4842633
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Thu May 4 17:08:39 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Thu May 4 17:08:39 2017 -0700
----------------------------------------------------------------------
.../src/java/org/apache/solr/cloud/ChaosMonkey.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a1421ea2/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
index 05a42ee..355e601 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
@@ -67,8 +67,9 @@ public class ChaosMonkey {
private Map<String,List<CloudJettyRunner>> shardToJetty;
private static final Boolean MONKEY_ENABLED = Boolean.valueOf(System.getProperty("solr.tests.cloud.cm.enabled", "true"));
- private static final String CONN_LOSS = System.getProperty("solr.tests.cloud.cm.connloss");
- private static final String EXP = System.getProperty("solr.tests.cloud.cm.exp");
+ // NOTE: CONN_LOSS and EXP are currently being set to "false" intentionally here. Remove the default value once we know tests pass reliably under those conditions
+ private static final String CONN_LOSS = System.getProperty("solr.tests.cloud.cm.connloss", "false");
+ private static final String EXP = System.getProperty("solr.tests.cloud.cm.exp", "false");
private ZkTestServer zkServer;
private ZkStateReader zkStateReader;
[2/3] lucene-solr:jira/solr-10233: RTG requests are forwarded to
REALTIME replicas when distrib=true
Posted by tf...@apache.org.
RTG requests are forwarded to REALTIME replicas when distrib=true
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3d49a6ea
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3d49a6ea
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3d49a6ea
Branch: refs/heads/jira/solr-10233
Commit: 3d49a6ea3cd4a896d6734bccf9a45ff497937761
Parents: a1421ea
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Thu May 4 17:10:19 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Thu May 4 17:10:19 2017 -0700
----------------------------------------------------------------------
.../apache/solr/handler/RealTimeGetHandler.java | 18 +++++--
.../handler/component/HttpShardHandler.java | 29 ++++++++++-
.../handler/component/RealTimeGetComponent.java | 29 +++++++----
.../apache/solr/cloud/TestAppendReplica.java | 54 ++++++++++++++++----
.../apache/solr/cloud/TestPassiveReplica.java | 50 +++++++++++++++---
.../java/org/apache/solr/SolrTestCaseJ4.java | 12 ++++-
6 files changed, 158 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3d49a6ea/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java b/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
index bce374f..247b65c 100644
--- a/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java
@@ -16,14 +16,17 @@
*/
package org.apache.solr.handler;
-import org.apache.solr.api.Api;
-import org.apache.solr.api.ApiBag;
-import org.apache.solr.handler.component.*;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.solr.api.Api;
+import org.apache.solr.api.ApiBag;
+import org.apache.solr.handler.component.RealTimeGetComponent;
+import org.apache.solr.handler.component.SearchHandler;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.response.SolrQueryResponse;
+
public class RealTimeGetHandler extends SearchHandler {
@Override
@@ -33,6 +36,13 @@ public class RealTimeGetHandler extends SearchHandler {
names.add(RealTimeGetComponent.COMPONENT_NAME);
return names;
}
+
+
+ @Override
+ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
+ req.getContext().put("distribOnlyRealtime", Boolean.TRUE);
+ super.handleRequestBody(req, rsp);
+ }
//////////////////////// SolrInfoMBeans methods //////////////////////
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3d49a6ea/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
index 8c0a9cb..f2d2639 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
@@ -349,9 +349,12 @@ public class HttpShardHandler extends ShardHandler {
// and make it a non-distributed request.
String ourSlice = cloudDescriptor.getShardId();
String ourCollection = cloudDescriptor.getCollectionName();
+ // Some requests may only be fulfilled by replicas of type Replica.Type.REALTIME
+ boolean onlyRealtimeReplicas = Boolean.TRUE == req.getContext().get("distribOnlyRealtime");
if (rb.slices.length == 1 && rb.slices[0] != null
&& ( rb.slices[0].equals(ourSlice) || rb.slices[0].equals(ourCollection + "_" + ourSlice) ) // handle the <collection>_<slice> format
- && cloudDescriptor.getLastPublished() == Replica.State.ACTIVE) {
+ && cloudDescriptor.getLastPublished() == Replica.State.ACTIVE
+ && (!onlyRealtimeReplicas || cloudDescriptor.getReplicaType() == Replica.Type.REALTIME)) {
boolean shortCircuit = params.getBool("shortCircuit", true); // currently just a debugging parameter to check distrib search on a single node
String targetHandler = params.get(ShardParams.SHARDS_QT);
@@ -387,14 +390,36 @@ public class HttpShardHandler extends ShardHandler {
continue;
// throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "no such shard: " + sliceName);
}
+ Replica shardLeader = null;
final Collection<Replica> allSliceReplicas = slice.getReplicasMap().values();
final List<Replica> eligibleSliceReplicas = new ArrayList<>(allSliceReplicas.size());
for (Replica replica : allSliceReplicas) {
if (!clusterState.liveNodesContain(replica.getNodeName())
- || replica.getState() != Replica.State.ACTIVE) {
+ || replica.getState() != Replica.State.ACTIVE
+ || (onlyRealtimeReplicas && replica.getType() == Replica.Type.PASSIVE)) {
continue;
}
+
+ if (onlyRealtimeReplicas && replica.getType() == Replica.Type.APPEND) {
+ if (shardLeader == null) {
+ try {
+ shardLeader = zkController.getZkStateReader().getLeaderRetry(cloudDescriptor.getCollectionName(), slice.getName());
+ } catch (InterruptedException e) {
+ throw new SolrException(SolrException.ErrorCode.SERVICE_UNAVAILABLE, "Exception finding leader for shard " + slice.getName() + " in collection "
+ + cloudDescriptor.getCollectionName(), e);
+ } catch (SolrException e) {
+ if (log.isDebugEnabled()) {
+ log.debug("Exception finding leader for shard {} in collection {}. Collection State: {}",
+ slice.getName(), cloudDescriptor.getCollectionName(), zkController.getZkStateReader().getClusterState().getCollectionOrNull(cloudDescriptor.getCollectionName()));
+ }
+ throw e;
+ }
+ }
+ if (!replica.getName().equals(shardLeader.getName())) {
+ continue;
+ }
+ }
eligibleSliceReplicas.add(replica);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3d49a6ea/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
index d785868..18e202e 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -16,6 +16,10 @@
*/
package org.apache.solr.handler.component;
+import static org.apache.solr.common.params.CommonParams.DISTRIB;
+import static org.apache.solr.common.params.CommonParams.ID;
+import static org.apache.solr.common.params.CommonParams.VERSION_FIELD;
+
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
@@ -24,6 +28,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
@@ -68,9 +73,9 @@ import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.DocList;
-import org.apache.solr.search.SolrDocumentFetcher;
import org.apache.solr.search.QParser;
import org.apache.solr.search.ReturnFields;
+import org.apache.solr.search.SolrDocumentFetcher;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.SolrReturnFields;
import org.apache.solr.search.SyntaxError;
@@ -82,10 +87,6 @@ import org.apache.solr.util.RefCounted;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.solr.common.params.CommonParams.DISTRIB;
-import static org.apache.solr.common.params.CommonParams.ID;
-import static org.apache.solr.common.params.CommonParams.VERSION_FIELD;
-
public class RealTimeGetComponent extends SearchComponent
{
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -105,11 +106,19 @@ public class RealTimeGetComponent extends SearchComponent
SolrQueryRequest req = rb.req;
SolrQueryResponse rsp = rb.rsp;
SolrParams params = req.getParams();
-
- if (req.getCore().getCoreDescriptor().getCloudDescriptor() != null
- && !req.getCore().getCoreDescriptor().getCloudDescriptor().requiresTransactionLog()) {
- //nocommit: forward request to leader
- return;
+ CloudDescriptor cloudDesc = req.getCore().getCoreDescriptor().getCloudDescriptor();
+
+ if (cloudDesc != null) {
+ Replica.Type replicaType = cloudDesc.getReplicaType();
+ if (replicaType != null) {
+ if (replicaType == Replica.Type.PASSIVE) {
+ throw new SolrException(ErrorCode.BAD_REQUEST,
+ String.format(Locale.ROOT, "%s can't handle realtime get requests. Replicas of type %s do not support these type of requests",
+ cloudDesc.getCoreNodeName(),
+ Replica.Type.PASSIVE));
+ }
+ // non-leader APPEND replicas should not respond to distrib /get requests, but internal requests are OK
+ }
}
if (!params.getBool(COMPONENT_NAME, true)) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3d49a6ea/solr/core/src/test/org/apache/solr/cloud/TestAppendReplica.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestAppendReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestAppendReplica.java
index a7f3042..b56c5a7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestAppendReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestAppendReplica.java
@@ -28,6 +28,7 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import org.apache.http.client.HttpClient;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.client.solrj.SolrClient;
@@ -41,6 +42,7 @@ import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.CollectionAdminResponse;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.CollectionStatePredicate;
@@ -255,16 +257,48 @@ public class TestAppendReplica extends SolrCloudTestCase {
doReplaceLeader(false);
}
- public void testPassiveReplicaStates() {
- // Validate that passive replicas go through the correct states when starting, stopping, reconnecting
- }
-
- public void testPassiveReplicaCantConnectToZooKeeper() {
-
- }
-
- public void testRealTimeGet() {
- // should be redirected to writers or error
+ public void testRealTimeGet() throws SolrServerException, IOException, KeeperException, InterruptedException {
+ // should be redirected to Replica.Type.REALTIME
+ int numReplicas = random().nextBoolean()?1:2;
+ int numRealtimeReplicas = random().nextBoolean()?0:2;
+ CollectionAdminRequest.createCollection(collectionName, "conf", 1, numRealtimeReplicas, numReplicas, 0)
+ .setMaxShardsPerNode(100)
+ .process(cluster.getSolrClient());
+ waitForState("Unexpected replica count", collectionName, activeReplicaCount(numRealtimeReplicas, numReplicas, 0));
+ DocCollection docCollection = assertNumberOfReplicas(numRealtimeReplicas, numReplicas, 0, false, true);
+ HttpClient httpClient = cluster.getSolrClient().getHttpClient();
+ int id = 0;
+ Slice slice = docCollection.getSlice("shard1");
+ List<String> ids = new ArrayList<>(slice.getReplicas().size());
+ for (Replica rAdd:slice.getReplicas()) {
+ try (HttpSolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {
+ client.add(new SolrInputDocument("id", String.valueOf(id), "foo_s", "bar"));
+ }
+ SolrDocument docCloudClient = cluster.getSolrClient().getById(collectionName, String.valueOf(id));
+ assertEquals("bar", docCloudClient.getFieldValue("foo_s"));
+ for (Replica rGet:slice.getReplicas()) {
+ try (HttpSolrClient client = getHttpSolrClient(rGet.getCoreUrl(), httpClient)) {
+ SolrDocument doc = client.getById(String.valueOf(id));
+ assertEquals("bar", doc.getFieldValue("foo_s"));
+ }
+ }
+ ids.add(String.valueOf(id));
+ id++;
+ }
+ SolrDocumentList previousAllIdsResult = null;
+ for (Replica rAdd:slice.getReplicas()) {
+ try (HttpSolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {
+ SolrDocumentList allIdsResult = client.getById(ids);
+ if (previousAllIdsResult != null) {
+ assertTrue(compareSolrDocumentList(previousAllIdsResult, allIdsResult));
+ } else {
+ // set the first response here
+ previousAllIdsResult = allIdsResult;
+ assertEquals("Unexpected number of documents", ids.size(), allIdsResult.getNumFound());
+ }
+ }
+ id++;
+ }
}
/*
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3d49a6ea/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplica.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplica.java
index e158a92..d087c19 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestPassiveReplica.java
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import org.apache.http.client.HttpClient;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
@@ -36,6 +37,8 @@ import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.response.CollectionAdminResponse;
import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.CollectionStatePredicate;
@@ -289,8 +292,47 @@ public class TestPassiveReplica extends SolrCloudTestCase {
assertEquals("Expecting DOWN->RECOVERING->ACTIVE but saw: " + Arrays.toString(statesSeen.toArray()), Replica.State.ACTIVE, statesSeen.get(0));
}
- public void testRealTimeGet() {
- // should be redirected to writers
+ public void testRealTimeGet() throws SolrServerException, IOException, KeeperException, InterruptedException {
+ // should be redirected to Replica.Type.REALTIME
+ int numReplicas = random().nextBoolean()?1:2;
+ CollectionAdminRequest.createCollection(collectionName, "conf", 1, numReplicas, 0, numReplicas)
+ .setMaxShardsPerNode(100)
+ .process(cluster.getSolrClient());
+ waitForState("Unexpected replica count", collectionName, activeReplicaCount(numReplicas, 0, numReplicas));
+ DocCollection docCollection = assertNumberOfReplicas(numReplicas, 0, numReplicas, false, true);
+ HttpClient httpClient = cluster.getSolrClient().getHttpClient();
+ int id = 0;
+ Slice slice = docCollection.getSlice("shard1");
+ List<String> ids = new ArrayList<>(slice.getReplicas().size());
+ for (Replica rAdd:slice.getReplicas()) {
+ try (HttpSolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {
+ client.add(new SolrInputDocument("id", String.valueOf(id), "foo_s", "bar"));
+ }
+ SolrDocument docCloudClient = cluster.getSolrClient().getById(collectionName, String.valueOf(id));
+ assertEquals("bar", docCloudClient.getFieldValue("foo_s"));
+ for (Replica rGet:slice.getReplicas()) {
+ try (HttpSolrClient client = getHttpSolrClient(rGet.getCoreUrl(), httpClient)) {
+ SolrDocument doc = client.getById(String.valueOf(id));
+ assertEquals("bar", doc.getFieldValue("foo_s"));
+ }
+ }
+ ids.add(String.valueOf(id));
+ id++;
+ }
+ SolrDocumentList previousAllIdsResult = null;
+ for (Replica rAdd:slice.getReplicas()) {
+ try (HttpSolrClient client = getHttpSolrClient(rAdd.getCoreUrl(), httpClient)) {
+ SolrDocumentList allIdsResult = client.getById(ids);
+ if (previousAllIdsResult != null) {
+ assertTrue(compareSolrDocumentList(previousAllIdsResult, allIdsResult));
+ } else {
+ // set the first response here
+ previousAllIdsResult = allIdsResult;
+ assertEquals("Unexpected number of documents", ids.size(), allIdsResult.getNumFound());
+ }
+ }
+ id++;
+ }
}
/*
@@ -418,10 +460,6 @@ public class TestPassiveReplica extends SolrCloudTestCase {
waitForNumDocsInAllActiveReplicas(2);
}
- public void testAddDocsToPassive() {
-
- }
-
public void testSearchWhileReplicationHappens() {
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3d49a6ea/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 7e443bb..0489ab0 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -2121,9 +2121,17 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
SolrDocumentList list1 = (SolrDocumentList) expected;
SolrDocumentList list2 = (SolrDocumentList) actual;
- if(Float.compare(list1.getMaxScore(), list2.getMaxScore()) != 0 || list1.getNumFound() != list2.getNumFound() ||
- list1.getStart() != list2.getStart()) {
+ if (list1.getMaxScore() == null) {
+ if (list2.getMaxScore() != null) {
+ return false;
+ }
+ } else if (list2.getMaxScore() == null) {
return false;
+ } else {
+ if (Float.compare(list1.getMaxScore(), list2.getMaxScore()) != 0 || list1.getNumFound() != list2.getNumFound() ||
+ list1.getStart() != list2.getStart()) {
+ return false;
+ }
}
for(int i=0; i<list1.getNumFound(); i++) {
if(!compareSolrDocument(list1.get(i), list2.get(i))) {
[3/3] lucene-solr:jira/solr-10233: Improvements and fixes to existing
tests
Posted by tf...@apache.org.
Improvements and fixes to existing tests
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/873d1da0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/873d1da0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/873d1da0
Branch: refs/heads/jira/solr-10233
Commit: 873d1da0e384638b1abc1ca93c7dddee9156e5f1
Parents: 3d49a6e
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Thu May 4 17:13:05 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Thu May 4 17:13:05 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/solr/cloud/CloudDescriptor.java | 10 ++++++++--
...sMonkeyNothingIsSafeWithPassiveReplicasTest.java | 10 ++++++----
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 4 ++--
.../org/apache/solr/cloud/HttpPartitionTest.java | 4 ++--
.../cloud/LeaderInitiatedRecoveryOnCommitTest.java | 4 ++--
.../solr/cloud/RecoveryAfterSoftCommitTest.java | 4 ++--
.../apache/solr/cloud/ReplicationFactorTest.java | 4 ++--
.../solr/cloud/AbstractFullDistribZkTestBase.java | 16 +++++++++++++---
8 files changed, 37 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/873d1da0/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java b/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java
index 1f387ad..8a37be5 100644
--- a/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java
+++ b/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java
@@ -20,12 +20,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import com.google.common.base.Strings;
import org.apache.solr.common.StringUtils;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.util.PropertiesUtil;
+import com.google.common.base.Strings;
+
public class CloudDescriptor {
private final CoreDescriptor cd;
@@ -64,7 +65,12 @@ public class CloudDescriptor {
if (Strings.isNullOrEmpty(nodeName))
this.nodeName = null;
this.numShards = PropertiesUtil.toInteger(props.getProperty(CloudDescriptor.NUM_SHARDS), null);
- this.replicaType = Replica.Type.valueOf(props.getProperty(CloudDescriptor.REPLICA_TYPE, Replica.Type.REALTIME.toString()));
+ String replicaTypeStr = props.getProperty(CloudDescriptor.REPLICA_TYPE);
+ if (Strings.isNullOrEmpty(replicaTypeStr)) {
+ this.replicaType = Replica.Type.REALTIME;
+ } else {
+ this.replicaType = Replica.Type.valueOf(replicaTypeStr);
+ }
for (String propName : props.stringPropertyNames()) {
if (propName.startsWith(ZkController.COLLECTION_PARAM_PREFIX)) {
collectionParams.put(propName.substring(ZkController.COLLECTION_PARAM_PREFIX.length()), props.getProperty(propName));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/873d1da0/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPassiveReplicasTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPassiveReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPassiveReplicasTest.java
index 71c2924..ce35529 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPassiveReplicasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPassiveReplicasTest.java
@@ -70,13 +70,13 @@ public class ChaosMonkeyNothingIsSafeWithPassiveReplicasTest extends AbstractFul
public static void beforeSuperClass() {
schemaString = "schema15.xml"; // we need a string id
System.setProperty("solr.autoCommit.maxTime", "15000");
+ TestInjection.waitForReplicasInSync = null;
setErrorHook();
}
@AfterClass
public static void afterSuperClass() {
System.clearProperty("solr.autoCommit.maxTime");
- TestInjection.waitForReplicasInSync = null;
clearErrorHook();
}
@@ -171,9 +171,11 @@ public class ChaosMonkeyNothingIsSafeWithPassiveReplicasTest extends AbstractFul
searchThread.start();
}
- StoppableCommitThread commitThread = new StoppableCommitThread(cloudClient, 1000, false);
- threads.add(commitThread);
- commitThread.start();
+ if (usually()) {
+ StoppableCommitThread commitThread = new StoppableCommitThread(cloudClient, 1000, false);
+ threads.add(commitThread);
+ commitThread.start();
+ }
// TODO: we only do this sometimes so that we can sometimes compare against control,
// it's currently hard to know what requests failed when using ConcurrentSolrUpdateServer
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/873d1da0/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
index e2a80b6..3ca3f0f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
@@ -148,8 +148,8 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
Map<String, NamedList<Integer>> coresStatus = response.getCollectionCoresStatus();
- assertEquals(0, (int) coresStatus.get(collectionName + "_shard1_0_replica1").get("status"));
- assertEquals(0, (int) coresStatus.get(collectionName + "_shard1_1_replica1").get("status"));
+ assertEquals(0, (int) coresStatus.get(Assign.buildCoreName(collectionName, "shard1_0" , Replica.Type.REALTIME, 1)).get("status"));
+ assertEquals(0, (int) coresStatus.get(Assign.buildCoreName(collectionName, "shard1_1" , Replica.Type.REALTIME, 1)).get("status"));
waitForState("Expected all shards to be active and parent shard to be removed", collectionName, (n, c) -> {
if (c.getSlice("shard1").getState() == Slice.State.ACTIVE)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/873d1da0/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
index d0b0c5e..8406791 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -110,10 +110,10 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
*/
@Override
public JettySolrRunner createJetty(File solrHome, String dataDir,
- String shardList, String solrConfigOverride, String schemaOverride)
+ String shardList, String solrConfigOverride, String schemaOverride, Replica.Type replicaType)
throws Exception
{
- return createProxiedJetty(solrHome, dataDir, shardList, solrConfigOverride, schemaOverride);
+ return createProxiedJetty(solrHome, dataDir, shardList, solrConfigOverride, schemaOverride, replicaType);
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/873d1da0/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java
index fd1b403..1990919 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java
@@ -161,9 +161,9 @@ public class LeaderInitiatedRecoveryOnCommitTest extends BasicDistributedZkTest
*/
@Override
public JettySolrRunner createJetty(File solrHome, String dataDir,
- String shardList, String solrConfigOverride, String schemaOverride)
+ String shardList, String solrConfigOverride, String schemaOverride, Replica.Type replicaType)
throws Exception {
- return createProxiedJetty(solrHome, dataDir, shardList, solrConfigOverride, schemaOverride);
+ return createProxiedJetty(solrHome, dataDir, shardList, solrConfigOverride, schemaOverride, replicaType);
}
protected void sendCommitWithRetry(Replica replica) throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/873d1da0/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
index 1da9aca..eabd9b0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java
@@ -64,10 +64,10 @@ public class RecoveryAfterSoftCommitTest extends AbstractFullDistribZkTestBase {
*/
@Override
public JettySolrRunner createJetty(File solrHome, String dataDir,
- String shardList, String solrConfigOverride, String schemaOverride)
+ String shardList, String solrConfigOverride, String schemaOverride, Replica.Type replicaType)
throws Exception
{
- return createProxiedJetty(solrHome, dataDir, shardList, solrConfigOverride, schemaOverride);
+ return createProxiedJetty(solrHome, dataDir, shardList, solrConfigOverride, schemaOverride, replicaType);
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/873d1da0/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
index 9100eee..abd394a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
@@ -64,10 +64,10 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
*/
@Override
public JettySolrRunner createJetty(File solrHome, String dataDir,
- String shardList, String solrConfigOverride, String schemaOverride)
+ String shardList, String solrConfigOverride, String schemaOverride, Replica.Type replicaType)
throws Exception {
- return createProxiedJetty(solrHome, dataDir, shardList, solrConfigOverride, schemaOverride);
+ return createProxiedJetty(solrHome, dataDir, shardList, solrConfigOverride, schemaOverride, replicaType);
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/873d1da0/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
index 4d36286..2d082ea 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
@@ -236,6 +236,11 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
CreateMode.PERSISTENT, true);
}
}
+ if (useAppendReplicas()) {
+ log.info("Will use {} replicas unless explicitly asked otherwise", Replica.Type.APPEND);
+ } else {
+ log.info("Will use {} replicas unless explicitly asked otherwise", Replica.Type.REALTIME);
+ }
}
@BeforeClass
@@ -512,7 +517,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
return jetty;
}
- public JettySolrRunner createJetty(File solrHome, String dataDir, String shardList, String solrConfigOverride, String schemaOverride) throws Exception {
+ public final JettySolrRunner createJetty(File solrHome, String dataDir, String shardList, String solrConfigOverride, String schemaOverride) throws Exception {
return createJetty(solrHome, dataDir, shardList, solrConfigOverride, schemaOverride, null);
}
@@ -541,7 +546,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
props.setProperty("solr.data.dir", getDataDir(dataDir));
if (replicaType != null) {
props.setProperty("replicaType", replicaType.toString());
- } else { // TODO: include the case with no replicaTYpe defined: if (random().nextBoolean()) {
+ } else if (random().nextBoolean()) {
props.setProperty("replicaType", Replica.Type.REALTIME.toString());
}
props.setProperty("coreRootDirectory", solrHome.toPath().resolve("cores").toAbsolutePath().toString());
@@ -558,7 +563,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
* with IPTables.
*/
public JettySolrRunner createProxiedJetty(File solrHome, String dataDir,
- String shardList, String solrConfigOverride, String schemaOverride)
+ String shardList, String solrConfigOverride, String schemaOverride, Replica.Type replicaType)
throws Exception {
JettyConfig jettyconfig = JettyConfig.builder()
@@ -578,6 +583,11 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
props.setProperty("shards", shardList);
if (dataDir != null)
props.setProperty("solr.data.dir", getDataDir(dataDir));
+ if (replicaType != null) {
+ props.setProperty("replicaType", replicaType.toString());
+ } else if (random().nextBoolean()) {
+ props.setProperty("replicaType", Replica.Type.REALTIME.toString());
+ }
props.setProperty("coreRootDirectory", solrHome.toPath().resolve("cores").toAbsolutePath().toString());
JettySolrRunner jetty = new JettySolrRunner(solrHome.getPath(), props, jettyconfig);