Use sleep in LocalData instead of semaphore

Author: dwnusbaum

src/test/java/org/jenkinsci/plugins/workflow/support/storage/BulkFlowNodeStorageTest.java

@@ -76,12 +76,11 @@ public final class BulkFlowNodeStorageTest {
         p.addProperty(new DurabilityHintJobProperty(FlowDurabilityHint.PERFORMANCE_OPTIMIZED));
         p.setDefinition(new CpsFlowDefinition(
                 "stage('test') {\n" +
-                "  semaphore('wait')\n" +
+                "  sleep 120\n" +
                 "}\n", true));
         var b = p.scheduleBuild2(0).waitForStart();
-        SemaphoreStep.waitForStart("wait/1", b);
+        Thread.sleep(5*1000);
         ((CpsFlowExecution) b.getExecution()).getStorage().flush();
-        Thread.sleep(30*1000);
         */
         var p = r.jenkins.getItemByFullName("test0", WorkflowJob.class);
         var b = p.getLastBuild();
@@ -104,5 +103,6 @@ public static class MyActionAdder implements GraphListener.Synchronous {
         public void onNewHead(FlowNode node) {
             node.addAction(new MyAction());
         }
-    }*/
+    }
+    */
 }

src/test/java/org/jenkinsci/plugins/workflow/support/storage/SimpleXStreamStorageTest.java

@@ -11,7 +11,6 @@
 import org.jenkinsci.plugins.workflow.cps.nodes.StepStartNode;
 import org.jenkinsci.plugins.workflow.graph.AtomNode;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
-import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -94,15 +93,14 @@ public void testDeferWriteAndFlush() throws Exception {
         p.addProperty(new DurabilityHintJobProperty(FlowDurabilityHint.MAX_SURVIVABILITY));
         p.setDefinition(new CpsFlowDefinition(
                 "stage('test') {\n" +
-                "  semaphore('wait')\n" +
+                "  sleep 120\n" +
                 "}\n", true));
         var b = p.scheduleBuild2(0).waitForStart();
-        SemaphoreStep.waitForStart("wait/1", b);
+        Thread.sleep(5*1000);
         ((CpsFlowExecution) b.getExecution()).getStorage().flush();
         */
         var p = j.jenkins.getItemByFullName("test0", WorkflowJob.class);
         var b = p.getLastBuild();
-        SemaphoreStep.success("wait/1", null);
         j.assertBuildStatus(Result.SUCCESS, j.waitForCompletion(b));
         var stageBodyStartNode = (StepStartNode) b.getExecution().getNode("4");
         assertThat(stageBodyStartNode, not(nullValue()));

src/test/java/org/jenkinsci/plugins/workflow/test/steps/SemaphoreStep.java

@@ -234,23 +234,6 @@ public static class Execution extends AbstractStepExecutionImpl {
             }
         }
 
-        @Override public void onResume() {
-            // Only matters for restarts across different JVMs, for example if using @LocalData.
-            State s = State.get();
-            String c = Jenkins.XSTREAM.toXML(getContext());
-            synchronized (s) {
-                if (s.returnValues.containsKey(k)) {
-                    getContext().onSuccess(s.returnValues.get(k));
-                } else if (s.errors.containsKey(k)) {
-                    getContext().onFailure(s.errors.get(k));
-                } else {
-                    s.contexts.put(k, c);
-                }
-                s.started.add(k);
-                s.notifyAll();
-            }
-        }
-
         private static final long serialVersionUID = 1L;
 
     }

src/test/resources/org/jenkinsci/plugins/workflow/support/storage/BulkFlowNodeStorageTest/actionDeserializationShouldBeRobust/jobs/test0/builds/1/build.xml

@@ -2,35 +2,35 @@
 <flow-build plugin="[email protected]">
   <actions/>
   <queueId>1</queueId>
-  <timestamp>1714412222911</timestamp>
-  <startTime>1714412222924</startTime>
+  <timestamp>1714512454761</timestamp>
+  <startTime>1714512454774</startTime>
   <duration>0</duration>
   <charset>UTF-8</charset>
   <keepLog>false</keepLog>
   <execution class="org.jenkinsci.plugins.workflow.cps.CpsFlowExecution">
     <result>SUCCESS</result>
     <script>stage(&apos;test&apos;) {
-  semaphore(&apos;wait&apos;)
+  sleep 120
 }
 </script>
     <loadedScripts class="map"/>
     <durabilityHint>PERFORMANCE_OPTIMIZED</durabilityHint>
     <timings class="map">
       <entry>
         <string>flowNode</string>
