You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/07/01 15:29:53 UTC
[lucene-solr] 09/11: SOLR-12847: WIP, further cleanup.
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-12847-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit cb517d3b3200063997b53314972c0555cd74ad8a
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed Jul 1 11:28:14 2020 +0200
SOLR-12847: WIP, further cleanup.
---
.../solr/handler/dataimport/TestZKPropertiesWriter.java | 1 -
.../src/test/org/apache/solr/cloud/ClusterStateMockUtil.java | 2 --
solr/core/src/test/org/apache/solr/cloud/NodeMutatorTest.java | 2 --
solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java | 11 +++++------
.../api/collections/AbstractCloudBackupRestoreTestCase.java | 8 ++++----
.../apache/solr/core/snapshots/TestSolrCloudSnapshots.java | 10 +++++-----
.../solr/client/solrj/request/CollectionAdminRequest.java | 4 ----
7 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
index c4f3f7a..54a5e12 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
@@ -104,7 +104,6 @@ public class TestZKPropertiesWriter extends SolrCloudTestCase {
@SuppressWarnings({"unchecked"})
public void testZKPropertiesWriter() throws Exception {
CollectionAdminRequest.createCollectionWithImplicitRouter("collection1", "conf", "1", 1)
- .setMaxShardsPerNode(1)
.process(cluster.getSolrClient());
// DIH talks core, SolrCloud talks collection.
diff --git a/solr/core/src/test/org/apache/solr/cloud/ClusterStateMockUtil.java b/solr/core/src/test/org/apache/solr/cloud/ClusterStateMockUtil.java
index 677b25e..9019be7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ClusterStateMockUtil.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ClusterStateMockUtil.java
@@ -72,7 +72,6 @@ public class ClusterStateMockUtil {
* Result:
* {
* "collection2":{
- * "maxShardsPerNode":"1",
* "replicationFactor":"1",
* "shards":{"slice1":{
* "state":"active",
@@ -81,7 +80,6 @@ public class ClusterStateMockUtil {
* "node_name":"baseUrl1_",
* "base_url":"http://baseUrl1"}}}}},
* "collection1":{
- * "maxShardsPerNode":"1",
* "replicationFactor":"1",
* "shards":{
* "slice1":{
diff --git a/solr/core/src/test/org/apache/solr/cloud/NodeMutatorTest.java b/solr/core/src/test/org/apache/solr/cloud/NodeMutatorTest.java
index 3e8ef42..d31d67f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/NodeMutatorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/NodeMutatorTest.java
@@ -43,7 +43,6 @@ public class NodeMutatorTest extends SolrTestCaseJ4Test {
public void downNodeReportsAllImpactedCollectionsAndNothingElse() throws IOException {
NodeMutator nm = new NodeMutator();
- //We use 2 nodes with maxShardsPerNode as 1
//Collection1: 2 shards X 1 replica = replica1 on node1 and replica2 on node2
//Collection2: 1 shard X 1 replica = replica1 on node2
ZkStateReader reader = ClusterStateMockUtil.buildClusterState("csrr2rDcsr2", 1, NODE1, NODE2);
@@ -60,7 +59,6 @@ public class NodeMutatorTest extends SolrTestCaseJ4Test {
assertEquals(writes.get(0).collection.getReplica("replica2").getState(), Replica.State.ACTIVE);
reader.close();
- //We use 3 nodes with maxShardsPerNode as 1
//Collection1: 2 shards X 1 replica = replica1 on node1 and replica2 on node2
//Collection2: 1 shard X 1 replica = replica1 on node2
//Collection3: 1 shard X 3 replica = replica1 on node1 , replica2 on node2, replica3 on node3
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
index e81feef..d68f46b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
@@ -152,12 +152,11 @@ public class TestTlogReplica extends SolrCloudTestCase {
break;
case 1:
// Sometimes don't use SolrJ
- String url = String.format(Locale.ROOT, "%s/admin/collections?action=CREATE&name=%s&collection.configName=%s&numShards=%s&tlogReplicas=%s&maxShardsPerNode=%s",
+ String url = String.format(Locale.ROOT, "%s/admin/collections?action=CREATE&name=%s&collection.configName=%s&numShards=%s&tlogReplicas=%s",
cluster.getRandomJetty(random()).getBaseUrl(),
collectionName, "conf",
2, // numShards
- 4, // tlogReplicas
- 100); // maxShardsPerNode
+ 4); // tlogReplicas
HttpGet createCollectionGet = new HttpGet(url);
HttpResponse httpResponse = cluster.getSolrClient().getHttpClient().execute(createCollectionGet);
assertEquals(200, httpResponse.getStatusLine().getStatusCode());
@@ -166,11 +165,11 @@ public class TestTlogReplica extends SolrCloudTestCase {
case 2:
// Sometimes use V2 API
url = cluster.getRandomJetty(random()).getBaseUrl().toString() + "/____v2/c";
- String requestBody = String.format(Locale.ROOT, "{create:{name:%s, config:%s, numShards:%s, tlogReplicas:%s, maxShardsPerNode:%s}}",
+ String requestBody = String.format(Locale.ROOT, "{create:{name:%s, config:%s, numShards:%s, tlogReplicas:%s}}",
collectionName, "conf",
2, // numShards
- 4, // tlogReplicas
- 100); // maxShardsPerNode
+ 4); // tlogReplicas
+
HttpPost createCollectionPost = new HttpPost(url);
createCollectionPost.setHeader("Content-type", "application/json");
createCollectionPost.setEntity(new StringEntity(requestBody));
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
index 1203924..a7da88f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/AbstractCloudBackupRestoreTestCase.java
@@ -191,7 +191,7 @@ public abstract class AbstractCloudBackupRestoreTestCase extends SolrCloudTestCa
.setLocation(backupLocation).setRepositoryName(getBackupRepoName());
if (backupCollection.getReplicas().size() > cluster.getJettySolrRunners().size()) {
// may need to increase maxShardsPerNode (e.g. if it was shard split, then now we need more)
- restore.setMaxShardsPerNode((int)Math.ceil(backupCollection.getReplicas().size()/cluster.getJettySolrRunners().size()));
+ //restore.setMaxShardsPerNode((int)Math.ceil(backupCollection.getReplicas().size()/cluster.getJettySolrRunners().size()));
}
restore.setConfigName("confFaulty");
@@ -342,9 +342,9 @@ public abstract class AbstractCloudBackupRestoreTestCase extends SolrCloudTestCa
if (rarely()) { // Try with createNodeSet configuration
//Always 1 as cluster.getJettySolrRunners().size()=NUM_SHARDS=2
restore.setCreateNodeSet(cluster.getJettySolrRunners().get(0).getNodeName());
- // we need to double maxShardsPerNode value since we reduced number of available nodes by half.
- computeRestoreMaxShardsPerNode = origShardToDocCount.size() * restoreReplFactor;
- restore.setMaxShardsPerNode(computeRestoreMaxShardsPerNode);
+// // we need to double maxShardsPerNode value since we reduced number of available nodes by half.
+// computeRestoreMaxShardsPerNode = origShardToDocCount.size() * restoreReplFactor;
+// restore.setMaxShardsPerNode(computeRestoreMaxShardsPerNode);
}
final int restoreMaxShardsPerNode = computeRestoreMaxShardsPerNode;
diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
index 21e7322..cfafe23 100644
--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
@@ -186,11 +186,11 @@ public class TestSolrCloudSnapshots extends SolrCloudTestCase {
{
CollectionAdminRequest.Restore restore = CollectionAdminRequest.restoreCollection(restoreCollectionName, backupName)
.setLocation(backupLocation);
- if (replicaFailures) {
- // In this case one of the Solr servers would be down. Hence we need to increase
- // max_shards_per_node property for restore command to succeed.
- restore.setMaxShardsPerNode(2);
- }
+// if (replicaFailures) {
+// // In this case one of the Solr servers would be down. Hence we need to increase
+// // max_shards_per_node property for restore command to succeed.
+// restore.setMaxShardsPerNode(2);
+// }
if (random().nextBoolean()) {
assertEquals(0, restore.process(solrClient).getStatus());
} else {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
index 8333339..bbfe474 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
@@ -1075,7 +1075,6 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
// in common with collection creation:
protected String configName;
- protected Integer maxShardsPerNode;
protected Integer replicationFactor;
protected Integer nrtReplicas;
protected Integer tlogReplicas;
@@ -1128,9 +1127,6 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
public Restore setConfigName(String config) { this.configName = config; return this; }
public String getConfigName() { return configName; }
- public Integer getMaxShardsPerNode() { return maxShardsPerNode; }
- public Restore setMaxShardsPerNode(int maxShardsPerNode) { this.maxShardsPerNode = maxShardsPerNode; return this; }
-
public Integer getReplicationFactor() { return replicationFactor; }
public Restore setReplicationFactor(Integer replicationFactor) { this.replicationFactor = replicationFactor; return this; }