You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ds...@apache.org on 2024/05/14 03:28:58 UTC
(solr) branch branch_9x updated: SOLR-17066 Fix ShardSplitTest & StressHdfsTest (#2457)
This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 796bfbdf39f SOLR-17066 Fix ShardSplitTest & StressHdfsTest (#2457)
796bfbdf39f is described below
commit 796bfbdf39f02bb57b5799ac9387de9c28c24af8
Author: David Smiley <ds...@apache.org>
AuthorDate: Mon May 13 22:34:38 2024 -0400
SOLR-17066 Fix ShardSplitTest & StressHdfsTest (#2457)
Clarify getBaseURL
(cherry picked from commit d141875f9b29c0b4a0e39dd0b53f1895809df3e1)
---
.../org/apache/solr/cloud/api/collections/ShardSplitTest.java | 4 +---
.../src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.java | 4 ++++
.../java/org/apache/solr/client/solrj/impl/HttpSolrClient.java | 1 +
.../apache/solr/cloud/AbstractBasicDistributedZkTestBase.java | 10 ----------
.../org/apache/solr/cloud/AbstractFullDistribZkTestBase.java | 3 +++
.../src/java/org/apache/solr/embedded/JettySolrRunner.java | 5 +----
6 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java
index 517a718416c..59bad33ba96 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java
@@ -1277,9 +1277,7 @@ public class ShardSplitTest extends BasicDistributedZkTest {
QueryRequest request = new QueryRequest(params);
request.setPath("/admin/collections");
- String baseUrl =
- ((HttpSolrClient) shardToJetty.get(SHARD1).get(0).client.getSolrClient()).getBaseURL();
- baseUrl = baseUrl.substring(0, baseUrl.length() - "collection1".length());
+ String baseUrl = shardToJetty.get(SHARD1).get(0).jetty.getBaseUrl().toString();
try (SolrClient baseServer =
new HttpSolrClient.Builder(baseUrl)
diff --git a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.java b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.java
index 72acd6f5343..7bb98b8d97b 100644
--- a/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.java
+++ b/solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/StressHdfsTest.java
@@ -251,4 +251,8 @@ public class StressHdfsTest extends AbstractBasicDistributedZkTestBase {
}
}
}
+
+ protected String getBaseUrl(SolrClient client) {
+ return ((HttpSolrClient) client).getBaseURL();
+ }
}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
index 97124f5e064..e8f4beadd0f 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
@@ -814,6 +814,7 @@ public class HttpSolrClient extends BaseHttpSolrClient {
return invariantParams;
}
+ /** Typically looks like {@code http://localhost:8983/solr} (no core or collection) */
public String getBaseURL() {
return baseUrl;
}
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java
index 96d0c9952a3..91fe79b6c73 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractBasicDistributedZkTestBase.java
@@ -1115,16 +1115,6 @@ public abstract class AbstractBasicDistributedZkTestBase extends AbstractFullDis
}
}
- protected String getBaseUrl(SolrClient client) {
- String url2 =
- ((HttpSolrClient) client)
- .getBaseURL()
- .substring(
- 0,
- ((HttpSolrClient) client).getBaseURL().length() - DEFAULT_COLLECTION.length() - 1);
- return url2;
- }
-
@Override
protected CollectionAdminResponse createCollection(
Map<String, List<Integer>> collectionInfos,
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 75ad621e871..e7479653574 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
@@ -159,7 +159,10 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
public JettySolrRunner jetty;
public String nodeName;
public String coreNodeName;
+
+ /** Core or Collection URL */
public String url;
+
public CloudSolrServerClient client;
public ZkNodeProps info;
diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
index 7edb5bc7fdc..55b7a45e285 100644
--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
@@ -836,10 +836,7 @@ public class JettySolrRunner {
this.proxyPort = proxyPort;
}
- /**
- * Returns a base URL consisting of the protocol, host, and port for a Connector in use by the
- * Jetty Server contained in this runner.
- */
+ /** Returns a base URL like {@code http://localhost:8983/solr} */
public URL getBaseUrl() {
try {
return new URL(protocol, host, jettyPort, config.context);