Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] CommonHttpsClient Builder - set timeout correctly #362

Merged
merged 3 commits into from
Oct 18, 2024
Merged

[Fix] CommonHttpsClient Builder - set timeout correctly #362

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3755e57
[FIX] CommonHttpsClient Builder - set timeout correctly
satviksr-db Oct 17, 2024
f2cf574
Merge branch 'main' into fix_timeout
hectorcast-db Oct 18, 2024
8accdf3
Merge branch 'main' into fix_timeout
hectorcast-db Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions databricks-sdk-java/src/main/java/com/databricks/sdk/core/commons/CommonsHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,8 @@ public CommonsHttpClient build() {

private static final Logger LOG = LoggerFactory.getLogger(CommonsHttpClient.class);
private final CloseableHttpClient hc;
private int timeout;

private CommonsHttpClient(Builder builder) {
HttpClientBuilder httpClientBuilder =
HttpClientBuilder.create().setDefaultRequestConfig(makeRequestConfig());
int timeoutSeconds = 300;
if (builder.databricksConfig != null
&& builder.databricksConfig.getHttpTimeoutSeconds() != null) {
Expand All @@ -117,7 +114,9 @@ private CommonsHttpClient(Builder builder) {
if (builder.timeoutSeconds != null) {
timeoutSeconds = builder.timeoutSeconds;
}
timeout = timeoutSeconds * 1000;
int timeout = timeoutSeconds * 1000;
HttpClientBuilder httpClientBuilder =
HttpClientBuilder.create().setDefaultRequestConfig(makeRequestConfig(timeout));
if (builder.proxyConfig != null) {
ProxyUtils.setupProxy(builder.proxyConfig, httpClientBuilder);
}
Expand All @@ -135,7 +134,7 @@ private CommonsHttpClient(Builder builder) {
hc = httpClientBuilder.build();
}

private RequestConfig makeRequestConfig() {
private RequestConfig makeRequestConfig(int timeout) {
return RequestConfig.custom()
.setConnectionRequestTimeout(timeout)
.setConnectTimeout(timeout)
Expand Down
Loading