Apache Solr open-source search software
SOLR-16595: Standardize Solr Client Builders handling of times (#1338)
Eric Pugh7eb46b3f0313
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex c57b97f60a7..4fcb4302811 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -140,6 +140,9 @@ Improvements* SOLR-16590: Standardize Builder method names on SolrClient's to use the with pattern, deprecating the use of set or bare property name. (Eric Pugh)+* SOLR-16595: Standardize Builder methods handling of times to use require a TimeUnit to be passed in. Deprecated methods that+ do not specify a TimeUnit. (Eric Pugh)+Optimizations---------------------diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.javaindex 0a31ce29fab..a814105fa59 100644--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java@@ -282,8 +282,8 @@ public class HttpShardHandlerFactory extends ShardHandlerFactorythis.defaultClient =new Http2SolrClient.Builder()- .withConnectionTimeout(connectionTimeout)- .withIdleTimeout(soTimeout)+ .withConnectionTimeout(connectionTimeout, TimeUnit.MILLISECONDS)+ .withIdleTimeout(soTimeout, TimeUnit.MILLISECONDS).withExecutor(commExecutor).withMaxConnectionsPerHost(maxConnectionsPerHost).build();diff --git a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.javaindex 9294195d4e6..d441fc989f7 100644--- a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java+++ b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java@@ -25,6 +25,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;import java.util.concurrent.ExecutorService;+import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.ConcurrentUpdateHttp2SolrClient;import org.apache.solr.client.solrj.impl.Http2SolrClient;@@ -39,7 +40,8 @@ public class StreamingSolrClients {private final int runnerCount = Integer.getInteger("solr.cloud.replication.runners", 1);// should be less than solr.jetty.http.idleTimeout- private final int pollQueueTime = Integer.getInteger("solr.cloud.client.pollQueueTime", 10000);+ private final int pollQueueTimeMillis =+ Integer.getInteger("solr.cloud.client.pollQueueTime", 10000);private Http2SolrClient httpClient;@@ -74,7 +76,8 @@ public class StreamingSolrClients {.withThreadCount(runnerCount).withExecutorService(updateExecutor).alwaysStreamDeletes()- .setPollQueueTime(pollQueueTime) // minimize connections created+ .setPollQueueTime(+ pollQueueTimeMillis, TimeUnit.MILLISECONDS) // minimize connections created.build();solrClients.put(url, client);diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.javaindex d52bda8506d..3a52fe87fb9 100644--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java@@ -144,8 +144,8 @@ public class UpdateShardHandler implements SolrInfoBean {Http2SolrClient.Builder updateOnlyClientBuilder = new Http2SolrClient.Builder();if (cfg != null) {updateOnlyClientBuilder- .withConnectionTimeout(cfg.getDistributedConnectionTimeout())- .withIdleTimeout(cfg.getDistributedSocketTimeout())+ .withConnectionTimeout(cfg.getDistributedConnectionTimeout(), TimeUnit.MILLISECONDS)+ .withIdleTimeout(cfg.getDistributedSocketTimeout(), TimeUnit.MILLISECONDS).withMaxConnectionsPerHost(cfg.getMaxUpdateConnectionsPerHost());}updateOnlyClientBuilder.withTheseParamNamesInTheUrl(urlParamNames);diff --git a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.javaindex 6e17ba2ed98..399134dce7f 100644--- a/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java+++ b/solr/core/src/test/org/apache/solr/update/MockingHttp2SolrClient.java@@ -21,6 +21,7 @@ import java.io.IOException;import java.net.ConnectException;import java.net.SocketException;import java.util.Set;+import java.util.concurrent.TimeUnit;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;@@ -54,8 +55,8 @@ public class MockingHttp2SolrClient extends Http2SolrClient {public Builder(UpdateShardHandlerConfig config) {super();- this.withConnectionTimeout(config.getDistributedConnectionTimeout());- this.withIdleTimeout(config.getDistributedSocketTimeout());+ this.withConnectionTimeout(config.getDistributedConnectionTimeout(), TimeUnit.MILLISECONDS);+ this.withIdleTimeout(config.getDistributedSocketTimeout(), TimeUnit.MILLISECONDS);}@Overridediff --git a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.javaindex abe0f63a35d..f34aad926e3 100644--- a/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java+++ b/solr/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java@@ -18,6 +18,7 @@package org.apache.solr.prometheus.exporter;import java.util.Optional;+import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;import org.apache.solr.client.solrj.impl.CloudHttp2SolrClient;import org.apache.solr.client.solrj.impl.CloudSolrClient;@@ -36,8 +37,8 @@ public class SolrClientFactory {public Http2SolrClient createStandaloneSolrClient(String solrHost) {Http2SolrClient http2SolrClient =new Http2SolrClient.Builder(solrHost)- .withIdleTimeout(settings.getHttpReadTimeout())- .withConnectionTimeout(settings.getHttpConnectionTimeout())+ .withIdleTimeout(settings.getHttpReadTimeout(), TimeUnit.MILLISECONDS)+ .withConnectionTimeout(settings.getHttpConnectionTimeout(), TimeUnit.MILLISECONDS).withResponseParser(new NoOpResponseParser("json")).build();@@ -55,8 +56,9 @@ public class SolrClientFactory {Optional.ofNullable(parser.getChrootPath())).withInternalClientBuilder(new Http2SolrClient.Builder()- .withIdleTimeout(settings.getHttpReadTimeout())- .withConnectionTimeout(settings.getHttpConnectionTimeout()))+ .withIdleTimeout(settings.getHttpReadTimeout(), TimeUnit.MILLISECONDS)+ .withConnectionTimeout(+ settings.getHttpConnectionTimeout(), TimeUnit.MILLISECONDS)).withResponseParser(new NoOpResponseParser("json")).build();diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.javaindex 65f539cb672..14dfa8cf3a3 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java@@ -65,7 +65,7 @@ public class CloudHttp2SolrClient extends CloudSolrClient {this.clientIsInternal = false;this.myClient = builder.httpClient;}- this.retryExpiryTime = builder.retryExpiryTime;+ this.retryExpiryTimeNano = builder.retryExpiryTimeNano;if (builder.requestWriter != null) {this.myClient.requestWriter = builder.requestWriter;}@@ -98,7 +98,8 @@ public class CloudHttp2SolrClient extends CloudSolrClient {this.stateProvider = builder.stateProvider;}- this.collectionStateCache.timeToLiveMs = builder.timeToLiveSeconds * 1000L;+ this.collectionStateCache.timeToLiveMs =+ TimeUnit.MILLISECONDS.convert(builder.timeToLiveSeconds, TimeUnit.SECONDS);// If caches are expired then they are refreshed after acquiring a lock. Set the number of// locks.@@ -151,9 +152,9 @@ public class CloudHttp2SolrClient extends CloudSolrClient {protected Http2SolrClient.Builder internalClientBuilder;private RequestWriter requestWriter;private ResponseParser responseParser;- private long retryExpiryTime =+ private long retryExpiryTimeNano =TimeUnit.NANOSECONDS.convert(3, TimeUnit.SECONDS); // 3 seconds or 3 million nanos- private int timeToLiveSeconds = 60;+ private long timeToLiveSeconds = 60;private int parallelCacheRefreshesLocks = 3;/**@@ -315,19 +316,19 @@ public class CloudHttp2SolrClient extends CloudSolrClient {/*** This is the time to wait to refetch the state after getting the same state version from ZK*- * @deprecated Please use {@link #withRetryExpiryTime(int)} *+ * @deprecated Please use {@link #withRetryExpiryTime(long, TimeUnit)}*/@Deprecated(since = "9.2")public Builder setRetryExpiryTime(int secs) {- this.withRetryExpiryTime(secs);+ this.withRetryExpiryTime(secs, TimeUnit.SECONDS);return this;}/*** This is the time to wait to refetch the state after getting the same state version from ZK*/- public Builder withRetryExpiryTime(int secs) {- this.retryExpiryTime = TimeUnit.NANOSECONDS.convert(secs, TimeUnit.SECONDS);+ public Builder withRetryExpiryTime(long expiryTime, TimeUnit unit) {+ this.retryExpiryTimeNano = TimeUnit.NANOSECONDS.convert(expiryTime, unit);return this;}@@ -335,10 +336,22 @@ public class CloudHttp2SolrClient extends CloudSolrClient {* Sets the cache ttl for DocCollection Objects cached.** @param timeToLiveSeconds ttl value in seconds+ * @deprecated Please use {@link #withCollectionCacheTtl(long, TimeUnit)}*/+ @Deprecated(since = "9.2")public Builder withCollectionCacheTtl(int timeToLiveSeconds) {- assert timeToLiveSeconds > 0;- this.timeToLiveSeconds = timeToLiveSeconds;+ withCollectionCacheTtl(timeToLiveSeconds, TimeUnit.SECONDS);+ return this;+ }++ /**+ * Sets the cache ttl for DocCollection Objects cached.+ *+ * @param timeToLive ttl value+ */+ public Builder withCollectionCacheTtl(long timeToLive, TimeUnit unit) {+ assert timeToLive > 0;+ this.timeToLiveSeconds = TimeUnit.SECONDS.convert(timeToLive, unit);return this;}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.javaindex eac2326a330..64db0045d41 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudLegacySolrClient.java@@ -86,8 +86,9 @@ public class CloudLegacySolrClient extends CloudSolrClient {} else {this.stateProvider = builder.stateProvider;}- this.retryExpiryTime = builder.retryExpiryTime;- this.collectionStateCache.timeToLiveMs = builder.timeToLiveSeconds * 1000L;+ this.retryExpiryTimeNano = builder.retryExpiryTimeNano;+ this.collectionStateCache.timeToLiveMs =+ TimeUnit.MILLISECONDS.convert(builder.timeToLiveSeconds, TimeUnit.SECONDS);this.clientIsInternal = builder.httpClient == null;this.shutdownLBHttpSolrServer = builder.loadBalancedSolrClient == null;if (builder.lbClientBuilder != null) {@@ -107,11 +108,11 @@ public class CloudLegacySolrClient extends CloudSolrClient {final LBHttpSolrClient.Builder lbBuilder = builder.lbClientBuilder;if (builder.connectionTimeoutMillis != null) {- lbBuilder.withConnectionTimeout(builder.connectionTimeoutMillis);+ lbBuilder.withConnectionTimeout(builder.connectionTimeoutMillis, TimeUnit.MILLISECONDS);}if (builder.socketTimeoutMillis != null) {- lbBuilder.withSocketTimeout(builder.socketTimeoutMillis);+ lbBuilder.withSocketTimeout(builder.socketTimeoutMillis, TimeUnit.MILLISECONDS);}}@@ -176,10 +177,12 @@ public class CloudLegacySolrClient extends CloudSolrClient {final LBHttpSolrClient.Builder lbBuilder = new LBHttpSolrClient.Builder();lbBuilder.withHttpClient(httpClient);if (cloudSolrClientBuilder.connectionTimeoutMillis != null) {- lbBuilder.withConnectionTimeout(cloudSolrClientBuilder.connectionTimeoutMillis);+ lbBuilder.withConnectionTimeout(+ cloudSolrClientBuilder.connectionTimeoutMillis, TimeUnit.MILLISECONDS);}if (cloudSolrClientBuilder.socketTimeoutMillis != null) {- lbBuilder.withSocketTimeout(cloudSolrClientBuilder.socketTimeoutMillis);+ lbBuilder.withSocketTimeout(+ cloudSolrClientBuilder.socketTimeoutMillis, TimeUnit.MILLISECONDS);}lbBuilder.withRequestWriter(new BinaryRequestWriter());lbBuilder.withResponseParser(new BinaryResponseParser());@@ -197,7 +200,7 @@ public class CloudLegacySolrClient extends CloudSolrClient {protected boolean shardLeadersOnly = true;protected boolean directUpdatesToLeadersOnly = false;protected boolean parallelUpdates = true;- protected long retryExpiryTime =+ protected long retryExpiryTimeNano =TimeUnit.NANOSECONDS.convert(3, TimeUnit.SECONDS); // 3 seconds or 3 million nanosprotected ClusterStateProvider stateProvider;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.javaindex b638dd13dff..10360292dc0 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java@@ -105,7 +105,7 @@ public abstract class CloudSolrClient extends SolrClient {new SolrNamedThreadFactory("CloudSolrClient ThreadPool"));public static final String STATE_VERSION = "_stateVer_";- protected long retryExpiryTime =+ protected long retryExpiryTimeNano =TimeUnit.NANOSECONDS.convert(3, TimeUnit.SECONDS); // 3 seconds or 3 million nanosprivate static final Set<String> NON_ROUTABLE_PARAMS =Set.of(@@ -232,32 +232,32 @@ public abstract class CloudSolrClient extends SolrClient {*/@Deprecatedpublic void setRetryExpiryTime(int secs) {- this.retryExpiryTime = TimeUnit.NANOSECONDS.convert(secs, TimeUnit.SECONDS);+ this.retryExpiryTimeNano = TimeUnit.NANOSECONDS.convert(secs, TimeUnit.SECONDS);}protected final StateCache collectionStateCache = new StateCache();class ExpiringCachedDocCollection {final DocCollection cached;- final long cachedAt;+ final long cachedAtNano;// This is the time at which the collection is retried and got the same old version- volatile long retriedAt = -1;+ volatile long retriedAtNano = -1;// flag that suggests that this is potentially to be recheckedvolatile boolean maybeStale = false;ExpiringCachedDocCollection(DocCollection cached) {this.cached = cached;- this.cachedAt = System.nanoTime();+ this.cachedAtNano = System.nanoTime();}boolean isExpired(long timeToLiveMs) {- return (System.nanoTime() - cachedAt)+ return (System.nanoTime() - cachedAtNano)> TimeUnit.NANOSECONDS.convert(timeToLiveMs, TimeUnit.MILLISECONDS);}boolean shouldRetry() {if (maybeStale) { // we are not sure if it is stale so check with retry time- if ((retriedAt == -1 || (System.nanoTime() - retriedAt) > retryExpiryTime)) {+ if ((retriedAtNano == -1 || (System.nanoTime() - retriedAtNano) > retryExpiryTimeNano)) {return true; // we retried a while back. and we could not get anything new.// it's likely that it is not going to be available now also.}@@ -266,7 +266,7 @@ public abstract class CloudSolrClient extends SolrClient {}void setRetriedAt() {- retriedAt = System.nanoTime();+ retriedAtNano = System.nanoTime();}}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.javaindex 20b733c2986..ad9f50e54e7 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClient.java@@ -64,8 +64,8 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {private boolean shutdownClient;private boolean shutdownExecutor;- private int pollQueueTime = 250;- private int stallTime;+ private long pollQueueTimeMillis;+ private long stallTimeMillis;private final boolean streamDeletes;private volatile boolean closed;private volatile CountDownLatch lock = null; // used to block everything@@ -103,7 +103,7 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {return size() == 0;}- public E poll(int timeout, TimeUnit unit) throws InterruptedException {+ public E poll(long timeout, TimeUnit unit) throws InterruptedException {E e = queue.poll(timeout, unit);if (e == null) {return null;@@ -149,19 +149,22 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {this.runners = new ArrayDeque<>();this.streamDeletes = builder.streamDeletes;this.basePath = builder.baseSolrUrl;- this.pollQueueTime = builder.pollQueueTime;- this.stallTime = Integer.getInteger("solr.cloud.client.stallTime", 15000);+ this.pollQueueTimeMillis = builder.pollQueueTimeMillis;+ this.stallTimeMillis = Integer.getInteger("solr.cloud.client.stallTime", 15000);// make sure the stall time is larger than the polling time// to give a chance for the queue to change- int minimalStallTime = pollQueueTime * 2;- if (minimalStallTime > this.stallTime) {- this.stallTime = minimalStallTime;+ long minimalStallTimeMillis = pollQueueTimeMillis * 2;+ if (minimalStallTimeMillis > this.stallTimeMillis) {+ this.stallTimeMillis = minimalStallTimeMillis;}- if (stallTime < pollQueueTime * 2) {+ if (stallTimeMillis < pollQueueTimeMillis * 2) {throw new RuntimeException(- "Invalid stallTime: " + stallTime + "ms, must be 2x > pollQueueTime " + pollQueueTime);+ "Invalid stallTime: "+ + stallTimeMillis+ + "ms, must be 2x > pollQueueTime "+ + pollQueueTimeMillis);}if (builder.executorService != null) {@@ -227,7 +230,7 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {try {Update update;notifyQueueAndRunnersIfEmptyQueue();- update = queue.poll(pollQueueTime, TimeUnit.MILLISECONDS);+ update = queue.poll(pollQueueTimeMillis, TimeUnit.MILLISECONDS);if (update == null) {break;@@ -248,7 +251,7 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {out.flush();notifyQueueAndRunnersIfEmptyQueue();- upd = queue.poll(pollQueueTime, TimeUnit.MILLISECONDS);+ upd = queue.poll(pollQueueTimeMillis, TimeUnit.MILLISECONDS);}responseListener = out.getResponseListener();}@@ -454,7 +457,7 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {} else {long currentStallTime =TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - lastStallTime);- if (currentStallTime > stallTime) {+ if (currentStallTime > stallTimeMillis) {throw new IOException("Request processing has stalled for "+ currentStallTime@@ -513,7 +516,7 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {} else {long currentStallTime =TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - lastStallTime);- if (currentStallTime > stallTime) {+ if (currentStallTime > stallTimeMillis) {throw new IOException("Task queue processing has stalled for "+ currentStallTime@@ -607,7 +610,7 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {lastStallTime = System.nanoTime();} else {long currentStallTime = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - lastStallTime);- if (currentStallTime > stallTime) {+ if (currentStallTime > stallTimeMillis) {throw new IOException("Task queue processing has stalled for "+ currentStallTime@@ -699,17 +702,18 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {}/**- * @param pollQueueTime time for an open connection to wait for updates when the queue is empty.+ * @param pollQueueTimeMillis time for an open connection to wait for updates when the queue is+ * empty.* @deprecated use {@link ConcurrentUpdateHttp2SolrClient.Builder#setPollQueueTime(int)} instead*/@Deprecated- public void setPollQueueTime(int pollQueueTime) {- this.pollQueueTime = pollQueueTime;+ public void setPollQueueTime(int pollQueueTimeMillis) {+ this.pollQueueTimeMillis = pollQueueTimeMillis;// make sure the stall time is larger than the polling time// to give a chance for the queue to change- int minimalStallTime = pollQueueTime * 2;- if (minimalStallTime > this.stallTime) {- this.stallTime = minimalStallTime;+ int minimalStallTime = pollQueueTimeMillis * 2;+ if (minimalStallTime > this.stallTimeMillis) {+ this.stallTimeMillis = minimalStallTime;}}@@ -722,7 +726,7 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {protected ExecutorService executorService;protected boolean streamDeletes;protected boolean closeHttp2Client;- private int pollQueueTime;+ private long pollQueueTimeMillis;public Builder(String baseSolrUrl, Http2SolrClient client) {this(baseSolrUrl, client, false);@@ -807,11 +811,22 @@ public class ConcurrentUpdateHttp2SolrClient extends SolrClient {return this;}+ /**+ * @param pollQueueTimeMillis time for an open connection to wait for updates when the queue is+ * empty.+ * @deprecated Please use {@link #setPollQueueTime(long, TimeUnit)}+ */+ @Deprecated(since = "9.2")+ public Builder setPollQueueTime(int pollQueueTimeMillis) {+ setPollQueueTime(pollQueueTimeMillis, TimeUnit.MILLISECONDS);+ return this;+ }+/*** @param pollQueueTime time for an open connection to wait for updates when the queue is empty.*/- public Builder setPollQueueTime(int pollQueueTime) {- this.pollQueueTime = pollQueueTime;+ public Builder setPollQueueTime(long pollQueueTime, TimeUnit unit) {+ this.pollQueueTimeMillis = TimeUnit.MILLISECONDS.convert(pollQueueTime, unit);return this;}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.javaindex 7680b6e7f62..8b8f908b4dc 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java@@ -105,8 +105,8 @@ public class ConcurrentUpdateSolrClient extends SolrClient {this.client =new HttpSolrClient.Builder(builder.baseSolrUrl).withHttpClient(builder.httpClient)- .withConnectionTimeout(builder.connectionTimeoutMillis)- .withSocketTimeout(builder.socketTimeoutMillis)+ .withConnectionTimeout(builder.connectionTimeoutMillis, TimeUnit.MILLISECONDS)+ .withSocketTimeout(builder.socketTimeoutMillis, TimeUnit.MILLISECONDS).withFollowRedirects(false).withTheseParamNamesInTheUrl(builder.urlParamNames).build();@@ -114,8 +114,8 @@ public class ConcurrentUpdateSolrClient extends SolrClient {this.threadCount = builder.threadCount;this.runners = new ArrayDeque<>();this.streamDeletes = builder.streamDeletes;- this.connectionTimeout = builder.connectionTimeoutMillis;- this.soTimeout = builder.socketTimeoutMillis;+ this.connectionTimeout = Math.toIntExact(builder.connectionTimeoutMillis);+ this.soTimeout = Math.toIntExact(builder.socketTimeoutMillis);this.stallTime = Integer.getInteger("solr.cloud.client.stallTime", 15000);if (stallTime < pollQueueTime * 2) {throw new RuntimeException(diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.javaindex 1b3b7ff4048..74fb58bdb23 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java@@ -129,8 +129,8 @@ public class Http2SolrClient extends SolrClient {private HttpClient httpClient;private volatile Set<String> urlParamNames = Set.of();- private int idleTimeout;- private int requestTimeout;+ private long idleTimeoutMillis;+ private long requestTimeoutMillis;protected ResponseParser parser = new BinaryResponseParser();protected RequestWriter requestWriter = new BinaryRequestWriter();@@ -158,8 +158,11 @@ public class Http2SolrClient extends SolrClient {this.serverBaseUrl = serverBaseUrl;}- if (builder.idleTimeout != null && builder.idleTimeout > 0) idleTimeout = builder.idleTimeout;- else idleTimeout = HttpClientUtil.DEFAULT_SO_TIMEOUT;+ if (builder.idleTimeoutMillis != null && builder.idleTimeoutMillis > 0) {+ idleTimeoutMillis = builder.idleTimeoutMillis;+ } else {+ idleTimeoutMillis = HttpClientUtil.DEFAULT_SO_TIMEOUT;+ }if (builder.http2SolrClient == null) {httpClient = createHttpClient(builder);@@ -180,10 +183,10 @@ public class Http2SolrClient extends SolrClient {if (builder.responseParser != null) {parser = builder.responseParser;}- if (builder.requestTimeout == null) {- requestTimeout = -1;+ if (builder.requestTimeoutMillis == null) {+ requestTimeoutMillis = -1;} else {- requestTimeout = builder.requestTimeout;+ requestTimeoutMillis = builder.requestTimeoutMillis;}httpClient.setFollowRedirects(builder.followRedirects);this.urlParamNames = builder.urlParamNames;@@ -266,12 +269,13 @@ public class Http2SolrClient extends SolrClient {httpClient.setMaxRequestsQueuedPerDestination(asyncTracker.getMaxRequestsQueuedPerDestination());httpClient.setUserAgentField(new HttpField(HttpHeader.USER_AGENT, AGENT));- httpClient.setIdleTimeout(idleTimeout);+ httpClient.setIdleTimeout(idleTimeoutMillis);this.authenticationStore = new AuthenticationStoreHolder();httpClient.setAuthenticationStore(this.authenticationStore);- if (builder.connectionTimeout != null) httpClient.setConnectTimeout(builder.connectionTimeout);+ if (builder.connectionTimeoutMillis != null)+ httpClient.setConnectTimeout(builder.connectionTimeoutMillis);try {httpClient.start();@@ -312,7 +316,7 @@ public class Http2SolrClient extends SolrClient {}public long getIdleTimeout() {- return idleTimeout;+ return idleTimeoutMillis;}public static class OutStream implements Closeable {@@ -491,7 +495,7 @@ public class Http2SolrClient extends SolrClient {try {InputStreamResponseListener listener = new InputStreamResponseListener();req.send(listener);- Response response = listener.get(idleTimeout, TimeUnit.MILLISECONDS);+ Response response = listener.get(idleTimeoutMillis, TimeUnit.MILLISECONDS);InputStream is = listener.getInputStream();assert ObjectReleaseTracker.track(is);return processErrorsAndResponse(solrRequest, parser, response, is);@@ -564,10 +568,10 @@ public class Http2SolrClient extends SolrClient {private void decorateRequest(Request req, SolrRequest<?> solrRequest) {req.header(HttpHeader.ACCEPT_ENCODING, null);- if (requestTimeout > 0) {- req.timeout(requestTimeout, TimeUnit.MILLISECONDS);+ if (requestTimeoutMillis > 0) {+ req.timeout(requestTimeoutMillis, TimeUnit.MILLISECONDS);} else {- req.timeout(idleTimeout, TimeUnit.MILLISECONDS);+ req.timeout(idleTimeoutMillis, TimeUnit.MILLISECONDS);}if (solrRequest.getUserPrincipal() != null) {req.attribute(REQ_PRINCIPAL_KEY, solrRequest.getUserPrincipal());@@ -980,9 +984,9 @@ public class Http2SolrClient extends SolrClient {private Http2SolrClient http2SolrClient;private SSLConfig sslConfig = defaultSSLConfig;- private Integer idleTimeout;- private Integer connectionTimeout;- private Integer requestTimeout;+ private Long idleTimeoutMillis;+ private Long connectionTimeoutMillis;+ private Long requestTimeoutMillis;private Integer maxConnectionsPerHost;private String basicAuthUser;private String basicAuthPassword;@@ -1115,16 +1119,16 @@ public class Http2SolrClient extends SolrClient {}/**- * @deprecated Please use {@link #withIdleTimeout(int)}+ * @deprecated Please use {@link #withIdleTimeout(long, TimeUnit)}*/@Deprecated(since = "9.2")public Builder idleTimeout(int idleConnectionTimeout) {- withIdleTimeout(idleConnectionTimeout);+ withIdleTimeout(idleConnectionTimeout, TimeUnit.MILLISECONDS);return this;}- public Builder withIdleTimeout(int idleConnectionTimeout) {- this.idleTimeout = idleConnectionTimeout;+ public Builder withIdleTimeout(long idleConnectionTimeout, TimeUnit unit) {+ this.idleTimeoutMillis = TimeUnit.MILLISECONDS.convert(idleConnectionTimeout, unit);return this;}@@ -1134,29 +1138,29 @@ public class Http2SolrClient extends SolrClient {}/**- * @deprecated Please use {@link #withConnectionTimeout(int)}+ * @deprecated Please use {@link #withConnectionTimeout(long, TimeUnit)}*/@Deprecated(since = "9.2")public Builder connectionTimeout(int connectionTimeout) {- withConnectionTimeout(connectionTimeout);+ withConnectionTimeout(connectionTimeout, TimeUnit.MILLISECONDS);return this;}- public Builder withConnectionTimeout(int connectionTimeout) {- this.connectionTimeout = connectionTimeout;+ public Builder withConnectionTimeout(long connectionTimeout, TimeUnit unit) {+ this.connectionTimeoutMillis = TimeUnit.MILLISECONDS.convert(connectionTimeout, unit);return this;}/*** Set a timeout in milliseconds for requests issued by this client.*- * @deprecated Please use {@link #withRequestTimeout(int)}+ * @deprecated Please use {@link #withRequestTimeout(long, TimeUnit)}* @param requestTimeout The timeout in milliseconds* @return this Builder.*/@Deprecated(since = "9.2")public Builder requestTimeout(int requestTimeout) {- this.requestTimeout = requestTimeout;+ withRequestTimeout(requestTimeout, TimeUnit.MILLISECONDS);return this;}@@ -1166,8 +1170,8 @@ public class Http2SolrClient extends SolrClient {* @param requestTimeout The timeout in milliseconds* @return this Builder.*/- public Builder withRequestTimeout(int requestTimeout) {- this.requestTimeout = requestTimeout;+ public Builder withRequestTimeout(long requestTimeout, TimeUnit unit) {+ this.requestTimeoutMillis = TimeUnit.MILLISECONDS.convert(requestTimeout, unit);return this;}}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.javaindex 15015b4fcce..328ab695a22 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@@ -185,8 +185,8 @@ public class HttpSolrClient extends BaseHttpSolrClient {this.parser = builder.responseParser;this.invariantParams = builder.invariantParams;- this.connectionTimeout = builder.connectionTimeoutMillis;- this.soTimeout = builder.socketTimeoutMillis;+ this.connectionTimeout = Math.toIntExact(builder.connectionTimeoutMillis);+ this.soTimeout = Math.toIntExact(builder.socketTimeoutMillis);this.useMultiPartPost = builder.useMultiPartPost;this.urlParamNames = builder.urlParamNames;}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 a98ed89d73b..c652dd9761b 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@@ -26,6 +26,7 @@ import java.util.Arrays;import java.util.HashSet;import java.util.List;import java.util.Set;+import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicReference;import org.apache.solr.client.solrj.ResponseParser;@@ -314,10 +315,10 @@ public class LBHttp2SolrClient extends LBSolrClient {public static class Builder {- public static final int CHECK_INTERVAL = 60 * 1000; // 1 minute between checksprivate final Http2SolrClient http2SolrClient;private final String[] baseSolrUrls;- private int aliveCheckInterval = CHECK_INTERVAL;+ private long aliveCheckIntervalMillis =+ TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS); // 1 minute between checkspublic Builder(Http2SolrClient http2Client, String... baseSolrUrls) {this.http2SolrClient = http2Client;@@ -328,21 +329,21 @@ public class LBHttp2SolrClient extends LBSolrClient {* LBHttpSolrServer keeps pinging the dead servers at fixed interval to find if it is alive. Use* this to set that interval*- * @param aliveCheckInterval time in milliseconds+ * @param aliveCheckInterval how often to ping for aliveness*/- public LBHttp2SolrClient.Builder setAliveCheckInterval(int aliveCheckInterval) {+ public LBHttp2SolrClient.Builder setAliveCheckInterval(int aliveCheckInterval, TimeUnit unit) {if (aliveCheckInterval <= 0) {throw new IllegalArgumentException("Alive check interval must be " + "positive, specified value = " + aliveCheckInterval);}- this.aliveCheckInterval = aliveCheckInterval;+ this.aliveCheckIntervalMillis = TimeUnit.MILLISECONDS.convert(aliveCheckInterval, unit);return this;}public LBHttp2SolrClient build() {LBHttp2SolrClient solrClient =new LBHttp2SolrClient(this.http2SolrClient, Arrays.asList(this.baseSolrUrls));- solrClient.aliveCheckInterval = this.aliveCheckInterval;+ solrClient.aliveCheckIntervalMillis = this.aliveCheckIntervalMillis;return solrClient;}}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 e89df0c1b93..a7553f3fc5d 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@@ -21,6 +21,7 @@ import java.util.HashSet;import java.util.List;import java.util.Set;import java.util.concurrent.ConcurrentHashMap;+import java.util.concurrent.TimeUnit;import org.apache.http.client.HttpClient;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.common.params.ModifiableSolrParams;@@ -80,8 +81,8 @@ public class LBHttpSolrClient extends LBSolrClient {private final HttpSolrClient.Builder httpSolrClientBuilder;private volatile Set<String> urlParamNames = new HashSet<>();- private Integer connectionTimeout;- private volatile Integer soTimeout;+ private Long connectionTimeoutMillis;+ private Long soTimeoutMillis;/** The provided httpClient should use a multi-threaded connection manager */protected LBHttpSolrClient(Builder builder) {@@ -92,10 +93,10 @@ public class LBHttpSolrClient extends LBSolrClient {builder.httpClient == null? constructClient(builder.baseSolrUrls.toArray(new String[builder.baseSolrUrls.size()])): builder.httpClient;- this.connectionTimeout = builder.connectionTimeoutMillis;- this.soTimeout = builder.socketTimeoutMillis;+ this.connectionTimeoutMillis = builder.connectionTimeoutMillis;+ this.soTimeoutMillis = builder.socketTimeoutMillis;this.parser = builder.responseParser;- this.aliveCheckInterval = builder.aliveCheckInterval;+ this.aliveCheckIntervalMillis = builder.aliveCheckInterval;for (String baseUrl : builder.baseSolrUrls) {urlToClient.put(baseUrl, makeSolrClient(baseUrl));}@@ -117,11 +118,12 @@ public class LBHttpSolrClient extends LBSolrClient {if (httpSolrClientBuilder != null) {synchronized (this) {httpSolrClientBuilder.withBaseSolrUrl(server).withHttpClient(httpClient);- if (connectionTimeout != null) {- httpSolrClientBuilder.withConnectionTimeout(connectionTimeout);+ if (connectionTimeoutMillis != null) {+ httpSolrClientBuilder.withConnectionTimeout(+ connectionTimeoutMillis, TimeUnit.MILLISECONDS);}- if (soTimeout != null) {- httpSolrClientBuilder.withSocketTimeout(soTimeout);+ if (soTimeoutMillis != null) {+ httpSolrClientBuilder.withSocketTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS);}if (requestWriter != null) {httpSolrClientBuilder.withRequestWriter(requestWriter);@@ -134,11 +136,11 @@ public class LBHttpSolrClient extends LBSolrClient {} else {final HttpSolrClient.Builder clientBuilder =new HttpSolrClient.Builder(server).withHttpClient(httpClient).withResponseParser(parser);- if (connectionTimeout != null) {- clientBuilder.withConnectionTimeout(connectionTimeout);+ if (connectionTimeoutMillis != null) {+ clientBuilder.withConnectionTimeout(connectionTimeoutMillis, TimeUnit.MILLISECONDS);}- if (soTimeout != null) {- clientBuilder.withSocketTimeout(soTimeout);+ if (soTimeoutMillis != null) {+ clientBuilder.withSocketTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS);}if (requestWriter != null) {clientBuilder.withRequestWriter(requestWriter);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 5e5f0c0e93a..d3db7429f44 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@@ -77,7 +77,8 @@ public abstract class LBSolrClient extends SolrClient {private volatile ScheduledExecutorService aliveCheckExecutor;- protected int aliveCheckInterval = LBHttpSolrClient.Builder.CHECK_INTERVAL;+ protected long aliveCheckIntervalMillis =+ TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS); // 1 minute between checksprivate final AtomicInteger counter = new AtomicInteger(-1);private static final SolrQuery solrQuery = new SolrQuery("*:*");@@ -442,16 +443,18 @@ public abstract class LBSolrClient extends SolrClient {* LBHttpSolrServer keeps pinging the dead servers at fixed interval to find if it is alive. Use* this to set that interval*- * @param aliveCheckInterval time in milliseconds+ * @param aliveCheckIntervalMillis time in milliseconds* @deprecated use {@link LBHttpSolrClient.Builder#setAliveCheckInterval(int)} instead*/@Deprecated- public void setAliveCheckInterval(int aliveCheckInterval) {- if (aliveCheckInterval <= 0) {+ public void setAliveCheckInterval(int aliveCheckIntervalMillis) {+ if (aliveCheckIntervalMillis <= 0) {throw new IllegalArgumentException(- "Alive check interval must be " + "positive, specified value = " + aliveCheckInterval);+ "Alive check interval must be "+ + "positive, specified value = "+ + aliveCheckIntervalMillis);}- this.aliveCheckInterval = aliveCheckInterval;+ this.aliveCheckIntervalMillis = aliveCheckIntervalMillis;}private void startAliveCheckExecutor() {@@ -465,8 +468,8 @@ public abstract class LBSolrClient extends SolrClient {new SolrNamedThreadFactory("aliveCheckExecutor"));aliveCheckExecutor.scheduleAtFixedRate(getAliveCheckRunner(new WeakReference<>(this)),- this.aliveCheckInterval,- this.aliveCheckInterval,+ this.aliveCheckIntervalMillis,+ this.aliveCheckIntervalMillis,TimeUnit.MILLISECONDS);}}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.javaindex 1fed0ca3bcd..d6e31e5ef97 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java@@ -17,6 +17,7 @@package org.apache.solr.client.solrj.impl;import java.util.Set;+import java.util.concurrent.TimeUnit;import org.apache.http.client.HttpClient;import org.apache.solr.client.solrj.ResponseParser;import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder;@@ -33,8 +34,8 @@ public abstract class SolrClientBuilder<B extends SolrClientBuilder<B>> {protected ResponseParser responseParser;protected RequestWriter requestWriter;protected boolean useMultiPartPost;- protected Integer connectionTimeoutMillis = 15000;- protected Integer socketTimeoutMillis = 120000;+ protected Long connectionTimeoutMillis = TimeUnit.MILLISECONDS.convert(15, TimeUnit.SECONDS);+ protected Long socketTimeoutMillis = TimeUnit.MILLISECONDS.convert(120, TimeUnit.SECONDS);protected boolean followRedirects = false;protected Set<String> urlParamNames;@@ -86,13 +87,27 @@ public abstract class SolrClientBuilder<B extends SolrClientBuilder<B>> {* Solr servers.** <p>For valid values see {@link org.apache.http.client.config.RequestConfig#getConnectTimeout()}+ *+ * @deprecated Please use {@link #withConnectionTimeout(long, TimeUnit)}*/+ @Deprecated(since = "9.2")public B withConnectionTimeout(int connectionTimeoutMillis) {- if (connectionTimeoutMillis < 0) {- throw new IllegalArgumentException("connectionTimeoutMillis must be a non-negative integer.");+ withConnectionTimeout(connectionTimeoutMillis, TimeUnit.MILLISECONDS);+ return getThis();+ }++ /**+ * Tells {@link Builder} that created clients should obey the following timeout when connecting to+ * Solr servers.+ *+ * <p>For valid values see {@link org.apache.http.client.config.RequestConfig#getConnectTimeout()}+ */+ public B withConnectionTimeout(long connectionTimeout, TimeUnit unit) {+ if (connectionTimeout < 0) {+ throw new IllegalArgumentException("connectionTimeout must be a non-negative integer.");}- this.connectionTimeoutMillis = connectionTimeoutMillis;+ this.connectionTimeoutMillis = TimeUnit.MILLISECONDS.convert(connectionTimeout, unit);return getThis();}@@ -101,13 +116,27 @@ public abstract class SolrClientBuilder<B extends SolrClientBuilder<B>> {* sockets.** <p>For valid values see {@link org.apache.http.client.config.RequestConfig#getSocketTimeout()}+ *+ * <p>* @deprecated Please use {@link #withSocketTimeout(long, TimeUnit)}*/+ @Deprecated(since = "9.2")public B withSocketTimeout(int socketTimeoutMillis) {- if (socketTimeoutMillis < 0) {- throw new IllegalArgumentException("socketTimeoutMillis must be a non-negative integer.");+ withSocketTimeout(socketTimeoutMillis, TimeUnit.MILLISECONDS);+ return getThis();+ }++ /**+ * Tells {@link Builder} that created clients should set the following read timeout on all+ * sockets.+ *+ * <p>For valid values see {@link org.apache.http.client.config.RequestConfig#getSocketTimeout()}+ */+ public B withSocketTimeout(long socketTimeout, TimeUnit unit) {+ if (socketTimeout < 0) {+ throw new IllegalArgumentException("socketTimeout must be a non-negative integer.");}- this.socketTimeoutMillis = socketTimeoutMillis;+ this.socketTimeoutMillis = TimeUnit.MILLISECONDS.convert(socketTimeout, unit);return getThis();}}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.javaindex e482a9f43cc..ceae9494376 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryHttp2Test.java@@ -17,6 +17,7 @@package org.apache.solr.client.solrj;+import java.util.concurrent.TimeUnit;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.client.solrj.impl.BinaryRequestWriter;import org.apache.solr.client.solrj.impl.BinaryResponseParser;@@ -38,7 +39,7 @@ public class SolrExampleBinaryHttp2Test extends SolrExampleTests {@Overridepublic SolrClient createNewSolrClient() {return new Http2SolrClient.Builder(getServerUrl())- .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT)+ .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS).withRequestWriter(new BinaryRequestWriter())// where the magic happens.withResponseParser(new BinaryResponseParser())diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.javaindex cb4d88237d4..15c04a798e2 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java@@ -79,7 +79,10 @@ public class TestLBHttp2SolrClient extends SolrTestCaseJ4 {public void setUp() throws Exception {super.setUp();httpClient =- new Http2SolrClient.Builder().withConnectionTimeout(1000).withIdleTimeout(2000).build();+ new Http2SolrClient.Builder()+ .withConnectionTimeout(1000, TimeUnit.MILLISECONDS)+ .withIdleTimeout(2000, TimeUnit.MILLISECONDS)+ .build();for (int i = 0; i < solr.length; i++) {solr[i] =@@ -124,7 +127,9 @@ public class TestLBHttp2SolrClient extends SolrTestCaseJ4 {solrUrls[i] = solr[i].getUrl();}try (LBHttp2SolrClient client =- new LBHttp2SolrClient.Builder(httpClient, solrUrls).setAliveCheckInterval(500).build()) {+ new LBHttp2SolrClient.Builder(httpClient, solrUrls)+ .setAliveCheckInterval(500, TimeUnit.MILLISECONDS)+ .build()) {SolrQuery solrQuery = new SolrQuery("*:*");Set<String> names = new HashSet<>();QueryResponse resp = null;@@ -171,7 +176,9 @@ public class TestLBHttp2SolrClient extends SolrTestCaseJ4 {solrUrls[i] = solr[i].getUrl();}try (LBHttp2SolrClient client =- new LBHttp2SolrClient.Builder(httpClient, solrUrls).setAliveCheckInterval(500).build()) {+ new LBHttp2SolrClient.Builder(httpClient, solrUrls)+ .setAliveCheckInterval(500, TimeUnit.MILLISECONDS)+ .build()) {SolrQuery solrQuery = new SolrQuery("*:*");QueryResponse resp = null;solr[0].jetty.stop();@@ -205,7 +212,9 @@ public class TestLBHttp2SolrClient extends SolrTestCaseJ4 {}try (LBHttp2SolrClient client =- new LBHttp2SolrClient.Builder(httpClient, solrUrls).setAliveCheckInterval(500).build()) {+ new LBHttp2SolrClient.Builder(httpClient, solrUrls)+ .setAliveCheckInterval(500, TimeUnit.MILLISECONDS)+ .build()) {// Kill a server and test againsolr[1].jetty.stop();diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.javaindex ddd20f4a270..d495b6b0a0b 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleXMLHttp2Test.java@@ -17,6 +17,7 @@package org.apache.solr.client.solrj.embedded;+import java.util.concurrent.TimeUnit;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrExampleTests;import org.apache.solr.client.solrj.impl.Http2SolrClient;@@ -39,7 +40,7 @@ public class SolrExampleXMLHttp2Test extends SolrExampleTests {Http2SolrClient client =new Http2SolrClient.Builder(getServerUrl())- .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT)+ .withConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS).withRequestWriter(new RequestWriter()).withResponseParser(new XMLResponseParser()).build();diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.javaindex ac26bd9fce4..b786ba7ed70 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java@@ -67,7 +67,7 @@ public class ConcurrentUpdateHttp2SolrClientTest extends SolrJettyTestBase {serverUrl, http2Client, successCounter, errorCounter, errors).withQueueSize(cussQueueSize).withThreadCount(cussThreadCount)- .setPollQueueTime(0)+ .setPollQueueTime(0, TimeUnit.MILLISECONDS).build()) {// ensure it doesn't block where there's nothing to do yet@@ -172,7 +172,7 @@ public class ConcurrentUpdateHttp2SolrClientTest extends SolrJettyTestBase {new ConcurrentUpdateHttp2SolrClient.Builder(jetty.getBaseUrl().toString(), http2Client).withQueueSize(cussQueueSize).withThreadCount(cussThreadCount)- .setPollQueueTime(0)+ .setPollQueueTime(0, TimeUnit.MILLISECONDS).build()) {// ensure it doesn't block where there's nothing to do yetdiff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.javaindex 06a2931962b..99eabbd9785 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java@@ -30,6 +30,7 @@ import java.util.List;import java.util.Locale;import java.util.Map;import java.util.Set;+import java.util.concurrent.TimeUnit;import javax.servlet.ServletException;import javax.servlet.http.HttpServlet;import javax.servlet.http.HttpServletRequest;@@ -189,10 +190,10 @@ public class Http2SolrClientTest extends SolrJettyTestBase {}private Http2SolrClient.Builder getHttp2SolrClientBuilder(- String url, int connectionTimeOut, int socketTimeout) {+ String url, int connectionTimeout, int socketTimeout) {return new Http2SolrClient.Builder(url)- .withConnectionTimeout(connectionTimeOut)- .withIdleTimeout(socketTimeout);+ .withConnectionTimeout(connectionTimeout, TimeUnit.MILLISECONDS)+ .withIdleTimeout(socketTimeout, TimeUnit.MILLISECONDS);}@Test@@ -229,7 +230,7 @@ public class Http2SolrClientTest extends SolrJettyTestBase {try (Http2SolrClient client =getHttp2SolrClientBuilder(jetty.getBaseUrl().toString() + "/slow/foo", DEFAULT_CONNECTION_TIMEOUT, 0)- .withRequestTimeout(500)+ .withRequestTimeout(500, TimeUnit.MILLISECONDS).build()) {client.query(q, SolrRequest.METHOD.GET);fail("No exception thrown.");