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

[Improve][admin|client] AsyncHttpConnector doesn't use the system properties configured #15307

Merged
merged 1 commit into from
Apr 30, 2022
+5 −0
Merged

[Improve][admin|client] AsyncHttpConnector doesn't use the system properties configured #15307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java
View file
Original file line number Diff line number Diff line change
@@ -885,6 +885,7 @@ public void onThrowable(Throwable t) {

private AsyncHttpClient getHttpClient(String version) {
DefaultAsyncHttpClientConfig.Builder confBuilder = new DefaultAsyncHttpClientConfig.Builder();
confBuilder.setUseProxyProperties(true);
confBuilder.setFollowRedirect(true);
confBuilder.setUserAgent(version);
confBuilder.setKeepAliveStrategy(new DefaultKeepAliveStrategy() {
1 change: 1 addition & 0 deletions ...-admin/src/main/java/org/apache/pulsar/client/admin/internal/http/AsyncHttpConnector.java
View file
Original file line number Diff line number Diff line change
@@ -96,6 +96,7 @@ public AsyncHttpConnector(int connectTimeoutMs, int readTimeoutMs,
int requestTimeoutMs,
int autoCertRefreshTimeSeconds, ClientConfigurationData conf) {
DefaultAsyncHttpClientConfig.Builder confBuilder = new DefaultAsyncHttpClientConfig.Builder();
confBuilder.setUseProxyProperties(true);
confBuilder.setFollowRedirect(true);
confBuilder.setRequestTimeout(conf.getRequestTimeoutMs());
confBuilder.setConnectTimeout(connectTimeoutMs);
1 change: 1 addition & 0 deletions pulsar-client/src/main/java/org/apache/pulsar/client/impl/ControlledClusterFailover.java
View file
Original file line number Diff line number Diff line change
@@ -87,6 +87,7 @@ private ControlledClusterFailover(ControlledClusterFailoverBuilderImpl builder)

private AsyncHttpClient buildHttpClient() {
DefaultAsyncHttpClientConfig.Builder confBuilder = new DefaultAsyncHttpClientConfig.Builder();
confBuilder.setUseProxyProperties(true);
confBuilder.setFollowRedirect(true);
confBuilder.setMaxRedirects(DEFAULT_MAX_REDIRECTS);
confBuilder.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT_IN_SECONDS * 1000);
1 change: 1 addition & 0 deletions pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpClient.java
View file
Original file line number Diff line number Diff line change
@@ -72,6 +72,7 @@ protected HttpClient(ClientConfigurationData conf, EventLoopGroup eventLoopGroup
this.serviceNameResolver.updateServiceUrl(conf.getServiceUrl());

DefaultAsyncHttpClientConfig.Builder confBuilder = new DefaultAsyncHttpClientConfig.Builder();
confBuilder.setUseProxyProperties(true);
confBuilder.setFollowRedirect(true);
confBuilder.setMaxRedirects(conf.getMaxLookupRedirects());
confBuilder.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT_IN_SECONDS * 1000);
1 change: 1 addition & 0 deletions ...-client/src/main/java/org/apache/pulsar/client/impl/auth/oauth2/protocol/TokenClient.java
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@ public TokenClient(URL tokenUrl) {
TokenClient(URL tokenUrl, AsyncHttpClient httpClient) {
if (httpClient == null) {
DefaultAsyncHttpClientConfig.Builder confBuilder = new DefaultAsyncHttpClientConfig.Builder();
confBuilder.setUseProxyProperties(true);
confBuilder.setFollowRedirect(true);
confBuilder.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT_IN_SECONDS * 1000);
confBuilder.setReadTimeout(DEFAULT_READ_TIMEOUT_IN_SECONDS * 1000);