[JENKINS-49196] Shutdown in a new thread to avoid PrematureEOF

Add a new thread to exit Jenkins for the shutdown cli command to avoid the Premature EOF IOException
SimoHyHa414 · Oct 22, 2018 · 8cbfa5e · 8cbfa5e
1 parent 34b3a43
commit 8cbfa5e
Showing 1 changed file with 22 additions and 11 deletions.
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
@@ -4266,18 +4266,29 @@ protected RestartCause() {
     @RequirePOST
     public void doExit( StaplerRequest req, StaplerResponse rsp ) throws IOException {
         checkPermission(ADMINISTER);
-        LOGGER.severe(String.format("Shutting down VM as requested by %s from %s",
-                getAuthentication().getName(), req!=null?req.getRemoteAddr():"???"));
-        if (rsp!=null) {
-            rsp.setStatus(HttpServletResponse.SC_OK);
-            rsp.setContentType("text/plain");
-            try (PrintWriter w = rsp.getWriter()) {
-                w.println("Shutting down");
-            }
-        }
+        new Thread("exit thread") {
+            @Override
+            public void run() {
+                try {
+                    ACL.impersonate(ACL.SYSTEM);
+                    LOGGER.severe(String.format("Shutting down VM as requested by %s from %s",
+                            getAuthentication().getName(), req!=null?req.getRemoteAddr():"???"));
+                    if (rsp!=null) {
+                        rsp.setStatus(HttpServletResponse.SC_OK);
+                        rsp.setContentType("text/plain");
+                        try (PrintWriter w = rsp.getWriter()) {
+                            w.println("Shutting down");
+                        }
+                    }
+
+                    cleanUp();
+                    System.exit(0);
 
-        cleanUp();
-        System.exit(0);
+                } catch (Exception e) {
+                    LOGGER.log(Level.WARNING, "Failed to shut down Jenkins", e);
+                }
+            }
+        }.start();
     }