Remove wiring for pre-bound channels in Jetty integration

4 files changed, 7 insertions, 98 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
index 3b4475dd11a..959735c4314 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
@@ -40,9 +40,9 @@ public class ConnectorFactory {
         return connectorConfig;
     }
 
-    public ServerConnector createConnector(final Metric metric, final Server server, final ServerSocketChannel ch) {
+    public ServerConnector createConnector(final Metric metric, final Server server) {
         ServerConnector connector = new JDiscServerConnector(
-                connectorConfig, metric, server, ch, createConnectionFactories(metric).toArray(ConnectionFactory[]::new));
+                connectorConfig, metric, server, createConnectionFactories(metric).toArray(ConnectionFactory[]::new));
         connector.setPort(connectorConfig.listenPort());
         connector.setName(connectorConfig.name());
         connector.setAcceptQueueSize(connectorConfig.acceptQueueSize());
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java
index 5fa43a15912..51bcb892591 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscServerConnector.java
@@ -10,39 +10,30 @@ import org.eclipse.jetty.server.ServerConnector;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.lang.reflect.Field;
 import java.net.Socket;
 import java.net.SocketException;
-import java.nio.channels.ServerSocketChannel;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * @author bjorncs
  */
 class JDiscServerConnector extends ServerConnector {
     public static final String REQUEST_ATTRIBUTE = JDiscServerConnector.class.getName();
-    private final static Logger log = Logger.getLogger(JDiscServerConnector.class.getName());
     private final Metric.Context metricCtx;
     private final Map<RequestDimensions, Metric.Context> requestMetricContextCache = new ConcurrentHashMap<>();
     private final ServerConnectionStatistics statistics;
     private final ConnectorConfig config;
     private final boolean tcpKeepAlive;
     private final boolean tcpNoDelay;
-    private final ServerSocketChannel channelOpenedByActivator;
     private final Metric metric;
     private final String connectorName;
     private final int listenPort;
 
-    JDiscServerConnector(ConnectorConfig config, Metric metric, Server server,
-                         ServerSocketChannel channelOpenedByActivator, ConnectionFactory... factories) {
+    JDiscServerConnector(ConnectorConfig config, Metric metric, Server server, ConnectionFactory... factories) {
         super(server, factories);
-        this.channelOpenedByActivator = channelOpenedByActivator;
         this.config = config;
         this.tcpKeepAlive = config.tcpKeepAliveEnabled();
         this.tcpNoDelay = config.tcpNoDelay();
@@ -69,54 +60,6 @@ class JDiscServerConnector extends ServerConnector {
         }
     }
 
-    @Override
-    public void open() throws IOException {
-        if (channelOpenedByActivator == null) {
-            log.log(Level.INFO, "No channel set by activator, opening channel ourselves.");
-            try {
-                super.open();
-            } catch (RuntimeException e) {
-                log.log(Level.SEVERE, "failed org.eclipse.jetty.server.Server open() with port " + getPort());
-                throw e;
-            }
-            return;
-        }
-        log.log(Level.INFO, "Using channel set by activator: " + channelOpenedByActivator);
-
-        channelOpenedByActivator.socket().setReuseAddress(getReuseAddress());
-        int localPort = channelOpenedByActivator.socket().getLocalPort();
-        try {
-            uglySetLocalPort(localPort);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new RuntimeException("Could not set local port.", e);
-        }
-        if (localPort <= 0) {
-            throw new IOException("Server channel not bound");
-        }
-        addBean(channelOpenedByActivator);
-        channelOpenedByActivator.configureBlocking(true);
-        addBean(channelOpenedByActivator);
-
-        try {
-            uglySetChannel(channelOpenedByActivator);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new RuntimeException("Could not set server channel.", e);
-        }
-    }
-
-    private void uglySetLocalPort(int localPort) throws NoSuchFieldException, IllegalAccessException {
-        Field localPortField = ServerConnector.class.getDeclaredField("_localPort");
-        localPortField.setAccessible(true);
-        localPortField.set(this, localPort);
-    }
-
-    private void uglySetChannel(ServerSocketChannel channelOpenedByActivator) throws NoSuchFieldException,
-            IllegalAccessException {
-        Field acceptChannelField = ServerConnector.class.getDeclaredField("_acceptChannel");
-        acceptChannelField.setAccessible(true);
-        acceptChannelField.set(this, channelOpenedByActivator);
-    }
-
     public ServerConnectionStatistics getStatistics() {
         return statistics;
     }
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
index a6d2ead951a..b8ed262a266 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
@@ -8,7 +8,6 @@ import com.yahoo.component.ComponentId;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.container.logging.AccessLog;
 import com.yahoo.jdisc.Metric;
-import com.yahoo.jdisc.application.OsgiFramework;
 import com.yahoo.jdisc.http.ConnectorConfig;
 import com.yahoo.jdisc.http.ServerConfig;
 import com.yahoo.jdisc.http.ServletPathsConfig;
@@ -140,7 +139,6 @@ public class JettyHttpServer extends AbstractServerProvider {
             final FilterBindings filterBindings,
             final ComponentRegistry<ConnectorFactory> connectorFactories,
             final ComponentRegistry<ServletHolder> servletHolders,
-            final OsgiFramework osgiFramework,
             final FilterInvoker filterInvoker,
             final AccessLog accessLog) {
         super(container);
@@ -160,8 +158,7 @@ public class JettyHttpServer extends AbstractServerProvider {
         for (ConnectorFactory connectorFactory : connectorFactories.allComponents()) {
             ConnectorConfig connectorConfig = connectorFactory.getConnectorConfig();
             connectorConfigs.add(connectorConfig);
-            ServerSocketChannel preBoundChannel = getChannelFromServiceLayer(connectorConfig.listenPort(), osgiFramework.bundleContext());
-            server.addConnector(connectorFactory.createConnector(metric, server, preBoundChannel));
+            server.addConnector(connectorFactory.createConnector(metric, server));
             listenedPorts.add(connectorConfig.listenPort());
         }
 
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
index 4e38d6dc7fb..07bffffdbbd 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
@@ -9,12 +9,9 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.junit.Test;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.channels.ServerSocketChannel;
 import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -25,41 +22,13 @@ import static org.hamcrest.CoreMatchers.equalTo;
 public class ConnectorFactoryTest {
 
     @Test
-    public void requireThatNoPreBoundChannelWorks() throws Exception {
+    public void requireThatServerCanBindChannel() throws Exception {
         Server server = new Server();
         try {
             ConnectorConfig config = new ConnectorConfig(new ConnectorConfig.Builder());
             ConnectorFactory factory = createConnectorFactory(config);
             JDiscServerConnector connector =
-                    (JDiscServerConnector)factory.createConnector(new DummyMetric(), server, null);
-            server.addConnector(connector);
-            server.setHandler(new HelloWorldHandler());
-            server.start();
-
-            SimpleHttpClient client = new SimpleHttpClient(null, connector.getLocalPort(), false);
-            SimpleHttpClient.RequestExecutor ex = client.newGet("/blaasdfnb");
-            SimpleHttpClient.ResponseValidator val = ex.execute();
-            val.expectContent(equalTo("Hello world"));
-        } finally {
-            try {
-                server.stop();
-            } catch (Exception e) {
-                //ignore
-            }
-        }
-    }
-
-    @Test
-    public void requireThatPreBoundChannelWorks() throws Exception {
-        Server server = new Server();
-        try {
-            ServerSocketChannel serverChannel = ServerSocketChannel.open();
-            serverChannel.socket().bind(new InetSocketAddress(0));
-
-            ConnectorConfig config = new ConnectorConfig(new ConnectorConfig.Builder());
-            ConnectorFactory factory = createConnectorFactory(config);
-            JDiscServerConnector connector =
-                    (JDiscServerConnector) factory.createConnector(new DummyMetric(), server, serverChannel);
+                    (JDiscServerConnector)factory.createConnector(new DummyMetric(), server);
             server.addConnector(connector);
             server.setHandler(new HelloWorldHandler());
             server.start();
@@ -83,7 +52,7 @@ public class ConnectorFactoryTest {
 
     private static class HelloWorldHandler extends AbstractHandler {
         @Override
-        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException {
             response.getWriter().write("Hello world");
             response.getWriter().flush();
             response.getWriter().close();