You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/10/31 00:57:44 UTC
[lucene-solr] branch reference_impl_dev updated: @1094 Fix it up.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new 3f8b3e9 @1094 Fix it up.
3f8b3e9 is described below
commit 3f8b3e98004b5389329964ed53158c84d7663c4e
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Oct 30 19:57:12 2020 -0500
@1094 Fix it up.
---
.../org/apache/solr/cloud/MoveReplicaTest.java | 2 +-
.../org/apache/solr/cloud/ReplaceNodeTest.java | 2 +-
.../solrj/request/CollectionAdminRequest.java | 27 +++++++++++++---------
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
index a480ba3..de5f808 100644
--- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
@@ -120,7 +120,7 @@ public class MoveReplicaTest extends SolrCloudTestCase {
cloudClient.request(create);
// wait for recovery
- cluster.waitForActiveCollection(coll, create.getNumShards(), create.getNumShards() * (create.getNumNrtReplicas() + create.getNumPullReplicas() + create.getNumTlogReplicas()));
+ cluster.waitForActiveCollection(coll, create.getNumShards(), create.getNumShards() * create.getTotaleReplicaCount());
addDocs(coll, 100);
diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java
index 4b61041..8a5a745 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java
@@ -152,7 +152,7 @@ public class ReplaceNodeTest extends SolrCloudTestCase {
assertEquals("Expecting no cores but found some: " + status.getCoreStatus(), 0, status.getCoreStatus().size());
- cluster.waitForActiveCollection(coll, 5, create.getNumNrtReplicas().intValue() + create.getNumTlogReplicas().intValue() + create.getNumPullReplicas().intValue());
+ cluster.waitForActiveCollection(coll, 5, 5 * create.getTotaleReplicaCount());
collection = cloudClient.getZkStateReader().getClusterState().getCollection(coll);
assertEquals(create.getNumShards().intValue(), collection.getSlices().size());
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 3d99574..5e59af3 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
@@ -370,7 +370,7 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
* @param numReplicas the replication factor of the collection (same as numNrtReplicas)
*/
public static Create createCollection(String collection, String config, int numShards, int numReplicas) {
- return new Create(collection, config, numShards, numReplicas, 0, 0);
+ return new Create(collection, config, numShards, numReplicas, null, null);
}
/**
@@ -384,7 +384,7 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
* @param numReplicas the replication factor of the collection
*/
public static Create createCollection(String collection, int numShards, int numReplicas) {
- return new Create(collection, null, numShards, numReplicas, 0, 0);
+ return new Create(collection, null, numShards, numReplicas, null, null);
}
/**
@@ -429,11 +429,11 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
protected String policy;
protected String shards;
protected String routerField;
- protected Integer numShards = 0;
+ protected Integer numShards;
protected Integer maxShardsPerNode;
- protected Integer nrtReplicas = 0;
- protected Integer pullReplicas = 0;
- protected Integer tlogReplicas = 0;
+ protected Integer nrtReplicas;
+ protected Integer pullReplicas;
+ protected Integer tlogReplicas;
protected Properties properties;
protected String alias;
@@ -446,7 +446,7 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
/** Constructor that assumes {@link ImplicitDocRouter#NAME} and an explicit list of <code>shards</code> */
protected Create(String collection, String config, String shards, int numNrtReplicas) {
- this(collection, config, ImplicitDocRouter.NAME, 0, checkNotNull("shards",shards), numNrtReplicas, 0, 0);
+ this(collection, config, ImplicitDocRouter.NAME, null, checkNotNull("shards",shards), numNrtReplicas, null, null);
}
private Create(String collection, String config, String routerName, Integer numShards, String shards, Integer numNrtReplicas, Integer numTlogReplicas, Integer numPullReplicas) {
@@ -457,11 +457,11 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
}
this.configName = config;
this.routerName = routerName;
- this.numShards = numShards == 0 ? null : numShards;;
+ this.numShards = numShards;;
this.setShards(shards);
- this.nrtReplicas = numNrtReplicas == 0 ? null : numNrtReplicas;
- this.tlogReplicas = tlogReplicas == 0 ? null : tlogReplicas;
- this.pullReplicas = pullReplicas == 0 ? null : pullReplicas;
+ this.nrtReplicas = numNrtReplicas;
+ this.tlogReplicas = numTlogReplicas;
+ this.pullReplicas = numPullReplicas;
}
public Create setCreateNodeSet(String nodeSet) { this.createNodeSet = nodeSet; return this; }
@@ -481,6 +481,11 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
return this;
}
+ public int getTotaleReplicaCount() {
+ int cnt = (nrtReplicas == null ? 0 : nrtReplicas) + (tlogReplicas == null ? 0 : tlogReplicas) + (pullReplicas == null ? 0 : pullReplicas);
+ return cnt;
+ }
+
public String getConfigName() { return configName; }
public String getCreateNodeSet() { return createNodeSet; }
public String getRouterName() { return routerName; }