Merge pull request #1442 from scm-manager/feature/improve_plugin_update_logging

Improve logging for plugin update installation

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Fixed
+- Improved logging of failures during plugin installation ([#1442](https://github.com/scm-manager/scm-manager/pull/1442))
+- Do not throw exception when plugin file does not exist on cancelled installation ([#1442](https://github.com/scm-manager/scm-manager/pull/1442))
+
 ## [2.10.0] - 2020-11-20
 ### Added
 - Delete branches directly in the UI ([#1422](https://github.com/scm-manager/scm-manager/pull/1422))

scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java

@@ -192,10 +192,16 @@ public class DefaultPluginManager implements PluginManager {
         dependencyTracker.addInstalled(plugin.getDescriptor());
         pendingInstallations.add(pending);
         eventBus.post(new PluginEvent(PluginEvent.PluginEventType.INSTALLED, plugin));
-      } catch (PluginInstallException ex) {
-        cancelPending(pendingInstallations);
-        eventBus.post(new PluginEvent(PluginEvent.PluginEventType.INSTALLATION_FAILED, plugin));
-        throw ex;
+      } catch (PluginInstallException installException) {
+        try {
+          cancelPending(pendingInstallations);
+        } catch (PluginFailedToCancelInstallationException cancelInstallationException) {
+          LOG.error("could not install plugin {}; uninstallation failed (see next exception)", plugin.getDescriptor().getInformation().getName(), installException);
+          throw cancelInstallationException;
+        } finally {
+          eventBus.post(new PluginEvent(PluginEvent.PluginEventType.INSTALLATION_FAILED, plugin));
+        }
+        throw installException;
       }
     }
 

scm-webapp/src/main/java/sonia/scm/plugin/PendingPluginInstallation.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-    
+
 package sonia.scm.plugin;
 
 import org.slf4j.Logger;
@@ -50,10 +50,14 @@ class PendingPluginInstallation {
   void cancel() {
     String name = plugin.getDescriptor().getInformation().getName();
     LOG.info("cancel installation of plugin {}", name);
-    try {
-      Files.delete(file);
-    } catch (IOException ex) {
-      throw new PluginFailedToCancelInstallationException("failed to cancel plugin installation ", name, ex);
+    if (Files.exists(file)) {
+      try {
+        Files.delete(file);
+      } catch (IOException ex) {
+        throw new PluginFailedToCancelInstallationException("failed to cancel plugin installation ", name, ex);
+      }
+    } else {
+      LOG.info("plugin file {} did not exists for plugin {}; nothing deleted", file, name);
     }
   }
 }

scm-webapp/src/test/java/sonia/scm/plugin/PendingPluginInstallationTest.java

@@ -59,8 +59,13 @@ class PendingPluginInstallationTest {
   }
 
   @Test
-  void shouldThrowExceptionIfCancelFailed(@TempDir Path directory) {
+  void shouldThrowExceptionIfCancelFailed(@TempDir Path directory) throws IOException {
     Path file = directory.resolve("file");
+    Files.createDirectory(file);
+
+    Path makeFileNotDeletable = file.resolve("not_deletable");
+    Files.write(makeFileNotDeletable, "42".getBytes());
+
     when(plugin.getDescriptor().getInformation().getName()).thenReturn("scm-awesome-plugin");
 
     PendingPluginInstallation installation = new PendingPluginInstallation(plugin, file);