[pulsar] branch master updated: [Issue-11966][pulsar-proxy] set default http proxy request timeout (#11971)

[eolivelli]

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 8b55636  [Issue-11966][pulsar-proxy] set default http proxy request 
timeout (#11971)
8b55636 is described below

commit 8b55636cc3df8c4cb1d2dd3896bc2bab79c267cc
Author: Ming <itestmyc...@gmail.com>
AuthorDate: Wed Oct 6 06:31:55 2021 -0400

    [Issue-11966][pulsar-proxy] set default http proxy request timeout (#11971)
---
 .../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 2de7de9..13f9372 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 a81da5a..492e1d1 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
@@ -491,6 +491,14 @@ public class ProxyConfiguration implements 
PulsarConfiguration {
     private int httpInputMaxReplayBufferSize = 5 * 1024 * 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"