The waitWhileListening did not work

- It declared the debug port free, but immediately 300 ms later it was blocked.

Signed-off-by: David Matějček <[email protected]>

Author: dmatej

nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/LocalServerCommand.java

@@ -49,7 +49,9 @@
 import static com.sun.enterprise.admin.cli.CLIConstants.DEFAULT_HOSTNAME;
 import static com.sun.enterprise.admin.cli.ProgramOptions.PasswordLocation.LOCAL_PASSWORD;
 import static com.sun.enterprise.admin.servermgmt.cli.ServerLifeSignChecker.step;
+import static com.sun.enterprise.universal.process.ProcessUtils.isListening;
 import static com.sun.enterprise.universal.process.ProcessUtils.loadPid;
+import static com.sun.enterprise.universal.process.ProcessUtils.waitFor;
 import static com.sun.enterprise.universal.process.ProcessUtils.waitForNewPid;
 import static com.sun.enterprise.universal.process.ProcessUtils.waitWhileIsAlive;
 import static com.sun.enterprise.util.SystemPropertyConstants.KEYSTORE_PASSWORD_DEFAULT;
@@ -372,9 +374,9 @@ protected final void waitForStop(final Long pid, final HostAndPort adminAddress,
             return;
         }
         LOG.log(INFO, "Waiting until admin endpoint {0} is free.", adminAddress);
-        final boolean stopped = ProcessUtils.waitWhileListening(adminAddress,
-            portTimeout == null ? Duration.ofHours(1L) : portTimeout, printDots);
-        if (stopped) {
+        final boolean portIsFree = waitFor(() -> !isListening(adminAddress), portTimeout, printDots);
+        LOG.log(INFO, "Admin port is {0}.", portIsFree ? "free" : "blocked");
+        if (portIsFree) {
             return;
         }
         throw new CommandException("Timed out waiting for the server to stop.");

nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerHelper.java

@@ -51,7 +51,8 @@
 import static com.sun.enterprise.admin.cli.CLIConstants.RESTART_DEBUG_ON;
 import static com.sun.enterprise.admin.cli.CLIConstants.RESTART_NORMAL;
 import static com.sun.enterprise.admin.cli.CLIConstants.WALL_CLOCK_START_PROP;
-import static com.sun.enterprise.universal.process.ProcessUtils.waitWhileListening;
+import static com.sun.enterprise.universal.process.ProcessUtils.isListening;
+import static com.sun.enterprise.universal.process.ProcessUtils.waitFor;
 import static java.lang.System.Logger.Level.DEBUG;
 import static java.lang.System.Logger.Level.INFO;
 import static org.glassfish.main.jdke.props.SystemProperties.setProperty;
@@ -96,7 +97,9 @@ public StartServerHelper(boolean terse, Duration timeout, ServerDirs serverDirs,
             final Integer debugPort = launcher.getDebugPort();
             if (debugPort != null) {
                 LOG.log(INFO, "Waiting few seconds until debug port {0} is free.", debugPort);
-                waitWhileListening(new HostAndPort("localhost", debugPort, true), Duration.ofSeconds(10), terse);
+                final HostAndPort debugEndpoint = new HostAndPort("localhost", debugPort, false);
+                final boolean portIsFree = waitFor(() -> !isListening(debugEndpoint), timeout, terse);
+                LOG.log(INFO, "Debug port is {0}.", portIsFree ? "free" : "blocked");
             }
         }
         checkFreeAdminPorts(info.getAdminAddresses());

nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessUtils.java

@@ -28,8 +28,6 @@
 import java.lang.System.Logger;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
 import java.text.MessageFormat;
 import java.time.Duration;
 import java.time.Instant;
@@ -38,10 +36,8 @@
 
 import static com.sun.enterprise.util.StringUtils.ok;
 import static java.lang.System.Logger.Level.DEBUG;
-import static java.lang.System.Logger.Level.ERROR;
 import static java.lang.System.Logger.Level.INFO;
 import static java.lang.System.Logger.Level.TRACE;
-import static java.lang.System.Logger.Level.WARNING;
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 
 /**
@@ -144,50 +140,6 @@ public static boolean isAlive(final ProcessHandle process) {
         return true;
     }
 
-    /**
-     * Blocks until the endpoint closes the connection or timeout comes first.
-     *
-     * @param endpoint endpoint host and port to use.
-     * @param timeout must not be null
-     * @param printDots true to print dots to STDOUT while waiting. One dot per second.
-     * @return true if the connection was closed before timeout. False otherwise.
-     */
-    public static boolean waitWhileListening(HostAndPort endpoint, Duration timeout, boolean printDots) {
-        final DotPrinter dotPrinter = DotPrinter.startWaiting(printDots);
-        try (Socket server = new Socket()) {
-            server.setSoTimeout((int) timeout.toMillis());
-            // Max 5 seconds to connect. It is an extreme value for local endpoint.
-            try {
-                server.connect(new InetSocketAddress(endpoint.getHost(), endpoint.getPort()), SOCKET_TIMEOUT);
-            } catch (IOException e) {
-                LOG.log(TRACE, "Unable to connect - server is probably down.!", e);
-                return true;
-            }
-            try {
-                int result = server.getInputStream().read();
-                if (result == -1) {
-                    LOG.log(TRACE, "Input stream closed - server probably stopped!");
-                    return true;
-                }
-                LOG.log(ERROR, "We were able to read something: {0}. Returning false.", result);
-                return false;
-            } catch (SocketTimeoutException e) {
-                LOG.log(TRACE, "Timeout while reading. Returning false.", e);
-                return false;
-            } catch (SocketException e) {
-                LOG.log(TRACE, "Socket read failed. Returning true.", e);
-                return true;
-            }
-        } catch (Exception ex) {
-            LOG.log(WARNING, "An attempt to open a socket to " + endpoint
-                + " resulted in exception. Therefore we assume the server has stopped.", ex);
-            return true;
-        } finally {
-            DotPrinter.stopWaiting(dotPrinter);
-        }
-    }
-
-
     /**
      * @param endpoint endpoint host and port to use.
      * @return true if the endpoint is listening on socket