Only log top level exception on WARNING when deleting

Signed-off-by: Raihaan Shouhell <raihaan.shouhell@autodesk.com>
jenkinsci · Feb 5, 2020 · a432d29 · a432d29
1 parent a1c604b
commit a432d29
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/main/java/jenkins/branch/WorkspaceLocatorImpl.java b/src/main/java/jenkins/branch/WorkspaceLocatorImpl.java
@@ -549,8 +549,17 @@ public void onOnline(Computer c, TaskListener listener) throws IOException, Inte
                                     try {
                                         child.deleteRecursive();
                                     } catch (IOException x) {
-                                        LOGGER.log(Level.WARNING, "could not delete workspace " + child, x);
-                                        listener.getLogger().println("could not delete workspace " + child + " , wrong file ownership? Review exception in jenkins log and manually remove the directory");
+                                        //Prevent flooding logs if recursive delete fails
+                                        if (x.getSuppressed().length != 0) {
+                                            IOException e = new IOException(x.getMessage(), x.getCause());
+                                            e.setStackTrace(x.getStackTrace());
+                                            LOGGER.log(Level.WARNING, "could not delete workspace " + child + " on " + node.getNodeName() + " check finer logs for more information", e);
+                                            LOGGER.log(Level.FINE, "could not delete workspace " + child + " on " + node.getNodeName() , x);
+                                        } else {
+                                            LOGGER.log(Level.WARNING, "could not delete workspace " + child + " on " + node.getNodeName(), x);
+                                        }
+                                        listener.getLogger().println("could not delete workspace " + child  + " on " + node.getNodeName()
+                                                                        + " , wrong file ownership? Review exception in jenkins log and manually remove the directory");
                                     }
                                 }
                             }