[bugfix] Fix Jetty shutdown hang with setStopTimeout and direct shutdown

- Add Server instance field to JettyStart for direct lifecycle access
- Set stop timeout (30s) on Server so server.stop() never hangs
- Shutdown Jetty directly in shutdown() instead of via
  ShutdownListenerImpl
  timer chain (BrokerPool.stopAll → listener → 1s Timer → server.stop)
- Keeps deadline-based wait(remaining) as defense-in-depth
- Removes unused Timer/TimerTask imports

Closes the test suite hang where Object.wait() in JettyStart.shutdown()
waited indefinitely for lifeCycleStopped() that never fired.

Author: duncdrum

exist-core/src/main/java/org/exist/jetty/JettyStart.java

@@ -56,7 +56,16 @@
 import java.net.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Observer;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.ServiceLoader;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -105,6 +114,7 @@ public class JettyStart implements LifeCycle.Listener {
 
     @GuardedBy("this") private int status = STATUS_STOPPED;
     @GuardedBy("this") private Optional<Thread> shutdownHookThread = Optional.empty();
+    @GuardedBy("this") private Optional<Server> server = Optional.empty();
     @GuardedBy("this") private int primaryPort = 8080;
     @GuardedBy("this") private boolean webAppStartedSuccessfully = false;
     @GuardedBy("this") private String webAppStartupFailureDetail = null;
@@ -518,18 +528,18 @@ private URI getURI(final NetworkConnector networkConnector, final ContextHandler
 
     private Optional<Server> startJetty(final List<Object> configuredObjects) throws Exception {
         // For all objects created by XmlConfigurations, start them if they are lifecycles.
-        Optional<Server> server = Optional.empty();
+        Optional<Server> serverFound = Optional.empty();
         for (final Object configuredObject : configuredObjects) {
             if(configuredObject instanceof Server _server) {
 
                 //skip this server if we have already started it
-                if(server.map(configuredServer -> configuredServer == _server).orElse(false)) {
+                if(serverFound.map(configuredServer -> configuredServer == _server).orElse(false)) {
                     continue;
                 }
 
                 //setup server shutdown
                 _server.addEventListener(this);
-                BrokerPool.getInstance().registerShutdownListener(new ShutdownListenerImpl(_server));
+                BrokerPool.getInstance().registerShutdownListener(new ShutdownListenerImpl());
 
                 // register a shutdown hook for the server
                 final BrokerPoolAndJettyShutdownHook brokerPoolAndJettyShutdownHook =
@@ -550,7 +560,9 @@ private Optional<Server> startJetty(final List<Object> configuredObjects) throws
                     throw e;
                 }
 
-                server = Optional.of(_server);
+                _server.setStopTimeout(TimeUnit.SECONDS.toMillis(30));
+                serverFound = Optional.of(_server);
+                this.server = serverFound;
             }
 
             if (configuredObject instanceof LifeCycle lc && !lc.isRunning()) {
@@ -559,7 +571,7 @@ private Optional<Server> startJetty(final List<Object> configuredObjects) throws
             }
         }
 
-        return server;
+        return serverFound;
     }
 
     /**
@@ -854,9 +866,25 @@ public synchronized void shutdown() {
 
         BrokerPool.stopAll(false);
 
+        // stop the Jetty server directly (no longer relies on ShutdownListenerImpl timer)
+        server.ifPresent(srv -> {
+            try {
+                srv.stop();
+                srv.join();
+            } catch (final Exception e) {
+                logger.warn("Error stopping Jetty server: {}", e.getMessage(), e);
+            }
+        });
+
+        final long deadline = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(30);
         while (status != STATUS_STOPPED) {
+            final long remaining = deadline - System.currentTimeMillis();
+            if (remaining <= 0) {
+                logger.warn("Timed out waiting for Jetty to reach STATUS_STOPPED (current status={}); forcing shutdown", status);
+                break;
+            }
             try {
-                wait();
+                wait(remaining);
             } catch (final InterruptedException e) {
                 Thread.currentThread().interrupt();
             }
@@ -865,38 +893,12 @@ public synchronized void shutdown() {
 
     /**
      * This class gets called after the database received a shutdown request.
-     *
-     * @author wolf
+     * Server stop is handled directly in {@link #shutdown()}.
      */
     private static class ShutdownListenerImpl implements ShutdownListener {
-        private final Server server;
-
-        ShutdownListenerImpl(final Server server) {
-            this.server = server;
-        }
-
         @Override
         public void shutdown(final String dbname, final int remainingInstances) {
-            logger.info("Database shutdown: stopping server in 1sec ...");
-            if (remainingInstances == 0) {
-                // give the webserver a 1s chance to complete open requests
-                final Timer timer = new Timer("jetty shutdown schedule", true);
-                timer.schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        try {
-                            // stop the server
-                            server.stop();
-                            server.join();
-
-                            // make sure to stop the timer thread!
-                            timer.cancel();
-                        } catch (final Exception e) {
-                            logger.error("An error occurred in the shutdown scheduler: {}", e.getMessage(), e);
-                        }
-                    }
-                }, 1000); // timer.schedule
-            }
+            logger.info("Database shutdown: stopping server ...");
         }
     }
 
@@ -929,9 +931,15 @@ public synchronized boolean isStarted() {
         if (status == STATUS_STOPPED) {
             return false;
         }
+        final long deadline = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(30);
         while (status != STATUS_STOPPED) {
+            final long remaining = deadline - System.currentTimeMillis();
+            if (remaining <= 0) {
+                logger.warn("Timed out waiting for Jetty to reach STATUS_STOPPED (current status={})", status);
+                return false;
+            }
             try {
-                wait();
+                wait(remaining);
             } catch (final InterruptedException e) {
                 Thread.currentThread().interrupt();
             }