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:19 UTC
[3/3] lucene-solr:jira/solr-10233: Improvements and fixes to existing
tests
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);