This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.8 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit cff86ff2565df5187701aa4cfe750ce7ecb24479 Author: Ming <[email protected]> AuthorDate: Wed Oct 6 06:31:55 2021 -0400 [Issue-11966][pulsar-proxy] set default http proxy request timeout (#11971) (cherry picked from commit 8b55636cc3df8c4cb1d2dd3896bc2bab79c267cc) --- .../java/org/apache/pulsar/proxy/server/AdminProxyHandler.java | 2 ++ .../java/org/apache/pulsar/proxy/server/ProxyConfiguration.java | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/AdminProxyHandler.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/AdminProxyHandler.java index 28a3140..301c571 100644 --- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/AdminProxyHandler.java +++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/AdminProxyHandler.java @@ -95,6 +95,8 @@ class AdminProxyHandler extends ProxyServlet { : config.getBrokerWebServiceURL(); this.functionWorkerWebServiceUrl = config.isTlsEnabledWithBroker() ? config.getFunctionWorkerWebServiceURLTLS() : config.getFunctionWorkerWebServiceURL(); + + super.setTimeout(config.getHttpProxyTimeout()); } @Override diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java index 1722632..139b891 100644 --- a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java +++ b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConfiguration.java @@ -481,6 +481,14 @@ public class ProxyConfiguration implements PulsarConfiguration { private int httpOutputBufferSize = 32*1024; @FieldContext( + minValue = 1, + category = CATEGORY_HTTP, + doc = "Http proxy timeout.\n\n" + + "The timeout value for HTTP proxy is in millisecond." + ) + private int httpProxyTimeout = 30 * 1000; + + @FieldContext( minValue = 1, category = CATEGORY_HTTP, doc = "Number of threads to use for HTTP requests processing"