-        <long>3326252</long>
+        <long>3116376</long>
       </entry>
       <entry>
         <string>classLoad</string>
-        <long>94409046</long>
+        <long>125882830</long>
       </entry>
       <entry>
         <string>run</string>
-        <long>72661207</long>
+        <long>80228333</long>
       </entry>
       <entry>
         <string>parse</string>
-        <long>206498209</long>
+        <long>213222375</long>
       </entry>
     </timings>
     <internalCalls class="sorted-set"/>

src/test/resources/org/jenkinsci/plugins/workflow/support/storage/BulkFlowNodeStorageTest/actionDeserializationShouldBeRobust/jobs/test0/builds/1/log

@@ -1,5 +1,6 @@
 Started
-ha:////4HRjCqPkfz1NSKp93SyXqIGMS8sYXTlEz1/aJBi87ebXAAAAoh+LCAAAAAAAAP9tjTEOwjAQBM8BClpKHuFItIiK1krDC0x8GCfWnbEdkooX8TX+gCESFVvtrLSa5wtWKcKBo5UdUu8otU4GP9jS5Mixv3geZcdn2TIl9igbHBs2eJyx4YwwR1SwULBGaj0nRzbDRnX6rmuvydanHMu2V1A5c4MHCFXMWcf8hSnC9jqYxPTz/BXAFEIGsfuclm8zQVqFvQAAAA==[Pipeline] Start of Pipeline
-ha:////4H+XLB9Zbb+2k9X1o1EbVc5ol8gfq1RPzPymyR3m6M9NAAAApR+LCAAAAAAAAP9tjTEOwjAUQ3+KOrAycohUghExsUZZOEFIQkgb/d8mKe3EibgadyBQiQlLlmxL1nu+oE4RjhQdby12HpP2vA+jK4lPFLtroIm3dOGaMFGwXNpJkrGnpUrKFhaxClYC1hZ1oOTRZdiIVt1VExS65pxj2Q4CKm8GeAAThZxVzN8yR9jeRpMIf5y/AJj7DGxXvP/86jduZBmjwAAAAA==[Pipeline] stage
-ha:////4ElkmjHLcnFZBpsGTNy6WexfqlkPPhmmTlYhQQcmc1loAAAApR+LCAAAAAAAAP9tjTEOwjAUQ3+KOrAycoh0gA0xsUZZOEFIQkgb/d8mKe3EibgadyBQiQlLlmxL1nu+oE4RjhQdby12HpP2vA+jK4lPFLtroIm3dOGaMFGwXNpJkrGnpUrKFhaxClYC1hZ1oOTRZdiIVt1VExS65pxj2Q4CKm8GeAAThZxVzN8yR9jeRpMIf5y/AJj7DGxXvP/86jfoP95RwAAAAA==[Pipeline] { (test)
-ha:////4CdyFL2m4v7QFzYmEgcNjTFOWEHE6kEKzu3j2MwMA44+AAAAoh+LCAAAAAAAAP9tjTEOAiEURD9rLGwtPQTbaGWsbAmNJ0AWEZb8zwLrbuWJvJp3kLiJlZNMMm+a93rDOic4UbLcG+wdZu14DKOti0+U+lugiXu6ck2YKRguzSSpM+cFJRUDS1gDKwEbgzpQdmgLbIVXD9UGhba9lFS/o4DGdQM8gYlqLiqVL8wJdvexy4Q/z18BzLEA29ce4gdpL1fxvAAAAA==[Pipeline] semaphore
+ha:////4Er24oWfBBiEN/Wa7id5o9M/o5Uqubl8YTcDNNanS4ZDAAAAoh+LCAAAAAAAAP9tjTEOwjAQBM8BClpKHuFItIiK1krDC0x8GCfWnbEdkooX8TX+gCESFVvtrLSa5wtWKcKBo5UdUu8otU4GP9jS5Mixv3geZcdn2TIl9igbHBs2eJyx4YwwR1SwULBGaj0nRzbDRnX6rmuvydanHMu2V1A5c4MHCFXMWcf8hSnC9jqYxPTz/BXAFEIGsfuclm8zQVqFvQAAAA==[Pipeline] Start of Pipeline
+ha:////4P/BX1JLzbsCrvx6yk49claR+ti0ovHPJGy4iulK196/AAAApR+LCAAAAAAAAP9tjTEOwjAUQ3+KOrAycohUghExsUZZOEFIQkgb/d8mKe3EibgadyBQiQlLlmxL1nu+oE4RjhQdby12HpP2vA+jK4lPFLtroIm3dOGaMFGwXNpJkrGnpUrKFhaxClYC1hZ1oOTRZdiIVt1VExS65pxj2Q4CKm8GeAAThZxVzN8yR9jeRpMIf5y/AJj7DGxXvP/86jduZBmjwAAAAA==[Pipeline] stage
+ha:////4JdiHwYzioWlo2ROxl2Zlo74y53NN96hzyE6iT+69Eh0AAAApR+LCAAAAAAAAP9tjTEOwjAUQ3+KOrAycoh0gA0xsUZZOEFIQkgb/d8mKe3EibgadyBQiQlLlmxL1nu+oE4RjhQdby12HpP2vA+jK4lPFLtroIm3dOGaMFGwXNpJkrGnpUrKFhaxClYC1hZ1oOTRZdiIVt1VExS65pxj2Q4CKm8GeAAThZxVzN8yR9jeRpMIf5y/AJj7DGxXvP/86jfoP95RwAAAAA==[Pipeline] { (test)
+ha:////4IbbNcCvGzKmOkFNSNkP4IRFXNaMMv4VDyWQd8mj5yT1AAAAoh+LCAAAAAAAAP9tjTEOAiEURD9rLGwtPQTbaGWsbAmNJ0AWEZb8zwLrbuWJvJp3kLiJlZNMMm+a93rDOic4UbLcG+wdZu14DKOti0+U+lugiXu6ck2YKRguzSSpM+cFJRUDS1gDKwEbgzpQdmgLbIVXD9UGhba9lFS/o4DGdQM8gYlqLiqVL8wJdvexy4Q/z18BzLEA29ce4gdpL1fxvAAAAA==[Pipeline] sleep
+Sleeping for 2 min 0 sec

