Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-16 17:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change mapping of connectionRequestTimeout to ConnPool leaseTimeout.

Browse Source 
Original Pull Request: #1925
Closes: #1926

(cherry picked from commit 3b8f0c9d567d4c91ae937e6b87752d81cda4c0a7)
(cherry picked from commit 92806d2e1194bc470244deae8271b0e74ca3288b)
This commit is contained in:
Nic Hines 2021-09-10 07:10:45 +01:00 committed by Peter-Josef Meisch
parent aca34eefeb
commit ea4cc07146
No known key found for this signature in database
GPG Key ID: DE108246970C7708
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/data/elasticsearch/client/RestClients.java
View File

@ -54,6 +54,7 @@ import org.springframework.util.Assert;
* @author Huw Ayling-Miller * @author Huw Ayling-Miller
* @author Henrique Amaral * @author Henrique Amaral
* @author Peter-Josef Meisch * @author Peter-Josef Meisch
* @author Nic Hines
* @since 3.2 * @since 3.2
*/ */
public final class RestClients { public final class RestClients {
@ -104,15 +105,14 @@ public final class RestClients {
Duration connectTimeout = clientConfiguration.getConnectTimeout(); Duration connectTimeout = clientConfiguration.getConnectTimeout();
if (!connectTimeout.isNegative()) { if (!connectTimeout.isNegative()) {
requestConfigBuilder.setConnectTimeout(Math.toIntExact(connectTimeout.toMillis())); requestConfigBuilder.setConnectTimeout(Math.toIntExact(connectTimeout.toMillis()));
requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(connectTimeout.toMillis()));
} }
Duration timeout = clientConfiguration.getSocketTimeout(); Duration timeout = clientConfiguration.getSocketTimeout();
if (!timeout.isNegative()) { if (!timeout.isNegative()) {
requestConfigBuilder.setSocketTimeout(Math.toIntExact(timeout.toMillis())); requestConfigBuilder.setSocketTimeout(Math.toIntExact(timeout.toMillis()));
requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(connectTimeout.toMillis()));
} }
clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build()); clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());