From 4f5f7bf67d9dc94b406679772292fd13accb0041 Mon Sep 17 00:00:00 2001 From: Derek Dagit Date: Tue, 23 Sep 2014 09:24:39 -0500 Subject: [PATCH 1/3] Fix debug string construction --- .../src/clj/backtype/storm/daemon/logviewer.clj | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj index c3868ebb675..528a156abe0 100644 --- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj +++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj @@ -124,11 +124,18 @@ (defn cleanup-fn! [log-root-dir] (let [now-secs (current-time-secs) old-log-files (select-files-for-cleanup *STORM-CONF* (* now-secs 1000) log-root-dir) - dead-worker-files (get-dead-worker-files-and-owners *STORM-CONF* now-secs old-log-files log-root-dir)] + owner->files (get-dead-worker-files-and-owners *STORM-CONF* + now-secs + old-log-files + log-root-dir)] (log-debug "log cleanup: now(" now-secs - ") old log files (" (seq (map #(.getName %) old-log-files)) - ") dead worker files (" (seq (map #(.getName %) dead-worker-files)) ")") - (dofor [{:keys [owner files]} dead-worker-files + ") old log files (" (mapcat #(.getName %) old-log-files) + ") dead worker files (" (mapcat #(for [{f :files} % + :when f] + (.getName f)) + owner->files) + ")") + (dofor [{:keys [owner files]} owner->files file files] (let [path (.getCanonicalPath file)] (log-message "Cleaning up: Removing " path) From 23271ccee2ad74a055e56021c336d6471c6c26e8 Mon Sep 17 00:00:00 2001 From: Derek Dagit Date: Tue, 23 Sep 2014 13:50:55 -0500 Subject: [PATCH 2/3] fix for lazy evaluation of log string --- .../clj/backtype/storm/daemon/logviewer.clj | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj index 528a156abe0..2f3528e65d4 100644 --- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj +++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj @@ -124,18 +124,17 @@ (defn cleanup-fn! [log-root-dir] (let [now-secs (current-time-secs) old-log-files (select-files-for-cleanup *STORM-CONF* (* now-secs 1000) log-root-dir) - owner->files (get-dead-worker-files-and-owners *STORM-CONF* - now-secs - old-log-files - log-root-dir)] + dead-worker-files (get-dead-worker-files-and-owners *STORM-CONF* now-secs old-log-files log-root-dir)] (log-debug "log cleanup: now(" now-secs - ") old log files (" (mapcat #(.getName %) old-log-files) - ") dead worker files (" (mapcat #(for [{f :files} % - :when f] - (.getName f)) - owner->files) + ") old log files (" (->> old-log-files + (map #(.getName %)) + (string/join ",")) + ") dead worker files (" (->> dead-worker-files + (mapcat (fn [{l :files}] l)) + (map #(.getName %)) + (string/join ",")) ")") - (dofor [{:keys [owner files]} owner->files + (dofor [{:keys [owner files]} dead-worker-files file files] (let [path (.getCanonicalPath file)] (log-message "Cleaning up: Removing " path) From 9d605deedcbfcd5e35c697d53e87660ed51a97b2 Mon Sep 17 00:00:00 2001 From: Derek Dagit Date: Wed, 24 Sep 2014 12:14:39 -0500 Subject: [PATCH 3/3] let pr-str do some of the formatting --- .../src/clj/backtype/storm/daemon/logviewer.clj | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj index 2f3528e65d4..38091679f70 100644 --- a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj +++ b/storm-core/src/clj/backtype/storm/daemon/logviewer.clj @@ -125,15 +125,12 @@ (let [now-secs (current-time-secs) old-log-files (select-files-for-cleanup *STORM-CONF* (* now-secs 1000) log-root-dir) dead-worker-files (get-dead-worker-files-and-owners *STORM-CONF* now-secs old-log-files log-root-dir)] - (log-debug "log cleanup: now(" now-secs - ") old log files (" (->> old-log-files - (map #(.getName %)) - (string/join ",")) - ") dead worker files (" (->> dead-worker-files - (mapcat (fn [{l :files}] l)) - (map #(.getName %)) - (string/join ",")) - ")") + (log-debug "log cleanup: now=" now-secs + " old log files " (pr-str (map #(.getName %) old-log-files)) + " dead worker files " (->> dead-worker-files + (mapcat (fn [{l :files}] l)) + (map #(.getName %)) + (pr-str))) (dofor [{:keys [owner files]} dead-worker-files file files] (let [path (.getCanonicalPath file)]