src/test/resources/org/jenkinsci/plugins/workflow/support/storage/BulkFlowNodeStorageTest/actionDeserializationShouldBeRobust/jobs/test0/builds/1/log-index

@@ -0,0 +1 @@
+1231 5

src/test/resources/org/jenkinsci/plugins/workflow/support/storage/BulkFlowNodeStorageTest/actionDeserializationShouldBeRobust/jobs/test0/builds/1/workflow/flowNodeStore.xml

@@ -12,7 +12,7 @@
           <value>42</value>
         </org.jenkinsci.plugins.workflow.support.storage.BulkFlowNodeStorageTest_-MyAction>
         <wf.a.TimingAction plugin="[email protected]_">
-          <startTime>1714412223218</startTime>
+          <startTime>1714512455074</startTime>
         </wf.a.TimingAction>
       </actions>
     </Tag>
@@ -40,7 +40,7 @@
           <isUnmodifiedBySanitization>true</isUnmodifiedBySanitization>
         </cps.a.ArgumentsActionImpl>
         <wf.a.TimingAction plugin="[email protected]_">
-          <startTime>1714412223284</startTime>
+          <startTime>1714512455144</startTime>
         </wf.a.TimingAction>
         <org.jenkinsci.plugins.workflow.support.storage.BulkFlowNodeStorageTest_-MyAction>
           <value>42</value>
@@ -64,7 +64,7 @@
           <displayName>test</displayName>
         </wf.a.LabelAction>
         <wf.a.TimingAction plugin="[email protected]_">
-          <startTime>1714412223289</startTime>
+          <startTime>1714512455148</startTime>
         </wf.a.TimingAction>
         <org.jenkinsci.plugins.workflow.support.storage.BulkFlowNodeStorageTest_-MyAction>
           <value>42</value>
@@ -80,21 +80,21 @@
           <string>4</string>
         </parentIds>
         <id>5</id>
-        <descriptorId>org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep</descriptorId>
+        <descriptorId>org.jenkinsci.plugins.workflow.steps.SleepStep</descriptorId>
       </node>
       <actions>
         <cps.a.ArgumentsActionImpl plugin="[email protected]_3a_6988277b_2">
           <arguments>
             <entry>
