Delete versionCacheDir if retrieve fails

Author: sboardwell

src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryAdder.java

@@ -67,13 +67,13 @@
 @Extension public class LibraryAdder extends ClasspathAdder {
 
     private static final Logger LOGGER = Logger.getLogger(LibraryAdder.class.getName());
-    
+
     private static ConcurrentHashMap<String, ReentrantReadWriteLock> cacheRetrieveLock = new ConcurrentHashMap<>();
 
     static @NonNull ReentrantReadWriteLock getReadWriteLockFor(@NonNull String name) {
         return cacheRetrieveLock.computeIfAbsent(name, s -> new ReentrantReadWriteLock(true));
     }
-    
+
     @Override public List<Addition> add(CpsFlowExecution execution, List<String> libraries, HashMap<String, Boolean> changelogs) throws Exception {
         Queue.Executable executable = execution.getOwner().getExecutable();
         Run<?,?> build;
@@ -156,7 +156,7 @@
     }
 
     static @NonNull String[] parse(@NonNull String identifier) {
-       int at = identifier.indexOf('@');
+        int at = identifier.indexOf('@');
         if (at == -1) {
             return new String[] {identifier, null}; // pick up defaultVersion
         } else {
@@ -169,9 +169,9 @@ private enum CacheStatus {
         DOES_NOT_EXIST,
         EXPIRED;
     }
-    
+
     private static CacheStatus getCacheStatus(@NonNull LibraryCachingConfiguration cachingConfiguration, @NonNull final FilePath versionCacheDir)
-          throws IOException, InterruptedException
+        throws IOException, InterruptedException
     {
         if (cachingConfiguration.isRefreshEnabled()) {
             final long cachingMilliseconds = cachingConfiguration.getRefreshTimeMilliseconds();
@@ -193,7 +193,7 @@ private static CacheStatus getCacheStatus(@NonNull LibraryCachingConfiguration c
             }
         }
     }
-    
+
     /** Retrieve library files. */
     static List<URL> retrieve(@NonNull LibraryRecord record, @NonNull LibraryRetriever retriever, @NonNull TaskListener listener, @NonNull Run<?,?> run, @NonNull CpsFlowExecution execution) throws Exception {
         String name = record.name;
@@ -222,29 +222,36 @@ static List<URL> retrieve(@NonNull LibraryRecord record, @NonNull LibraryRetriev
                     retrieveLock.readLock().unlock();
                     retrieveLock.writeLock().lockInterruptibly();
                     try {
-                      boolean retrieve = false;
-                      switch (getCacheStatus(cachingConfiguration, versionCacheDir)) {
-                          case VALID:
-                              listener.getLogger().println("Library " + name + "@" + version + " is cached. Copying from home.");
+                        boolean retrieve = false;
+                        switch (getCacheStatus(cachingConfiguration, versionCacheDir)) {
+                            case VALID:
+                                listener.getLogger().println("Library " + name + "@" + version + " is cached. Copying from home.");
                                 break;
-                          case DOES_NOT_EXIST:
-                              retrieve = true;
-                              break;
-                          case EXPIRED:
-                              long cachingMinutes = cachingConfiguration.getRefreshTimeMinutes();
-                              listener.getLogger().println("Library " + name + "@" + version + " is due for a refresh after " + cachingMinutes + " minutes, clearing.");
+                            case DOES_NOT_EXIST:
+                                retrieve = true;
+                                break;
+                            case EXPIRED:
+                                long cachingMinutes = cachingConfiguration.getRefreshTimeMinutes();
+                                listener.getLogger().println("Library " + name + "@" + version + " is due for a refresh after " + cachingMinutes + " minutes, clearing.");
                                 if (versionCacheDir.exists()) {
                                     versionCacheDir.deleteRecursive();
                                     versionCacheDir.withSuffix("-name.txt").delete();
                                 }
                                 retrieve = true;
                                 break;
-                      }
+                        }
 
                         if (retrieve) {
                             listener.getLogger().println("Caching library " + name + "@" + version);
                             versionCacheDir.mkdirs();
-                            retriever.retrieve(name, version, changelog, versionCacheDir, run, listener);
+                            // try to retrieve the library and delete the versionCacheDir if it fails
+                            try {
+                                retriever.retrieve(name, version, changelog, versionCacheDir, run, listener);
+                            } catch (Exception e) {
+                                listener.getLogger().println("Failed to cache library " + name + "@" + version + ". Error message: " + e.getMessage() + ". Cleaning up cache directory.");
+                                versionCacheDir.deleteRecursive();
+                                throw e;
+                            }
                         }
                         retrieveLock.readLock().lock();
                     } finally {
@@ -258,7 +265,7 @@ static List<URL> retrieve(@NonNull LibraryRecord record, @NonNull LibraryRetriev
                 versionCacheDir.withSuffix("-name.txt").write(name, "UTF-8");
                 versionCacheDir.copyRecursiveTo(libDir);
             } finally {
-              retrieveLock.readLock().unlock();
+                retrieveLock.readLock().unlock();
             }
         } else {
             retriever.retrieve(name, version, changelog, libDir, run, listener);