Parts from JDK-8295944 and edits to Http2TestServer in new location.

GoeLin · GoeLin · commit 74bf06588a6e · 2025-06-13T15:49:57.000+02:00
diff --git a/test/jdk/java/net/httpclient/AsyncExecutorShutdown.java b/test/jdk/java/net/httpclient/AsyncExecutorShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,15 +26,9 @@
  * @bug 8277969
  * @summary Test for edge case where the executor is not accepting
  *          new tasks while the client is still running
- * @modules java.base/sun.net.www.http
- *          java.net.http/jdk.internal.net.http.common
- *          java.net.http/jdk.internal.net.http.frame
- *          java.net.http/jdk.internal.net.http.hpack
- *          java.logging
- *          jdk.httpserver
- * @library /test/lib http2/server
- * @build Http2TestServer
- * @build jdk.test.lib.net.SimpleSSLContext ReferenceTracker
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
+ *        ReferenceTracker
  * @run testng/othervm
  *       -Djdk.internal.httpclient.debug=true
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
@@ -69,6 +63,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
+import jdk.httpclient.test.lib.http2.Http2TestServer;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLHandshakeException;
 
diff --git a/test/jdk/java/net/httpclient/ExecutorShutdown.java b/test/jdk/java/net/httpclient/ExecutorShutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,15 +26,9 @@
  * @bug 8277969
  * @summary Test for edge case where the executor is not accepting
  *          new tasks while the client is still running
- * @modules java.base/sun.net.www.http
- *          java.net.http/jdk.internal.net.http.common
- *          java.net.http/jdk.internal.net.http.frame
- *          java.net.http/jdk.internal.net.http.hpack
- *          java.logging
- *          jdk.httpserver
- * @library /test/lib http2/server
- * @build Http2TestServer
- * @build jdk.test.lib.net.SimpleSSLContext ReferenceTracker
+ * @library /test/lib /test/jdk/java/net/httpclient/lib
+ * @build jdk.httpclient.test.lib.http2.Http2TestServer jdk.test.lib.net.SimpleSSLContext
+ *        ReferenceTracker
  * @run testng/othervm
  *       -Djdk.internal.httpclient.debug=true
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
@@ -66,6 +60,8 @@
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
+import jdk.httpclient.test.lib.common.HttpServerAdapters;
+import jdk.httpclient.test.lib.http2.Http2TestServer;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLHandshakeException;
 
