Repository: storm Updated Branches: refs/heads/1.x-branch 96d190e8c -> 7670c6350
[STORM-1671] Enable logviewer to delete a dir without yaml Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9a369dea Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9a369dea Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9a369dea Branch: refs/heads/1.x-branch Commit: 9a369deacbdefea5b16cfc51950cab952a2e4b27 Parents: 96d190e Author: P. Taylor Goetz <[email protected]> Authored: Fri Apr 1 15:27:23 2016 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Fri Apr 1 15:27:23 2016 -0400 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/daemon/logviewer.clj | 7 ++++--- .../src/jvm/org/apache/storm/daemon/DirectoryCleaner.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/9a369dea/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj b/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj index 1fcb5d5..7baeae7 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj @@ -149,9 +149,10 @@ (defn identify-worker-log-dirs [log-dirs] "return the workerid to worker-log-dir map" (into {} (for [logdir log-dirs - :let [metaFile (get-metadata-file-for-wroker-logdir logdir)] - :when metaFile] - {(get-worker-id-from-metadata-file metaFile) logdir}))) + :let [metaFile (get-metadata-file-for-wroker-logdir logdir)]] + (if metaFile + {(get-worker-id-from-metadata-file metaFile) logdir} + {"" logdir})))) ;; an old directory that has no yaml file will be treated as a dead dir for deleting (defn get-alive-ids [conf now-secs] http://git-wip-us.apache.org/repos/asf/storm/blob/9a369dea/storm-core/src/jvm/org/apache/storm/daemon/DirectoryCleaner.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/daemon/DirectoryCleaner.java b/storm-core/src/jvm/org/apache/storm/daemon/DirectoryCleaner.java index a51a49e..047e024 100644 --- a/storm-core/src/jvm/org/apache/storm/daemon/DirectoryCleaner.java +++ b/storm-core/src/jvm/org/apache/storm/daemon/DirectoryCleaner.java @@ -138,7 +138,7 @@ public class DirectoryCleaner { while (!stack.isEmpty() && toDeleteSize > 0) { File file = stack.pop(); toDeleteSize -= file.length(); - LOG.info("Delete file: {}, size: {}, lastModified: {}", file.getName(), file.length(), file.lastModified()); + LOG.info("Delete file: {}, size: {}, lastModified: {}", file.getCanonicalPath(), file.length(), file.lastModified()); file.delete(); deletedFiles++; }
