You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by go...@apache.org on 2019/07/01 17:41:20 UTC
[storm] branch master updated (5d582b4 -> 4568fb4)
This is an automated email from the ASF dual-hosted git repository.
govind pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git.
from 5d582b4 Merge pull request #3040 from RuiLi8080/STORM-3423
add 26c471a STORM-3407 Storm 2.x ConstraintSolverStrategy backward compatibility
new 4ec0180 [STORM-3423] add more info to logviewer directory cleaner log
new 4568fb4 Merge branch 'STORM-3407'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
conf/defaults.yaml | 2 ++
storm-client/src/jvm/org/apache/storm/Config.java | 7 +++++
.../main/java/org/apache/storm/DaemonConfig.java | 7 +++++
.../scheduling/ConstraintSolverStrategy.java | 31 +++++++++++++++-------
.../scheduling/TestConstraintSolverStrategy.java | 2 ++
5 files changed, 39 insertions(+), 10 deletions(-)
[storm] 02/02: Merge branch 'STORM-3407'
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
govind pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
commit 4568fb47d7bbce9d4c1194bd0a925bfa0b16d9ad
Merge: 5d582b4 4ec0180
Author: Govind Menon <go...@gmail.com>
AuthorDate: Mon Jul 1 12:40:51 2019 -0500
Merge branch 'STORM-3407'
conf/defaults.yaml | 2 ++
storm-client/src/jvm/org/apache/storm/Config.java | 7 +++++
.../main/java/org/apache/storm/DaemonConfig.java | 7 +++++
.../scheduling/ConstraintSolverStrategy.java | 31 +++++++++++++++-------
.../scheduling/TestConstraintSolverStrategy.java | 2 ++
5 files changed, 39 insertions(+), 10 deletions(-)
[storm] 01/02: [STORM-3423] add more info to logviewer directory
cleaner log
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
govind pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
commit 4ec0180d779612a1e7dfdb18e3a99a3969287e10
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)) {