You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/01/04 05:49:09 UTC
[1/2] storm git commit: STORM-2840: Getting resource availability
from pre-GRAS supervisors
Repository: storm
Updated Branches:
refs/heads/master 73e5f6746 -> 873028b58
STORM-2840: Getting resource availability from pre-GRAS supervisors
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/05c810af
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/05c810af
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/05c810af
Branch: refs/heads/master
Commit: 05c810af4042c8e5d36824f029f56251f4c0d4d6
Parents: 41d6cdc
Author: Govind Menon <go...@gmail.com>
Authored: Tue Jan 2 13:44:49 2018 -0600
Committer: Govind Menon <go...@gmail.com>
Committed: Tue Jan 2 13:44:49 2018 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/05c810af/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 8db46e8..3097881 100644
--- a/storm-core/src/clj/org/apache/storm/ui/core.clj
+++ b/storm-core/src/clj/org/apache/storm/ui/core.clj
@@ -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) Constants/COMMON_TOTAL_MEMORY_RESOURCE_NAME)
- sup-total-cpu (get (.get_total_resources s) Constants/COMMON_CPU_RESOURCE_NAME)
+ :let [sup-total-mem (get (.get_total_resources s) Constants/COMMON_TOTAL_MEMORY_RESOURCE_NAME (get (.get_total_resources s) Config/SUPERVISOR_MEMORY_CAPACITY_MB))
+ sup-total-cpu (get (.get_total_resources s) Constants/COMMON_CPU_RESOURCE_NAME (get (.get_total_resources s) Config/SUPERVISOR_CPU_CAPACITY))
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) Constants/COMMON_TOTAL_MEMORY_RESOURCE_NAME)
- totalCpu (get (.get_total_resources summary) Constants/COMMON_CPU_RESOURCE_NAME)
+ totalMem (get (.get_total_resources summary) Constants/COMMON_TOTAL_MEMORY_RESOURCE_NAME (get (.get_total_resources summary) Config/SUPERVISOR_MEMORY_CAPACITY_MB))
+ totalCpu (get (.get_total_resources summary) Constants/COMMON_CPU_RESOURCE_NAME (get (.get_total_resources summary) Config/SUPERVISOR_CPU_CAPACITY))
usedMem (.get_used_mem summary)
usedCpu (.get_used_cpu summary)
availMem (max (- totalMem usedMem) 0)
[2/2] storm git commit: Merge branch 'STORM-2840' of
https://github.com/govind-menon/storm into STORM-2840-merge
Posted by ka...@apache.org.
Merge branch 'STORM-2840' of https://github.com/govind-menon/storm into STORM-2840-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/873028b5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/873028b5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/873028b5
Branch: refs/heads/master
Commit: 873028b583e2f8c25d1e9e67f49994d26b457556
Parents: 73e5f67 05c810a
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Jan 4 12:42:10 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jan 4 12:42:10 2018 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------