diff --git a/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java b/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
index 3c4096cd..690f0133 100644
--- a/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
+++ b/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
@@ -676,10 +676,16 @@ private void finish(@Nonnull Result r, @CheckForNull Throwable t) {
         duration = Math.max(0, System.currentTimeMillis() - getStartTimeInMillis());
         try {
             save();
-            getParent().logRotate();
         } catch (Exception x) {
-            LOGGER.log(Level.WARNING, "failed to save " + this + " or perform log rotation", x);
+            LOGGER.log(Level.WARNING, "failed to save " + this, x);
         }
+        Timer.get().submit(() -> {
+            try {
+                getParent().logRotate();
+            } catch (Exception x) {
+                LOGGER.log(Level.WARNING, "failed to perform log rotation after " + this, x);
+            }
+        });
         onEndBuilding();
         if (completed != null) {
             synchronized (completed) {
@@ -894,12 +900,18 @@ private String key() {
         @Override public FlowExecution get() throws IOException {
             WorkflowRun r = run();
             synchronized (LOADING_RUNS) {
-                while (r.execution == null && LOADING_RUNS.containsKey(key())) {
+                int count = 5;
+                while (r.execution == null && LOADING_RUNS.containsKey(key()) && count-- > 0) {
+                    Thread thread = Thread.currentThread();
+                    String origName = thread.getName();
+                    thread.setName(origName + ": waiting for " + key());
                     try {
-                        LOADING_RUNS.wait();
+                        LOADING_RUNS.wait(/* 1m */60_000);
                     } catch (InterruptedException x) {
                         LOGGER.log(Level.WARNING, "failed to wait for " + r + " to be loaded", x);
                         break;
+                    } finally {
+                        thread.setName(origName);
                     }
                 }
             }