[JENKINS-67624] FileAlreadyExistsException on startup (#7027)

jenkinsci · Aug 24, 2022 · 6b0dc18 · 6b0dc18
1 parent 5779757
commit 6b0dc18
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
@@ -1778,15 +1778,32 @@ public static Path createDirectories(@NonNull Path dir, FileAttribute<?>... attr
             if (Files.isDirectory(dir)) {
                 return dir;
             } else {
-                return Files.createDirectory(dir, attrs);
+                try {
+                    return Files.createDirectory(dir, attrs);
+                } catch (FileAlreadyExistsException e) {
+                    if (Files.isDirectory(dir)) {
+                        // a concurrent caller won the race
+                        return dir;
+                    } else {
+                        throw e;
+                    }
+                }
             }
         }
 
         Path child = parent;
         for (Path name : parent.relativize(dir)) {
             child = child.resolve(name);
             if (!Files.isDirectory(child)) {
-                Files.createDirectory(child, attrs);
+                try {
+                    Files.createDirectory(child, attrs);
+                } catch (FileAlreadyExistsException e) {
+                    if (Files.isDirectory(child)) {
+                        // a concurrent caller won the race
+                    } else {
+                        throw e;
+                    }
+                }
             }
         }