This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 0f912f6b84c Be clear that this builder is actually a Randomizing one.
(#1249)
0f912f6b84c is described below
commit 0f912f6b84c6b0a42079df2479ac6bbecc3c2c67
Author: Eric Pugh <[email protected]>
AuthorDate: Tue Dec 27 12:08:18 2022 -0500
Be clear that this builder is actually a Randomizing one. (#1249)
Named similar to the RandomizingCloudHttp2SolrClientBuilder.
---
.../apache/solr/cloud/ReindexCollectionTest.java | 2 +-
.../solr/cloud/SystemCollectionCompatTest.java | 2 +-
.../solrj/impl/CloudHttp2SolrClientTest.java | 4 +-
.../solrj/impl/CloudSolrClientCacheTest.java | 2 +-
.../client/solrj/impl/CloudSolrClientTest.java | 4 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 54 ++++++++++++++--------
6 files changed, 41 insertions(+), 27 deletions(-)
diff --git
a/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java
b/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java
index b06d535bba3..cd0c61d709c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java
@@ -73,7 +73,7 @@ public class ReindexCollectionTest extends SolrCloudTestCase {
cloudManager = zkController.getSolrCloudManager();
stateManager = cloudManager.getDistribStateManager();
solrClient =
- new CloudSolrClientBuilder(
+ new RandomizingCloudSolrClientBuilder(
Collections.singletonList(zkController.getZkServerAddress()),
Optional.empty())
.build();
}
diff --git
a/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java
b/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java
index 35fb6c39df2..af7c2d1cd54 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java
@@ -76,7 +76,7 @@ public class SystemCollectionCompatTest extends
SolrCloudTestCase {
ZkController zkController =
cluster.getJettySolrRunner(0).getCoreContainer().getZkController();
cloudManager = zkController.getSolrCloudManager();
solrClient =
- new CloudSolrClientBuilder(
+ new RandomizingCloudSolrClientBuilder(
Collections.singletonList(zkController.getZkServerAddress()),
Optional.empty())
.build();
CollectionAdminRequest.OverseerStatus status = new
CollectionAdminRequest.OverseerStatus();
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
index f245c3bef04..5aac562544f 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
@@ -302,7 +302,7 @@ public class CloudHttp2SolrClientTest extends
SolrCloudTestCase {
// Test Multi-Threaded routed updates for UpdateRequest
try (CloudSolrClient threadedClient =
- new CloudSolrClientBuilder(
+ new RandomizingCloudSolrClientBuilder(
Collections.singletonList(cluster.getZkServer().getZkAddress()),
Optional.empty())
.withParallelUpdates(true)
.build()) {
@@ -961,7 +961,7 @@ public class CloudHttp2SolrClientTest extends
SolrCloudTestCase {
// NOTE: creating our own CloudSolrClient whose settings we can muck
with...
try (CloudSolrClient stale_client =
- new CloudSolrClientBuilder(
+ new RandomizingCloudSolrClientBuilder(
Collections.singletonList(cluster.getZkServer().getZkAddress()),
Optional.empty())
.sendDirectUpdatesToAnyShardReplica()
.withParallelUpdates(true)
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java
index 1622f97d365..e2ce711025d 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java
@@ -81,7 +81,7 @@ public class CloudSolrClientCacheTest extends SolrTestCaseJ4 {
AtomicInteger lbhttpRequestCount = new AtomicInteger();
try (ClusterStateProvider clusterStateProvider =
getStateProvider(livenodes, refs);
CloudSolrClient cloudClient =
- new CloudSolrClientBuilder(clusterStateProvider)
+ new RandomizingCloudSolrClientBuilder(clusterStateProvider)
.withLBHttpSolrClient(mockLbclient)
.build()) {
livenodes.addAll(Set.of("192.168.1.108:7574_solr",
"192.168.1.108:8983_solr"));
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
index 6bd122f3402..f1e693b994a 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
@@ -303,7 +303,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
// Test Multi-Threaded routed updates for UpdateRequest
try (CloudSolrClient threadedClient =
- new CloudSolrClientBuilder(
+ new RandomizingCloudSolrClientBuilder(
Collections.singletonList(cluster.getZkServer().getZkAddress()),
Optional.empty())
.withParallelUpdates(true)
.build()) {
@@ -970,7 +970,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
// NOTE: creating our own CloudSolrClient whose settings we can muck
with...
try (CloudSolrClient stale_client =
- new CloudSolrClientBuilder(
+ new RandomizingCloudSolrClientBuilder(
Collections.singletonList(cluster.getZkServer().getZkAddress()),
Optional.empty())
.sendDirectUpdatesToAnyShardReplica()
.withParallelUpdates(true)
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 7caa396578b..f05af27d6f7 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -2614,23 +2614,23 @@ public abstract class SolrTestCaseJ4 extends
SolrTestCase {
}
/**
- * A variant of {@link
org.apache.solr.client.solrj.impl.CloudSolrClient.Builder} that will
+ * A variant of {@link
org.apache.solr.client.solrj.impl.CloudLegacySolrClient.Builder} that will
* randomize some internal settings.
*/
@Deprecated
- public static class CloudSolrClientBuilder extends
CloudLegacySolrClient.Builder {
+ public static class RandomizingCloudSolrClientBuilder extends
CloudLegacySolrClient.Builder {
- public CloudSolrClientBuilder(List<String> zkHosts, Optional<String>
zkChroot) {
+ public RandomizingCloudSolrClientBuilder(List<String> zkHosts,
Optional<String> zkChroot) {
super(zkHosts, zkChroot);
randomizeCloudSolrClient();
}
- public CloudSolrClientBuilder(ClusterStateProvider stateProvider) {
+ public RandomizingCloudSolrClientBuilder(ClusterStateProvider
stateProvider) {
this.stateProvider = stateProvider;
randomizeCloudSolrClient();
}
- public CloudSolrClientBuilder(MiniSolrCloudCluster cluster) {
+ public RandomizingCloudSolrClientBuilder(MiniSolrCloudCluster cluster) {
if (random().nextBoolean()) {
this.zkHosts.add(cluster.getZkServer().getZkAddress());
} else {
@@ -2664,7 +2664,9 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase
{
* org.apache.solr.client.solrj.impl.CloudSolrClient.Builder} class directly
*/
public static CloudSolrClient getCloudSolrClient(String zkHost) {
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty()).build();
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
+ .build();
}
/**
@@ -2673,7 +2675,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase
{
* org.apache.solr.client.solrj.impl.CloudSolrClient.Builder} class directly
*/
public static CloudSolrClient getCloudSolrClient(MiniSolrCloudCluster
cluster) {
- return new CloudSolrClientBuilder(cluster).build();
+ return new RandomizingCloudSolrClientBuilder(cluster).build();
}
/**
@@ -2682,7 +2684,8 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase
{
* org.apache.solr.client.solrj.impl.CloudSolrClient.Builder} class directly
*/
public static CloudSolrClient getCloudSolrClient(String zkHost, HttpClient
httpClient) {
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty())
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
.withHttpClient(httpClient)
.build();
}
@@ -2694,17 +2697,20 @@ public abstract class SolrTestCaseJ4 extends
SolrTestCase {
*/
public static CloudSolrClient getCloudSolrClient(String zkHost, boolean
shardLeadersOnly) {
if (shardLeadersOnly) {
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty())
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
.sendUpdatesOnlyToShardLeaders()
.build();
}
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty())
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
.sendUpdatesToAllReplicasInShard()
.build();
}
- public static CloudSolrClientBuilder newCloudSolrClient(String zkHost) {
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty());
+ public static RandomizingCloudSolrClientBuilder newCloudSolrClient(String
zkHost) {
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty());
}
/**
@@ -2715,12 +2721,14 @@ public abstract class SolrTestCaseJ4 extends
SolrTestCase {
public static CloudSolrClient getCloudSolrClient(
String zkHost, boolean shardLeadersOnly, int socketTimeoutMillis) {
if (shardLeadersOnly) {
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty())
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
.sendUpdatesOnlyToShardLeaders()
.withSocketTimeout(socketTimeoutMillis)
.build();
}
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty())
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
.sendUpdatesToAllReplicasInShard()
.withSocketTimeout(socketTimeoutMillis)
.build();
@@ -2737,13 +2745,15 @@ public abstract class SolrTestCaseJ4 extends
SolrTestCase {
int connectionTimeoutMillis,
int socketTimeoutMillis) {
if (shardLeadersOnly) {
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty())
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
.sendUpdatesOnlyToShardLeaders()
.withConnectionTimeout(connectionTimeoutMillis)
.withSocketTimeout(socketTimeoutMillis)
.build();
}
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty())
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
.sendUpdatesToAllReplicasInShard()
.withConnectionTimeout(connectionTimeoutMillis)
.withSocketTimeout(socketTimeoutMillis)
@@ -2758,12 +2768,14 @@ public abstract class SolrTestCaseJ4 extends
SolrTestCase {
public static CloudSolrClient getCloudSolrClient(
String zkHost, boolean shardLeadersOnly, HttpClient httpClient) {
if (shardLeadersOnly) {
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty())
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
.withHttpClient(httpClient)
.sendUpdatesOnlyToShardLeaders()
.build();
}
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty())
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
.withHttpClient(httpClient)
.sendUpdatesToAllReplicasInShard()
.build();
@@ -2781,14 +2793,16 @@ public abstract class SolrTestCaseJ4 extends
SolrTestCase {
int connectionTimeoutMillis,
int socketTimeoutMillis) {
if (shardLeadersOnly) {
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty())
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
.withHttpClient(httpClient)
.sendUpdatesOnlyToShardLeaders()
.withConnectionTimeout(connectionTimeoutMillis)
.withSocketTimeout(socketTimeoutMillis)
.build();
}
- return new CloudSolrClientBuilder(Collections.singletonList(zkHost),
Optional.empty())
+ return new RandomizingCloudSolrClientBuilder(
+ Collections.singletonList(zkHost), Optional.empty())
.withHttpClient(httpClient)
.sendUpdatesToAllReplicasInShard()
.withConnectionTimeout(connectionTimeoutMillis)
