Repository: storm Updated Branches: refs/heads/master 9063524f3 -> 32fefef83
STORM-2808: Fix for NPE in UI Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b25d5807 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b25d5807 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b25d5807 Branch: refs/heads/master Commit: b25d580780d31598f568bbe8dde800fe4b0d6f61 Parents: ee1be2b Author: Govind Menon <[email protected]> Authored: Fri Nov 10 17:23:06 2017 -0600 Committer: Govind Menon <[email protected]> Committed: Fri Nov 10 17:24:10 2017 -0600 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/ui/core.clj | 10 +++++----- .../main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/b25d5807/storm-core/src/clj/org/apache/storm/ui/core.clj ---------------------------------------------------------------------- diff --git a/storm-core/src/clj/org/apache/storm/ui/core.clj b/storm-core/src/clj/org/apache/storm/ui/core.clj index 247ff4a..d12ff74 100644 --- a/storm-core/src/clj/org/apache/storm/ui/core.clj +++ b/storm-core/src/clj/org/apache/storm/ui/core.clj @@ -46,7 +46,7 @@ (:import [org.apache.storm.generated AuthorizationException ProfileRequest ProfileAction NodeInfo]) (:import [org.apache.storm.security.auth AuthUtils]) (:import [org.apache.storm.utils VersionInfo ConfigUtils Utils WebAppUtils]) - (:import [org.apache.storm Config]) + (:import [org.apache.storm Config Constants]) (:import [java.io File]) (:import [java.net URLEncoder URLDecoder]) (:import [org.json.simple JSONValue]) @@ -425,8 +425,8 @@ resourceSummary (if (> (.size sups) 0) (reduce #(map + %1 %2) (for [^SupervisorSummary s sups - :let [sup-total-mem (get (.get_total_resources s) Config/SUPERVISOR_MEMORY_CAPACITY_MB) - sup-total-cpu (get (.get_total_resources s) Config/SUPERVISOR_CPU_CAPACITY) + :let [sup-total-mem (get (.get_total_resources s) Constants/COMMON_TOTAL_MEMORY_RESOURCE_NAME) + sup-total-cpu (get (.get_total_resources s) Constants/COMMON_CPU_RESOURCE_NAME) sup-avail-mem (max (- sup-total-mem (.get_used_mem s)) 0.0) sup-avail-cpu (max (- sup-total-cpu (.get_used_cpu s)) 0.0) sup-fragmented-cpu (.get_fragmented_cpu s) @@ -518,8 +518,8 @@ (let [slotsTotal (.get_num_workers summary) slotsUsed (.get_num_used_workers summary) slotsFree (max (- slotsTotal slotsUsed) 0) - totalMem (get (.get_total_resources summary) Config/SUPERVISOR_MEMORY_CAPACITY_MB) - totalCpu (get (.get_total_resources summary) Config/SUPERVISOR_CPU_CAPACITY) + totalMem (get (.get_total_resources summary) Constants/COMMON_TOTAL_MEMORY_RESOURCE_NAME) + totalCpu (get (.get_total_resources summary) Constants/COMMON_CPU_RESOURCE_NAME) usedMem (.get_used_mem summary) usedCpu (.get_used_cpu summary) availMem (max (- totalMem usedMem) 0) http://git-wip-us.apache.org/repos/asf/storm/blob/b25d5807/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java ---------------------------------------------------------------------- diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java index 2da7b19..f878cf0 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java @@ -958,8 +958,8 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon { List<DataPoint> metrics = new ArrayList<>(); metrics.add(new DataPoint("slotsTotal", sup.get_num_workers())); metrics.add(new DataPoint("slotsUsed", sup.get_num_used_workers())); - metrics.add(new DataPoint("totalMem", sup.get_total_resources().get(Config.SUPERVISOR_MEMORY_CAPACITY_MB))); - metrics.add(new DataPoint("totalCpu", sup.get_total_resources().get(Config.SUPERVISOR_CPU_CAPACITY))); + metrics.add(new DataPoint("totalMem", sup.get_total_resources().get(Constants.COMMON_TOTAL_MEMORY_RESOURCE_NAME))); + metrics.add(new DataPoint("totalCpu", sup.get_total_resources().get(Constants.COMMON_CPU_RESOURCE_NAME))); metrics.add(new DataPoint("usedMem", sup.get_used_mem())); metrics.add(new DataPoint("usedCpu", sup.get_used_cpu())); ret.put(info, metrics);
