Apache Solr open-source search software
SOLR-10461: move setAliveCheckInterval from clients into Builder (#1250)
Alexb21b86c374a0
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex fd104124821..1e84d3e546b 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -94,7 +94,7 @@ Improvementsdirect setter setRetryExpiryTime on cloud SolrClients. (Eric Pugh)* SOLR-10461: Introduce Builder setter for aliveCheckInterval on load balanced SolrClients. Deprecated- direct setter setAliveCheckInterval on SolrClients. (Eric Pugh, David Smiley)+ direct setter setAliveCheckInterval on SolrClients. (Eric Pugh, David Smiley, Alex Deparvu)* SOLR-10462: Introduce Builder setter for pollQueueTime on ConcurrentUpdateHttp2SolrClient. Deprecateddirect setter setPollQueueTime on ConcurrentUpdateHttp2SolrClient. (Eric Pugh)diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.javaindex f6710cc45a4..04b1800ab94 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttp2SolrClient.java@@ -299,9 +299,11 @@ public class LBHttp2SolrClient extends LBSolrClient {}public static class Builder {++ public static final int CHECK_INTERVAL = 60 * 1000; // 1 minute between checksprivate final Http2SolrClient http2Client;private final String[] baseSolrUrls;- private int aliveCheckInterval;+ private int aliveCheckInterval = CHECK_INTERVAL;public Builder(Http2SolrClient http2Client, String... baseSolrUrls) {this.http2Client = http2Client;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.javaindex 8df40dfc8f6..8b321f8e1f8 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java@@ -180,9 +180,11 @@ public class LBHttpSolrClient extends LBSolrClient {/** Constructs {@link LBHttpSolrClient} instances from provided configuration. */public static class Builder extends SolrClientBuilder<Builder> {++ public static final int CHECK_INTERVAL = 60 * 1000; // 1 minute between checksprotected final List<String> baseSolrUrls;protected HttpSolrClient.Builder httpSolrClientBuilder;- private int aliveCheckInterval;+ private int aliveCheckInterval = CHECK_INTERVAL;public Builder() {this.baseSolrUrls = new ArrayList<>();diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.javaindex 27143fef288..59141fb03f9 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java@@ -62,7 +62,6 @@ public abstract class LBSolrClient extends SolrClient {// defaultsprotected static final Set<Integer> RETRY_CODES =new HashSet<>(Arrays.asList(404, 403, 503, 500));- private static final int CHECK_INTERVAL = 60 * 1000; // 1 minute between checksprivate static final int NONSTANDARD_PING_LIMIT =5; // number of times we'll ping dead servers not in the server list@@ -78,7 +77,7 @@ public abstract class LBSolrClient extends SolrClient {private volatile ScheduledExecutorService aliveCheckExecutor;- protected int aliveCheckInterval = CHECK_INTERVAL;+ protected int aliveCheckInterval = LBHttpSolrClient.Builder.CHECK_INTERVAL;private final AtomicInteger counter = new AtomicInteger(-1);private static final SolrQuery solrQuery = new SolrQuery("*:*");