-              <string>id</string>
-              <string>wait</string>
+              <string>time</string>
+              <long>120</long>
             </entry>
           </arguments>
           <sensitiveVariables/>
           <isUnmodifiedBySanitization>true</isUnmodifiedBySanitization>
         </cps.a.ArgumentsActionImpl>
         <wf.a.TimingAction plugin="[email protected]_">
-          <startTime>1714412223294</startTime>
+          <startTime>1714512455155</startTime>
         </wf.a.TimingAction>
         <org.jenkinsci.plugins.workflow.support.storage.BulkFlowNodeStorageTest_-MyAction>
           <value>42</value>

src/test/resources/org/jenkinsci/plugins/workflow/support/storage/BulkFlowNodeStorageTest/actionDeserializationShouldBeRobust/jobs/test0/config.xml

@@ -8,7 +8,7 @@
   </properties>
   <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="[email protected]_3a_6988277b_2">
     <script>stage(&apos;test&apos;) {
-  semaphore(&apos;wait&apos;)
+  sleep 120
 }
 </script>
     <sandbox>true</sandbox>

src/test/resources/org/jenkinsci/plugins/workflow/support/storage/SimpleXStreamStorageTest/actionDeserializationShouldBeRobust/jobs/test0/builds/1/build.xml

@@ -2,39 +2,39 @@
 <flow-build plugin="[email protected]">
   <actions/>
   <queueId>1</queueId>
-  <timestamp>1714413871034</timestamp>
-  <startTime>1714413871047</startTime>
+  <timestamp>1714512387063</timestamp>
+  <startTime>1714512387076</startTime>
   <duration>0</duration>
   <charset>UTF-8</charset>
   <keepLog>false</keepLog>
   <execution class="org.jenkinsci.plugins.workflow.cps.CpsFlowExecution">
     <result>SUCCESS</result>
     <script>stage(&apos;test&apos;) {
-  semaphore(&apos;wait&apos;)
+  sleep 120
 }
 </script>
     <loadedScripts class="map"/>
     <durabilityHint>MAX_SURVIVABILITY</durabilityHint>
     <timings class="map">
       <entry>
         <string>flowNode</string>
-        <long>76623167</long>
+        <long>79993754</long>
       </entry>
       <entry>
         <string>classLoad</string>
-        <long>83376137</long>
+        <long>146027039</long>
       </entry>
       <entry>
         <string>run</string>
-        <long>181214959</long>
+        <long>213084959</long>
       </entry>
       <entry>
         <string>parse</string>
-        <long>188712792</long>
+        <long>233240875</long>
       </entry>
       <entry>
         <string>saveProgram</string>
-        <long>49106458</long>
+        <long>58160417</long>
       </entry>
     </timings>
     <internalCalls class="sorted-set"/>

src/test/resources/org/jenkinsci/plugins/workflow/support/storage/SimpleXStreamStorageTest/actionDeserializationShouldBeRobust/jobs/test0/builds/1/log

@@ -1,5 +1,6 @@
 Started
