allow httpServer idle connection timeout configuration

P4Awd · P4Awd · commit a81ab9b50ed4 · 2017-02-16T13:52:12.000-05:00
diff --git a/sfs-server/src/main/java/org/sfs/SfsSingletonServer.java b/sfs-server/src/main/java/org/sfs/SfsSingletonServer.java
@@ -137,7 +137,9 @@ public class SfsSingletonServer extends Server implements Shareable {
     private Set<HostAndPort> parsedPublishAddresses = new LinkedHashSet<>();
     private Set<HostAndPort> clusterHosts = new LinkedHashSet<>();
     private List<HttpServer> httpServers = new ArrayList<>();
-    private int verticleMaxHeaderSize;
+    private int httpServerMaxHeaderSize;
+    private int httpServerIdleConnectionTimeout;
+    private int remoteNodeIdleConnectionTimeout;
     private boolean started = false;
     private Throwable startException = null;
     private int remoteNodeMaxPoolSize;
@@ -217,12 +219,18 @@ public void start(final Future<Void> startedResult) {
 
         nodes = new Nodes();
 
-        verticleMaxHeaderSize = new Integer(ConfigHelper.getFieldOrEnv(config, "http.maxheadersize", "8192"));
-        Preconditions.checkArgument(verticleMaxHeaderSize > 0, "http.maxheadersize must be greater than 0");
+        httpServerMaxHeaderSize = new Integer(ConfigHelper.getFieldOrEnv(config, "http.maxheadersize", "8192"));
+        Preconditions.checkArgument(httpServerMaxHeaderSize > 0, "http.maxheadersize must be greater than 0");
+
+        httpServerIdleConnectionTimeout = new Integer(ConfigHelper.getFieldOrEnv(config, "http.idleconnectiontimeout", String.valueOf(TimeUnit.MINUTES.toMillis(20))));
+        Preconditions.checkArgument(httpServerIdleConnectionTimeout > 0, "http.idleconnectiontimeout must be greater than 0");
 
         int nodeStatsRefreshInterval = new Integer(ConfigHelper.getFieldOrEnv(config, "node_stats_refresh_interval", String.valueOf(TimeUnit.SECONDS.toMillis(1))));
         Preconditions.checkArgument(nodeStatsRefreshInterval > 0, "node_stats_refresh_interval must be greater than 0");
 
+        remoteNodeIdleConnectionTimeout = new Integer(ConfigHelper.getFieldOrEnv(config, "remotenode.idleconnectiontimeout", "30"));
+        Preconditions.checkArgument(remoteNodeIdleConnectionTimeout > 0, "remotenode.idleconnectiontimeout must be greater than 0");
+
         remoteNodeMaxPoolSize = new Integer(ConfigHelper.getFieldOrEnv(config, "remotenode.maxpoolsize", "25"));
         Preconditions.checkArgument(remoteNodeMaxPoolSize > 0, "remotenode.maxpoolsize must be greater than 0");
 
@@ -582,7 +590,7 @@ public Observable<List<HttpServer>> initHttpListeners(VertxContext<Server> vertx
             if (!listeningHostAddresses.contains(hostAndPort)) {
                 if (createHttpServer) {
                     LOGGER.info("Creating http listener on " + hostAndPort);
-                    return createHttpServer(vertxContext, hostAndPort, verticleMaxHeaderSize, createRouter(vertxContext))
+                    return createHttpServer(vertxContext, hostAndPort, createRouter(vertxContext))
                             .onErrorResumeNext(throwable -> {
                                 LOGGER.warn("Failed to start listener " + hostAndPort.toString(), throwable);
                                 return Defer.just(null);
@@ -605,15 +613,15 @@ public Observable<List<HttpServer>> initHttpListeners(VertxContext<Server> vertx
                 .map(_continue -> httpServers);
     }
 
-    protected Observable<HttpServer> createHttpServer(VertxContext<Server> vertxContext, HostAndPort hostAndPort, int verticleMaxHeaderSize, Router router) {
+    protected Observable<HttpServer> createHttpServer(VertxContext<Server> vertxContext, HostAndPort hostAndPort, Router router) {
         ObservableFuture<HttpServer> handler = RxHelper.observableFuture();
         HttpServerOptions httpServerOptions = new HttpServerOptions()
-                .setMaxHeaderSize(verticleMaxHeaderSize)
+                .setMaxHeaderSize(httpServerMaxHeaderSize)
                 .setCompressionSupported(false)
                 .setUsePooledBuffers(true)
                 .setAcceptBacklog(10000)
                 .setReuseAddress(true)
-                .setIdleTimeout(30)
+                .setIdleTimeout(httpServerIdleConnectionTimeout)
                 .setHandle100ContinueAutomatically(true);
         vertxContext.vertx().createHttpServer(httpServerOptions)
                 .requestHandler(router::accept)
@@ -630,7 +638,7 @@ protected HttpClient createHttpClient(Vertx v, boolean https) {
                 .setPipelining(false)
                 .setMaxWaitQueueSize(200)
                 .setReuseAddress(true)
-                .setIdleTimeout(30)
+                .setIdleTimeout(remoteNodeIdleConnectionTimeout)
                 .setSsl(https);
 
         return v.createHttpClient(httpClientOptions);
