Merge pull request #1062 from Vlatombe/thread-name-lock

Add debug information on which run we're locking on.

Author: jglick

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java

@@ -70,6 +70,7 @@
 import org.jenkinsci.plugins.workflow.steps.StepExecution;
 import org.jenkinsci.plugins.workflow.support.concurrent.Futures;
 import org.jenkinsci.plugins.workflow.support.concurrent.Timeout;
+import org.jenkinsci.plugins.workflow.support.concurrent.WithThreadName;
 import org.jenkinsci.plugins.workflow.support.pickles.serialization.PickleResolver;
 import org.jenkinsci.plugins.workflow.support.pickles.serialization.RiverReader;
 import org.jenkinsci.plugins.workflow.support.storage.FlowNodeStorage;
@@ -1990,17 +1991,21 @@ private interface RunnableWithEx<E extends Exception> {
         }
 
         private <T, E extends Exception> T withReadLock(@NonNull SupplierWithEx<T, E> supplier) throws E {
-            readWriteLock.readLock().lock();
-            try {
+            try (var ignored = new WithThreadName(" acquiring read lock on storage of " + CpsFlowExecution.this)) {
+                readWriteLock.readLock().lock();
+            }
+            try (var ignored = new WithThreadName(" with read lock on storage of " + CpsFlowExecution.this)) {
                 return supplier.get();
             } finally {
                 readWriteLock.readLock().unlock();
             }
         }
 
         private <E extends Exception> void withWriteLock(@NonNull RunnableWithEx<E> runnable) throws E {
-            readWriteLock.writeLock().lock();
-            try {
+            try (var ignored = new WithThreadName(" acquiring write lock on storage of " + CpsFlowExecution.this)) {
+                readWriteLock.writeLock().lock();
+            }
+            try (var ignored = new WithThreadName(" with write lock on storage of " + CpsFlowExecution.this)) {
                 runnable.run();
             } finally {
                 readWriteLock.writeLock().unlock();