-ha:////4OkjLGvkcZAQNTRsuUiu8X+DYYfRK1VZUd93tgM297TIAAAAoh+LCAAAAAAAAP9tjTEOwjAQBM8BClpKHuFItIiK1krDC0x8GCfWnbEdkooX8TX+gCESFVvtrLSa5wtWKcKBo5UdUu8otU4GP9jS5Mixv3geZcdn2TIl9igbHBs2eJyx4YwwR1SwULBGaj0nRzbDRnX6rmuvydanHMu2V1A5c4MHCFXMWcf8hSnC9jqYxPTz/BXAFEIGsfuclm8zQVqFvQAAAA==[Pipeline] Start of Pipeline
-ha:////4E+OWHXZEjzhhyjLRWYg7cwLU0f4UC4HtG9Hqsp9DggGAAAApR+LCAAAAAAAAP9tjTEOwjAUQ3+KOrAycohUghExsUZZOEFIQkgb/d8mKe3EibgadyBQiQlLlmxL1nu+oE4RjhQdby12HpP2vA+jK4lPFLtroIm3dOGaMFGwXNpJkrGnpUrKFhaxClYC1hZ1oOTRZdiIVt1VExS65pxj2Q4CKm8GeAAThZxVzN8yR9jeRpMIf5y/AJj7DGxXvP/86jduZBmjwAAAAA==[Pipeline] stage
-ha:////4MrfdF8DkVV/QpaSqFe4Z7zP89ARy4mRlLmrBdmTTJSuAAAApR+LCAAAAAAAAP9tjTEOwjAUQ3+KOrAycoh0gA0xsUZZOEFIQkgb/d8mKe3EibgadyBQiQlLlmxL1nu+oE4RjhQdby12HpP2vA+jK4lPFLtroIm3dOGaMFGwXNpJkrGnpUrKFhaxClYC1hZ1oOTRZdiIVt1VExS65pxj2Q4CKm8GeAAThZxVzN8yR9jeRpMIf5y/AJj7DGxXvP/86jfoP95RwAAAAA==[Pipeline] { (test)
-ha:////4GAwmWdsHefU4wiseMPGknQCQ5l1M/evJXkxTzjae7xFAAAAoh+LCAAAAAAAAP9tjTEOAiEURD9rLGwtPQTbaGWsbAmNJ0AWEZb8zwLrbuWJvJp3kLiJlZNMMm+a93rDOic4UbLcG+wdZu14DKOti0+U+lugiXu6ck2YKRguzSSpM+cFJRUDS1gDKwEbgzpQdmgLbIVXD9UGhba9lFS/o4DGdQM8gYlqLiqVL8wJdvexy4Q/z18BzLEA29ce4gdpL1fxvAAAAA==[Pipeline] semaphore
+ha:////4G2Cb8Ql3KodDh/7I/MViMTdb0Ok+iChPXznMFKXf5nnAAAAoh+LCAAAAAAAAP9tjTEOwjAQBM8BClpKHuFItIiK1krDC0x8GCfWnbEdkooX8TX+gCESFVvtrLSa5wtWKcKBo5UdUu8otU4GP9jS5Mixv3geZcdn2TIl9igbHBs2eJyx4YwwR1SwULBGaj0nRzbDRnX6rmuvydanHMu2V1A5c4MHCFXMWcf8hSnC9jqYxPTz/BXAFEIGsfuclm8zQVqFvQAAAA==[Pipeline] Start of Pipeline
+ha:////4L/Qb4v+2UjVyAYs+x5KO+lNMbBqmeW70tIwLHQF+Pl/AAAApR+LCAAAAAAAAP9tjTEOwjAUQ3+KOrAycohUghExsUZZOEFIQkgb/d8mKe3EibgadyBQiQlLlmxL1nu+oE4RjhQdby12HpP2vA+jK4lPFLtroIm3dOGaMFGwXNpJkrGnpUrKFhaxClYC1hZ1oOTRZdiIVt1VExS65pxj2Q4CKm8GeAAThZxVzN8yR9jeRpMIf5y/AJj7DGxXvP/86jduZBmjwAAAAA==[Pipeline] stage
+ha:////4PUYO2bP3JVlngD9/Z26U1Kp8eR503A4GpCiKJSd4gG5AAAApR+LCAAAAAAAAP9tjTEOwjAUQ3+KOrAycoh0gA0xsUZZOEFIQkgb/d8mKe3EibgadyBQiQlLlmxL1nu+oE4RjhQdby12HpP2vA+jK4lPFLtroIm3dOGaMFGwXNpJkrGnpUrKFhaxClYC1hZ1oOTRZdiIVt1VExS65pxj2Q4CKm8GeAAThZxVzN8yR9jeRpMIf5y/AJj7DGxXvP/86jfoP95RwAAAAA==[Pipeline] { (test)
+ha:////4KStXP4gq7RkmGlqJhQHWcAXOAjXKQoejbxWDwwkJuwBAAAAoh+LCAAAAAAAAP9tjTEOAiEURD9rLGwtPQTbaGWsbAmNJ0AWEZb8zwLrbuWJvJp3kLiJlZNMMm+a93rDOic4UbLcG+wdZu14DKOti0+U+lugiXu6ck2YKRguzSSpM+cFJRUDS1gDKwEbgzpQdmgLbIVXD9UGhba9lFS/o4DGdQM8gYlqLiqVL8wJdvexy4Q/z18BzLEA29ce4gdpL1fxvAAAAA==[Pipeline] sleep
+Sleeping for 2 min 0 sec