Issue #3440 Stop on Unavailable

+ ContainerLifeCycle stops started beans on failure.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

jetty-server/src/main/java/org/eclipse/jetty/server/Server.java

@@ -405,18 +405,6 @@ public class Server extends HandlerWrapper implements Attributes
         if (isDumpAfterStart())
             dumpStdErr();
 
-        if (mex.size()>0)
-        {
-            try
-            {
-                doStop();
-            }
-            catch(Throwable e)
-            {
-                mex.add(e);
-            }
-        }
-
         mex.ifExceptionThrow();
 
         LOG.info(String.format("Started @%dms",Uptime.getUptime()));

jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java

@@ -691,7 +691,8 @@ public class GracefulStopTest
             assertThat(e.getMessage(),is("Test start failure"));
         }
 
-        server.getContainedBeans(LifeCycle.class).stream().forEach(lc -> assertTrue(!lc.isRunning()));
+        assertTrue(server.getContainedBeans(LifeCycle.class).stream().noneMatch(LifeCycle::isRunning));
+        assertTrue(server.getContainedBeans(LifeCycle.class).stream().anyMatch(LifeCycle::isFailed));
     }
     
     static class NoopHandler extends AbstractHandler 

jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java

@@ -96,12 +96,14 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
         _doStarted = true;
 
         // start our managed and auto beans
+        try
+        {
             for (Bean b : _beans)
             {
                 if (b._bean instanceof LifeCycle)
                 {
                     LifeCycle l = (LifeCycle)b._bean;
-                switch(b._managed)
+                    switch (b._managed)
                     {
                         case MANAGED:
                             if (!l.isRunning())
@@ -126,6 +128,31 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
 
             super.doStart();
         }
+        catch (Throwable t)
+        {
+            // on failure, stop any managed components that have been started
+            for (Bean b : _beans)
+            {
+                if (b._bean instanceof LifeCycle && b._managed == Managed.MANAGED)
+                {
+                    LifeCycle l = (LifeCycle)b._bean;
+                    if (l.isRunning())
+                    {
+                        try
+                        {
+                            l.stop();
+                        }
+                        catch(Throwable t2)
+                        {
+                            if (t2!=t)
+                                t.addSuppressed(t2);
+                        }
+                    }
+                }
+            }
+            throw t;
+        }
+    }
 
     /**
      * Starts the given lifecycle.