Repository: storm Updated Branches: refs/heads/master 5b0afe2fc -> a1e6e98c6
STORM-3221: Fixing utilization in clusterSummary API call Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/14965c70 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/14965c70 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/14965c70 Branch: refs/heads/master Commit: 14965c706c04686b8bc9f376c17f63c1cc82e208 Parents: 8f9061a Author: Govind Menon <[email protected]> Authored: Wed Sep 12 10:45:53 2018 -0500 Committer: Govind Menon <[email protected]> Committed: Wed Sep 12 11:07:33 2018 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/storm/daemon/ui/UIHelpers.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/14965c70/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java ---------------------------------------------------------------------- diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java index a080599..9275389 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java @@ -582,11 +582,9 @@ public class UIHelpers { result.put("schedulerDisplayResource", conf.get(DaemonConfig.SCHEDULER_DISPLAY_RESOURCE)); result.put("memAssignedPercentUtil", supervisorTotalMemory > 0 - ? String.valueOf((supervisorTotalMemory - supervisorUsedMemory) * 100.0 - / supervisorTotalMemory) : "0.0"); + ? StatsUtil.floatStr((supervisorUsedMemory * 100.0) / supervisorTotalMemory) : "0.0"); result.put("cpuAssignedPercentUtil", supervisorTotalCpu > 0 - ? String.valueOf((supervisorTotalCpu - supervisorUsedCpu) * 100.0 - / supervisorTotalCpu) : "0.0"); + ? StatsUtil.floatStr((supervisorUsedCpu * 100.0) / supervisorTotalCpu) : "0.0"); result.put("bugtracker-url", conf.get(DaemonConfig.UI_PROJECT_BUGTRACKER_URL)); result.put("central-log-url", conf.get(DaemonConfig.UI_CENTRAL_LOGGING_URL)); return result;
