[JENKINS-26698] Make sure BuildExecution.cleanUp always calls super, …

…to release the workspace lease. Also stop closing the build log in Run.handleFatalBuildProblem; we want to see any subsequent messages too. (cherry picked from commit 62af87b)
jenkinsci · Mar 30, 2015 · 7e72e7d · 7e72e7d
1 parent dbd262b
commit 7e72e7d
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 12 deletions.
diff --git a/core/src/main/java/hudson/model/Build.java b/core/src/main/java/hudson/model/Build.java
@@ -189,8 +189,12 @@ public void post2(@Nonnull BuildListener listener) throws IOException, Interrupt
         @Override
         public void cleanUp(@Nonnull BuildListener listener) throws Exception {
             // at this point it's too late to mark the build as a failure, so ignore return value.
-            performAllBuildSteps(listener, project.getPublishersList(), false);
-            performAllBuildSteps(listener, project.getProperties(), false);
+            try {
+                performAllBuildSteps(listener, project.getPublishersList(), false);
+                performAllBuildSteps(listener, project.getProperties(), false);
+            } catch (Exception x) {
+                x.printStackTrace(listener.error("Post-build steps failed"));
+            }
             super.cleanUp(listener);
         }
 

diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
@@ -71,7 +71,6 @@
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.StringWriter;
-import java.io.Writer;
 import java.nio.charset.Charset;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -1875,15 +1874,7 @@ private void handleFatalBuildProblem(@Nonnull BuildListener listener, @Nonnull T
             if(e instanceof IOException)
                 Util.displayIOException((IOException)e,listener);
 
-            Writer w = listener.fatalError(e.getMessage());
-            if(w!=null) {
-                try {
-                    e.printStackTrace(new PrintWriter(w));
-                    w.close();
-                } catch (IOException e1) {
-                    // ignore
-                }
-            }
+            e.printStackTrace(listener.fatalError(e.getMessage()));
         } else {
             LOGGER.log(SEVERE, getDisplayName()+" failed to build and we don't even have a listener",e);
         }

diff --git a/test/src/test/java/hudson/model/BuildExecutionTest.java b/test/src/test/java/hudson/model/BuildExecutionTest.java
@@ -0,0 +1,71 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2015 Jesse Glick.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package hudson.model;
+
+import hudson.FilePath;
+import hudson.Launcher;
+import hudson.slaves.WorkspaceList;
+import hudson.tasks.BuildStepMonitor;
+import hudson.tasks.Notifier;
+import java.io.IOException;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.Rule;
+import org.jvnet.hudson.test.Issue;
+import org.jvnet.hudson.test.JenkinsRule;
+
+public class BuildExecutionTest {
+
+    @Rule public JenkinsRule r = new JenkinsRule();
+
+    @Issue("JENKINS-26698")
+    @Test public void workspaceReliablyReleased() throws Exception {
+        FreeStyleProject p = r.createFreeStyleProject();
+        p.getPublishersList().add(new BrokenPublisher());
+        FreeStyleBuild b = r.assertBuildStatus(Result.FAILURE, p.scheduleBuild2(0).get());
+        r.assertLogContains("Post-build steps failed", b);
+        FilePath ws = r.jenkins.getWorkspaceFor(p);
+        WorkspaceList.Lease lease = r.jenkins.toComputer().getWorkspaceList().allocate(ws);
+        try {
+            assertEquals(ws, lease.path);
+        } finally {
+            lease.release();
+        }
+    }
+
+    @SuppressWarnings("unchecked") // not my fault
+    private static class BrokenPublisher extends Notifier {
+        @Override public boolean needsToRunAfterFinalized() {
+            throw new IllegalStateException("oops");
+        }
+        @Override public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
+            return true;
+        }
+        @Override public BuildStepMonitor getRequiredMonitorService() {
+            return BuildStepMonitor.NONE;
+        }
+    }
+
+}