Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-11425: SolrClientBuilder does not allow infinite timeout (value 0).

This commit is contained in:
markrmiller 2017-10-02 22:55:37 -05:00
parent a9fb4ddf80
commit fc429399ec
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solr/CHANGES.txt
View File

@ -156,6 +156,7 @@ Bug Fixes
* SOLR-11278: Fix a race condition in the CDCR bootstrap process which could lead to bootstraps cancelling itself
(Amrit Sarkar, shalin, Varun Thacker)
* SOLR-11425: SolrClientBuilder does not allow infinite timeout (value 0). (Peter Szantai-Kis via Mark Miller)
Optimizations
----------------------

14
solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientBuilder.java
View File

@ -48,10 +48,13 @@ public abstract class SolrClientBuilder<B extends SolrClientBuilder<B>> {
/**
* 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()}
* </p>
*/
public B withConnectionTimeout(int connectionTimeoutMillis) {
if (connectionTimeoutMillis <= 0) {
throw new IllegalArgumentException("connectionTimeoutMillis must be a positive integer.");
if (connectionTimeoutMillis < 0) {
throw new IllegalArgumentException("connectionTimeoutMillis must be a non-negative integer.");
}
this.connectionTimeoutMillis = connectionTimeoutMillis;
@ -60,10 +63,13 @@ public abstract class SolrClientBuilder<B extends SolrClientBuilder<B>> {
/**
* 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()}
* </p>
*/
public B withSocketTimeout(int socketTimeoutMillis) {
if (socketTimeoutMillis <= 0) {
throw new IllegalArgumentException("socketTimeoutMillis must be a positive integer.");
if (socketTimeoutMillis < 0) {
throw new IllegalArgumentException("socketTimeoutMillis must be a non-negative integer.");
}
this.socketTimeoutMillis = socketTimeoutMillis;

11
solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientBuilderTest.java
View File

@ -97,4 +97,15 @@ public class CloudSolrClientBuilderTest extends LuceneTestCase {
assertFalse(createdClient.isDirectUpdatesToLeadersOnly());
}
}
@Test
public void test0Timeouts() throws IOException {
try(CloudSolrClient createdClient = new Builder()
.withZkHost(ANY_ZK_HOST)
.withZkChroot(ANY_CHROOT)
.withSocketTimeout(0)
.withConnectionTimeout(0)
.build()) {
}
}
}