diff --git a/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServer.java b/test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServer.java
@@ -26,17 +26,16 @@
 import java.io.IOException;
 import java.net.*;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SNIServerName;
 import jdk.internal.net.http.frame.ErrorFrame;
 
 /**
@@ -47,16 +46,19 @@
  * obtained from the supplied ExecutorService.
  */
 public class Http2TestServer implements AutoCloseable {
+    static final AtomicLong IDS = new AtomicLong();
+    final long id = IDS.incrementAndGet();
     final ServerSocket server;
     final boolean supportsHTTP11;
     volatile boolean secure;
     final ExecutorService exec;
-    volatile boolean stopping = false;
+    private volatile boolean stopping = false;
     final Map<String,Http2Handler> handlers;
     final SSLContext sslContext;
     final String serverName;
-    final HashMap<InetSocketAddress,Http2TestServerConnection> connections;
+    final Set<Http2TestServerConnection> connections;
     final Properties properties;
+    final String name;
 
     private static ThreadFactory defaultThreadFac =
         (Runnable r) -> {
@@ -177,6 +179,7 @@ public Http2TestServer(InetAddress localAddr,
                            boolean supportsHTTP11)
         throws Exception
     {
+        this.name = "TestServer(%d)".formatted(id);
         this.serverName = serverName;
         this.supportsHTTP11 = supportsHTTP11;
         if (secure) {
@@ -193,7 +196,7 @@ public Http2TestServer(InetAddress localAddr,
         this.exec = exec == null ? getDefaultExecutor() : exec;
         this.handlers = Collections.synchronizedMap(new HashMap<>());
         this.properties = properties == null ? new Properties() : properties;
-        this.connections = new HashMap<>();
+        this.connections = ConcurrentHashMap.newKeySet();
     }
 
     /**
@@ -232,7 +235,7 @@ Http2Handler getHandlerFor(String path) {
         Http2Handler handler = href.get();
         if (handler == null)
             throw new RuntimeException("No handler found for path " + path);
-        System.err.println("Using handler for: " + bestMatch.get());
+        System.err.println(name + ": Using handler for: " + bestMatch.get());
         return handler;
     }
 
@@ -246,8 +249,8 @@ final ServerSocket initPlaintext(int port, int backlog) throws Exception {
     public synchronized void stop() {
         // TODO: clean shutdown GoAway
         stopping = true;
-        System.err.printf("Server stopping %d connections\n", connections.size());
-        for (Http2TestServerConnection connection : connections.values()) {
+        System.err.printf("%s: stopping %d connections\n", name, connections.size());
+        for (Http2TestServerConnection connection : connections) {
             connection.close(ErrorFrame.NO_ERROR);
         }
         try {
@@ -284,11 +287,56 @@ public String serverName() {
 
     private synchronized void putConnection(InetSocketAddress addr, Http2TestServerConnection c) {
         if (!stopping)
-            connections.put(addr, c);
+            connections.add(c);
     }
 
     private synchronized void removeConnection(InetSocketAddress addr, Http2TestServerConnection c) {
-        connections.remove(addr, c);
+        connections.remove(c);
+    }
+
+    record AcceptedConnection(Http2TestServer server,
+                              Socket socket) {
+        void startConnection() {
+            String name = server.name;
+            Http2TestServerConnection c = null;
+            InetSocketAddress addr = null;
+            try {
+                addr = (InetSocketAddress) socket.getRemoteSocketAddress();
+                System.err.println(name + ": creating connection");
+                c = server.createConnection(server, socket, server.exchangeSupplier);
+                server.putConnection(addr, c);
+                System.err.println(name + ": starting connection");
+                c.run();
+                System.err.println(name + ": connection started");
+            } catch (Throwable e) {
+                boolean stopping = server.stopping;
+                if (!stopping) {
+                    System.err.println(name + ": unexpected exception: " + e);
+                    e.printStackTrace();
+                }
+                // we should not reach here, but if we do
+                // the connection might not have been closed
+                // and if so then the client might wait
+                // forever.
+                if (c != null) {
+                    server.removeConnection(addr, c);
+                }
+                try {
+                    if (c != null) c.close(ErrorFrame.PROTOCOL_ERROR);
+                } catch (Exception x) {
+                    if (!stopping)
+                        System.err.println(name + ": failed to close connection: " + e);
+                } finally {
+                    try {
+                        socket.close();
+                    } catch (IOException x) {
+                        if (!stopping)
+                            System.err.println(name + ": failed to close socket: " + e);
+                    }
+                }
+                System.err.println(name + ": failed to start connection: " + e);
+            }
+        }
     }
 
     /**
@@ -298,38 +346,37 @@ public void start() {
         exec.submit(() -> {
             try {
                 while (!stopping) {
+                    System.err.println(name + ": accepting connections");
                     Socket socket = server.accept();
-                    Http2TestServerConnection c = null;
-                    InetSocketAddress addr = null;
+                    System.err.println(name + ": connection accepted");
                     try {
-                        addr = (InetSocketAddress) socket.getRemoteSocketAddress();
-                        c = createConnection(this, socket, exchangeSupplier);
-                        putConnection(addr, c);
-                        c.run();
+                        var accepted = new AcceptedConnection(this, socket);
+                        exec.submit(accepted::startConnection);
                     } catch (Throwable e) {
+                        if (!stopping) {
+                            System.err.println(name + ": unexpected exception: " + e);
+                            e.printStackTrace();
+                        }
                         // we should not reach here, but if we do
                         // the connection might not have been closed
                         // and if so then the client might wait
                         // forever.
-                        if (c != null) {
-                            removeConnection(addr, c);
-                            c.close(ErrorFrame.PROTOCOL_ERROR);
-                        } else {
-                            socket.close();
-                        }
-                        System.err.println("TestServer: start exception: " + e);
+                        System.err.println(name + ": start exception: " + e);
                     }
+                    System.err.println(name + ": stopping is: " + stopping);
                 }
             } catch (SecurityException se) {
-                System.err.println("TestServer: terminating, caught " + se);
+                System.err.println(name + ": terminating, caught " + se);
                 se.printStackTrace();
                 stopping = true;
                 try { server.close(); } catch (IOException ioe) { /* ignore */}
             } catch (Throwable e) {
                 if (!stopping) {
-                    System.err.println("TestServer: terminating, caught " + e);
+                    System.err.println(name + ": terminating, caught " + e);
                     e.printStackTrace();
                 }
+            } finally {
+                System.err.println(name + ": finished");
             }
         });
     }
@@ -343,6 +390,7 @@ protected Http2TestServerConnection createConnection(Http2TestServer http2TestSe
 
     @Override
     public void close() throws Exception {
+        System.err.println(name + ": closing");
         stop();
     }
 }
