You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by et...@apache.org on 2019/07/01 17:16:05 UTC
[storm] branch master updated: [STORM-3423] add more info to
logviewer directory cleaner log
This is an automated email from the ASF dual-hosted git repository.
ethanli 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 cb1bdc6 [STORM-3423] add more info to logviewer directory cleaner log
new 5d582b4 Merge pull request #3040 from RuiLi8080/STORM-3423
cb1bdc6 is described below
commit cb1bdc629774760533fc285e2703813250707c4a
Author: ruili8080 <ru...@verizonmedia.com>
AuthorDate: Fri Jun 28 16:14:02 2019 -0500
[STORM-3423] add more info to logviewer directory cleaner log
---
.../java/org/apache/storm/daemon/logviewer/utils/DirectoryCleaner.java | 3 +++
.../main/java/org/apache/storm/daemon/logviewer/utils/WorkerLogs.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
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 5cd598a..b8f8ac4 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
@@ -170,6 +170,9 @@ public class DirectoryCleaner {
} else {
LOG.warn("No more files able to delete this round, but {} is over quota by {} MB",
forPerDir ? "this directory" : "root directory", toDeleteSize * 1e-6);
+ 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);
}
}
return new DeletionMeta(deletedSize, deletedFiles);
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/WorkerLogs.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/WorkerLogs.java
index 3164aef..0d5b14a 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/WorkerLogs.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/utils/WorkerLogs.java
@@ -125,7 +125,7 @@ public class WorkerLogs {
}
/**
- * Return a set of all worker directories in root log directory.
+ * Return a set of all worker directories in all topology directories in root log directory.
*/
public Set<Path> getAllWorkerDirs() {
try (Stream<Path> topoDirs = Files.list(logRootDir)) {