[JENKINS-22249] Do not bother checking process existence if we just s…

…tarted it.
jenkinsci · Oct 10, 2014 · 88aed02 · 88aed02 · jglick · Nov 25, 2014
1 parent d75ffad
commit 88aed02
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/durabletask/BourneShellScript.java b/src/main/java/org/jenkinsci/plugins/durabletask/BourneShellScript.java
@@ -91,6 +91,7 @@ public String getScript() {
     /*package*/ static final class ShellController extends FileMonitoringController {
 
         private int pid;
+        private transient int exitStatusCount;
 
         private ShellController(FilePath ws) throws IOException, InterruptedException {
             super(ws);
@@ -123,9 +124,12 @@ private synchronized int pid(FilePath ws) throws IOException, InterruptedExcepti
             if (status != null) {
                 return status;
             }
-            int _pid = pid(workspace);
-            if (_pid > 0 && !ProcessLiveness.isAlive(workspace.getChannel(), _pid)) {
-                return -1; // arbitrary code to distinguish from 0 (success) and 1+ (observed failure)
+            // Do not bother checking this the first few times; WorkflowTest.buildShellScriptAcrossDisconnect sometimes fails otherwise, TBD why
+            if (exitStatusCount++ > 10) {
+                int _pid = pid(workspace);
+                if (_pid > 0 && !ProcessLiveness.isAlive(workspace.getChannel(), _pid)) {
+                    return -1; // arbitrary code to distinguish from 0 (success) and 1+ (observed failure)
+                }
             }
             return null;
         }