ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/3] ignite git commit: IGNITE-2726 Added per-nodes cache information about off-heap.
Date Wed, 24 Aug 2016 03:15:34 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 2d8b0d00b -> 601f85395


IGNITE-2726 Added per-nodes cache information about off-heap.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8c370c69
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8c370c69
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8c370c69

Branch: refs/heads/master
Commit: 8c370c6927848b66782ecc18df499460c0bfdd11
Parents: 417b269
Author: Vasiliy Sisko <vsisko@gridgain.com>
Authored: Wed Aug 24 10:03:33 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Aug 24 10:03:33 2016 +0700

----------------------------------------------------------------------
 .../visor/commands/cache/VisorCacheCommand.scala    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8c370c69/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 a9f9137..68465de 100755
--- 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
@@ -323,7 +323,7 @@ class VisorCacheCommand {
 
             val sumT = VisorTextTable()
 
-            sumT #= ("Name(@)", "Mode", "Nodes", "Entries (Heap / Off heap)", "Hits", "Misses",
"Reads", "Writes")
+            sumT #= ("Name(@)", "Mode", "Nodes", "Entries (Heap / Off-heap)", "Hits", "Misses",
"Reads", "Writes")
 
             sortAggregatedData(aggrData, sortType.getOrElse("cn"), reversed).foreach(
                 ad => {
@@ -397,7 +397,7 @@ class VisorCacheCommand {
                         (ad.maximumHeapSize() + ad.maximumOffHeapSize()))
                     csT += ("  Heap size Min/Avg/Max", ad.minimumHeapSize() + " / " +
                         formatDouble(ad.averageHeapSize()) + " / " + ad.maximumHeapSize())
-                    csT += ("  Off heap size Min/Avg/Max", ad.minimumOffHeapSize() + " /
" +
+                    csT += ("  Off-heap size Min/Avg/Max", ad.minimumOffHeapSize() + " /
" +
                         formatDouble(ad.averageOffHeapSize()) + " / " + ad.maximumOffHeapSize())
 
                     val ciT = VisorTextTable()
@@ -414,7 +414,15 @@ class VisorCacheCommand {
 
                             formatDouble(nm.getCurrentCpuLoad * 100d) + " %",
                             X.timeSpan2HMSM(nm.getUpTime),
-                            cm.keySize(),
+                            cm match {
+                                case v2: VisorCacheMetricsV2 => (
+                                    "Total: " + (v2.keySize() + v2.offHeapEntriesCount()),
+                                    "  Heap: " + v2.keySize(),
+                                    "  Off-Heap: " + v2.offHeapEntriesCount(),
+                                    "  Off-Heap Memory: " + formatMemory(v2.offHeapAllocatedSize())
+                                )
+                                case v1 => v1.keySize()
+                            },
                             (
                                 "Hi: " + cm.hits(),
                                 "Mi: " + cm.misses(),
@@ -633,7 +641,7 @@ class VisorCacheCommand {
 
         val sumT = VisorTextTable()
 
-        sumT #= ("#", "Name(@)", "Mode", "Size (Heap / Off heap)")
+        sumT #= ("#", "Name(@)", "Mode", "Size (Heap / Off-heap)")
 
         sortedAggrData.indices.foreach(i => {
             val ad = sortedAggrData(i)


Mime
View raw message