Report the failed step name in SynchronousResumeNotSupportedException

Author: gbhat618

src/main/java/org/jenkinsci/plugins/workflow/steps/StepContext.java

@@ -149,4 +149,9 @@ public boolean hasBody() {
     public abstract int hashCode();
 
     private static final long serialVersionUID = 1L;
+
+    /**
+     * Returns the function name used in pipeline Jenkinsfile for the current StepNode.
+     */
+    public abstract String getStepDisplayFunctionName() throws IOException;
 }

src/main/java/org/jenkinsci/plugins/workflow/steps/SynchronousNonBlockingStepExecution.java

@@ -5,6 +5,8 @@
 import hudson.util.ClassLoaderSanityThreadFactory;
 import hudson.util.DaemonThreadFactory;
 import hudson.util.NamingThreadFactory;
+
+import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -72,7 +74,14 @@ public void stop(Throwable cause) throws Exception {
 
     @Override
     public void onResume() {
-        getContext().onFailure(new SynchronousResumeNotSupportedException());
+        StepContext context = getContext();
+        String stepFunctionDisplayName = null;
+        try {
+            stepFunctionDisplayName = context.getStepDisplayFunctionName();
+        } catch (IOException x) {
+            // ignore
+        }
+        context.onFailure(new SynchronousResumeNotSupportedException(stepFunctionDisplayName));
     }
 
     @Override public @NonNull String getStatus() {

src/main/java/org/jenkinsci/plugins/workflow/steps/SynchronousResumeNotSupportedException.java

@@ -33,8 +33,18 @@
  */
 public class SynchronousResumeNotSupportedException extends Exception {
 
+    private static final String message = "Resume after a restart not supported for non-blocking synchronous steps";
+
     public SynchronousResumeNotSupportedException() {
-        super("Resume after a restart not supported for non-blocking synchronous steps");
+        super(message);
+    }
+
+    public SynchronousResumeNotSupportedException(String stepDisplayFunctionName) {
+        super(
+            stepDisplayFunctionName == null
+            ? message
+            : message + ", failed step is " + stepDisplayFunctionName + ", you may wrap this block into a retry step "
+              + "with nonresumable condition");
     }
 
 }