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/11/14 20:16:27 UTC
[lucene-solr] branch reference_impl_dev updated: @1203 Fix 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 f782ffd @1203 Fix up.
f782ffd is described below
commit f782ffd33a267990cece86945d660b0bb4fff2df
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Nov 14 14:08:02 2020 -0600
@1203 Fix up.
---
.../solr/analytics/stream/AnalyticsShardRequestManager.java | 2 +-
.../src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
.../src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java | 12 ++++++++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.java
index f6f27db..16e64f8 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/stream/AnalyticsShardRequestManager.java
@@ -107,7 +107,7 @@ public class AnalyticsShardRequestManager {
ClusterState clusterState = zkStateReader.getClusterState();
Set<String> liveNodes = clusterState.getLiveNodes();
- Slice[] slices = clusterState.getCollection(collection).getActiveSlicesArr();
+ Collection<Slice> slices = clusterState.getCollection(collection).getActiveSlices();
for(Slice slice : slices) {
Collection<Replica> replicas = slice.getReplicas();
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 2c7341b..35abe44 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -1638,7 +1638,7 @@ public class ZkStateReader implements SolrCloseable, Replica.NodeNameToBaseUrl {
constructState(Collections.emptySet());
}
-
+
public void refreshAndWatch() {
try {
refreshCollectionList(this);
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
index 21bc927..eff83ed 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -328,7 +328,7 @@ public class MiniSolrCloudCluster {
}
// build the client
- solrClient = buildSolrClient();
+ solrClient = buildZkReaderAndSolrClient();
solrZkClient = zkStateReader.getZkClient();
if (numServers > 0) {
@@ -742,14 +742,18 @@ public class MiniSolrCloudCluster {
public SolrZkClient getZkClient() {
return solrZkClient;
}
-
- public CloudHttp2SolrClient buildSolrClient() {
- // return new CloudHttp2SolrClient.Builder(Collections.singletonList(zkServer.getZkHost()), Optional.of("/solr")).build();
+
+ protected CloudHttp2SolrClient buildZkReaderAndSolrClient() {
+ // return new CloudHttp2SolrClient.Builder(Collections.singletonList(zkServer.getZkHost()), Optional.of("/solr")).build();
zkStateReader = new ZkStateReader(zkServer.getZkAddress(), 15000, 30000);
zkStateReader.createClusterStateWatchersAndUpdate();
return new CloudHttp2SolrClient.Builder(zkStateReader).build();
}
+ public CloudHttp2SolrClient buildSolrClient() {
+ return new CloudHttp2SolrClient.Builder(Collections.singletonList(zkServer.getZkHost()), Optional.of("/solr")).build();
+ }
+
private static String getHostContextSuitableForServletContext(String ctx) {
if (ctx == null || "".equals(ctx)) ctx = "/solr";
if (ctx.endsWith("/")) ctx = ctx.substring(0,ctx.length()-1);