# ignite-236 Fixed avg free heap for topology command.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/150a3fb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/150a3fb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/150a3fb7 Branch: refs/heads/sprint-1-release Commit: 150a3fb72803153afa768df426a13f754914d243 Parents: 1194fdc Author: anovikov <anovi...@gridgain.com> Authored: Mon Feb 16 17:29:22 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Mon Feb 16 17:29:22 2015 +0700 ---------------------------------------------------------------------- .../apache/ignite/visor/commands/cache/VisorCacheCommand.scala | 2 +- .../apache/ignite/visor/commands/top/VisorTopologyCommand.scala | 3 +-- .../src/main/scala/org/apache/ignite/visor/visor.scala | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/150a3fb7/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala index 775a696..21aae23 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala @@ -365,7 +365,7 @@ class VisorCacheCommand { ciT += ( nodeId8Addr(nid), nm.getTotalCpus, - formatDouble(nm.getHeapMemoryUsed() / nm.getHeapMemoryMaximum() * 100.0d) + " %", + formatDouble(nm.getHeapMemoryUsed / nm.getHeapMemoryMaximum * 100.0d) + " %", formatDouble(nm.getCurrentCpuLoad * 100.0) + " %", X.timeSpan2HMSM(nm.getUpTime), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/150a3fb7/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala index 3684b9a..6002102 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala @@ -329,8 +329,7 @@ class VisorTopologyCommand { val m = ignite.forNodes(nodes).metrics() - val freeHeap = (m.getHeapMemoryMaximum - m.getHeapMemoryUsed) * 100 / - m.getHeapMemoryMaximum + val freeHeap = (m.getHeapMemoryTotal - m.getHeapMemoryUsed) * 100 / m.getHeapMemoryTotal val sumT = VisorTextTable() http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/150a3fb7/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala index 6c51062..83abc22 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala @@ -2516,7 +2516,7 @@ object visor extends VisorTag { IgniteUtils.neighborhood(ignite.nodes()).size.toString.padTo(4, ' ') + pipe + ignite.nodes().size().toString.padTo(4, ' ') + pipe + m.getTotalCpus.toString.padTo(4, ' ') + pipe + - bar(m.getAverageCpuLoad, m.getHeapMemoryUsed / m.getHeapMemoryMaximum) + pipe + bar(m.getAverageCpuLoad, m.getHeapMemoryUsed / m.getHeapMemoryTotal) + pipe ) }
