You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ag...@apache.org on 2023/05/04 20:38:14 UTC

[storm] branch master updated: Fix infinite loop when no files are left to remove (#3541)

This is an automated email from the ASF dual-hosted git repository.

agresch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git


The following commit(s) were added to refs/heads/master by this push:
     new 21ee5d945 Fix infinite loop when no files are left to remove (#3541)
21ee5d945 is described below

commit 21ee5d945a5e473ba300f6a4a1e735fc5e442a96
Author: jmartell7 <jo...@gmail.com>
AuthorDate: Thu May 4 15:38:00 2023 -0500

    Fix infinite loop when no files are left to remove (#3541)
    
    An infinite loop can occur when the worker directory takes too much space, but no files are found to remove.
---
 .../java/org/apache/storm/daemon/logviewer/utils/DirectoryCleaner.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/DirectoryCleaner.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/DirectoryCleaner.java
index f4bfcd7c2..8d1da3509 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/DirectoryCleaner.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/DirectoryCleaner.java
@@ -173,6 +173,7 @@ public class DirectoryCleaner {
                 LOG.warn("No more files eligible to be deleted this round, but {} is over {} quota by {} MB",
                         forPerDir ? "worker directory: " + dirs.get(0).toAbsolutePath().normalize() : "log root directory",
                         forPerDir ? "per-worker" : "global", toDeleteSize * 1e-6);
+                break; // No entries left to delete
             }
         }
         return new DeletionMeta(deletedSize, deletedFiles);