[NO ISSUE][OTH] Allow Binding HTTP Server to Specific Address
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Allow binding HTTP server to specific network address
rather than always defaulting it to all network interfaces.
Change-Id: Ie4b6c66502aacf8e0564cc3c6e2fd20c4efac385
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3260
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <tillw@apache.org>
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
index 1a5c2fa..94a6440 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
@@ -18,6 +18,7 @@
*/
package org.apache.hyracks.http.server;
+import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -28,9 +29,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import io.netty.util.internal.logging.InternalLoggerFactory;
-import io.netty.util.internal.logging.Log4J2LoggerFactory;
-import io.netty.util.internal.logging.Log4JLoggerFactory;
import org.apache.hyracks.http.api.IChannelClosedHandler;
import org.apache.hyracks.http.api.IServlet;
import org.apache.hyracks.util.MXHelper;
@@ -77,7 +75,7 @@
private final List<IServlet> servlets;
private final EventLoopGroup bossGroup;
private final EventLoopGroup workerGroup;
- private final int port;
+ private final InetSocketAddress address;
private final ThreadPoolExecutor executor;
// Mutable members
private volatile int state = STOPPED;
@@ -91,14 +89,19 @@
}
public HttpServer(EventLoopGroup bossGroup, EventLoopGroup workerGroup, int port, HttpServerConfig config) {
- this(bossGroup, workerGroup, port, config, null);
+ this(bossGroup, workerGroup, new InetSocketAddress(port), config, null);
}
- public HttpServer(EventLoopGroup bossGroup, EventLoopGroup workerGroup, int port, HttpServerConfig config,
- IChannelClosedHandler closeHandler) {
+ public HttpServer(EventLoopGroup bossGroup, EventLoopGroup workerGroup, InetSocketAddress address,
+ HttpServerConfig config) {
+ this(bossGroup, workerGroup, address, config, null);
+ }
+
+ public HttpServer(EventLoopGroup bossGroup, EventLoopGroup workerGroup, InetSocketAddress address,
+ HttpServerConfig config, IChannelClosedHandler closeHandler) {
this.bossGroup = bossGroup;
this.workerGroup = workerGroup;
- this.port = port;
+ this.address = address;
this.closedHandler = closeHandler;
this.config = config;
ctx = new ConcurrentHashMap<>();
@@ -106,7 +109,8 @@
workQueue = new LinkedBlockingQueue<>(config.getRequestQueueSize());
int numExecutorThreads = config.getThreadCount();
executor = new ThreadPoolExecutor(numExecutorThreads, numExecutorThreads, 0L, TimeUnit.MILLISECONDS, workQueue,
- runnable -> new Thread(runnable, "HttpExecutor(port:" + port + ")-" + threadId.getAndIncrement()));
+ runnable -> new Thread(runnable,
+ "HttpExecutor(port:" + address.getPort() + ")-" + threadId.getAndIncrement()));
long directMemoryBudget = numExecutorThreads * (long) HIGH_WRITE_BUFFER_WATER_MARK
+ numExecutorThreads * config.getMaxResponseChunkSize();
LOGGER.log(Level.DEBUG,
@@ -130,7 +134,7 @@
doStart();
setStarted();
} catch (Throwable e) { // NOSONAR
- LOGGER.log(Level.ERROR, "Failure starting an Http Server with port: " + port, e);
+ LOGGER.error("Failure starting an Http Server at: {}", address, e);
setFailed(e);
throw e;
}
@@ -246,7 +250,7 @@
.childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT)
.childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, WRITE_BUFFER_WATER_MARK)
.handler(new LoggingHandler(LogLevel.DEBUG)).childHandler(getChannelInitializer());
- Channel newChannel = b.bind(port).sync().channel();
+ Channel newChannel = b.bind(address).sync().channel();
newChannel.closeFuture().addListener(f -> {
// This listener is invoked from within a netty IO thread. Hence, we can never block it
// For simplicity, we will submit the recovery task to a different thread
@@ -406,7 +410,7 @@
@Override
public String toString() {
- return "{\"class\":\"" + getClass().getSimpleName() + "\",\"port\":" + port + ",\"state\":\"" + getState()
+ return "{\"class\":\"" + getClass().getSimpleName() + "\",\"address\":" + address + ",\"state\":\"" + getState()
+ "\"}";
}
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/PipelinedRequestsTest.java b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/PipelinedRequestsTest.java
index c0117f1..be18914 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/PipelinedRequestsTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/PipelinedRequestsTest.java
@@ -19,6 +19,7 @@
package org.apache.hyracks.http;
import java.io.IOException;
+import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -83,8 +84,8 @@
final WebManager webMgr = new WebManager();
final HttpServerConfig config =
HttpServerConfigBuilder.custom().setThreadCount(16).setRequestQueueSize(16).build();
- final HttpServer server =
- new HttpServer(webMgr.getBosses(), webMgr.getWorkers(), PORT, config, InterruptOnCloseHandler.INSTANCE);
+ final HttpServer server = new HttpServer(webMgr.getBosses(), webMgr.getWorkers(), new InetSocketAddress(PORT),
+ config, InterruptOnCloseHandler.INSTANCE);
final SleepyServlet servlet = new SleepyServlet(server.ctx(), new String[] { PATH });
server.addServlet(servlet);
webMgr.add(server);
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/test/http/HttpServerTest.java b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/test/http/HttpServerTest.java
index e341e2f..84c8c65 100644
--- a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/test/http/HttpServerTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/test/http/HttpServerTest.java
@@ -23,6 +23,7 @@
import java.io.PrintWriter;
import java.lang.reflect.Field;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.URI;
import java.net.URISyntaxException;
@@ -319,8 +320,8 @@
int queueSize = 1;
final HttpServerConfig config =
HttpServerConfigBuilder.custom().setThreadCount(numExecutors).setRequestQueueSize(queueSize).build();
- HttpServer server =
- new HttpServer(webMgr.getBosses(), webMgr.getWorkers(), PORT, config, InterruptOnCloseHandler.INSTANCE);
+ HttpServer server = new HttpServer(webMgr.getBosses(), webMgr.getWorkers(), new InetSocketAddress(PORT), config,
+ InterruptOnCloseHandler.INSTANCE);
SleepyServlet servlet = new SleepyServlet(server.ctx(), new String[] { PATH });
server.addServlet(servlet);
webMgr.add(server);