Repository: ignite Updated Branches: refs/heads/master 61b38977f -> a8112fbfd
IGNITE-8506 Visor CMD: Added output of node "Consistent ID". Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a8112fbf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a8112fbf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a8112fbf Branch: refs/heads/master Commit: a8112fbfd73573f32f252071ad19c733bf46123d Parents: 61b3897 Author: Vasiliy Sisko <vsi...@gridgain.com> Authored: Tue Jun 19 14:55:43 2018 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Tue Jun 19 14:55:43 2018 +0700 ---------------------------------------------------------------------- .../commands/config/VisorConfigurationCommand.scala | 2 +- .../ignite/visor/commands/node/VisorNodeCommand.scala | 1 + .../visor/commands/top/VisorTopologyCommand.scala | 14 +++++++++----- .../main/scala/org/apache/ignite/visor/visor.scala | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a8112fbf/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala index 1a82381..86a6a59 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala @@ -154,7 +154,7 @@ class VisorConfigurationCommand extends VisorConsoleCommand { cmnT += ("Grid name", escapeName(basic.getIgniteInstanceName)) cmnT += ("Ignite home", safe(basic.getGgHome)) cmnT += ("Localhost", safe(basic.getLocalHost)) - cmnT += ("Consistent ID", safe(basic.getConsistentId)) + cmnT += ("Consistent ID", safe(basic.getConsistentId, "<Not configured explicitly>")) cmnT += ("Marshaller", basic.getMarshaller) cmnT += ("Deployment mode", safe(basic.getDeploymentMode)) cmnT += ("ClientMode", javaBoolToStr(basic.isClientMode)) http://git-wip-us.apache.org/repos/asf/ignite/blob/a8112fbf/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala index 6e1a339..861ed5d 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala @@ -206,6 +206,7 @@ class VisorNodeCommand extends VisorConsoleCommand { t += ("ID", node.id) t += ("ID8", nid8(node)) + t += ("Consistent ID", node.consistentId()) t += ("Node Type", if (node.isClient) "Client" else "Server") t += ("Order", node.order) http://git-wip-us.apache.org/repos/asf/ignite/blob/a8112fbf/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 79858ee..094239a 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 @@ -149,9 +149,9 @@ class VisorTopologyCommand extends VisorConsoleCommand { val argLst = parseArgs(args) if (hasArgFlag("activate", argLst)) - ignite.active(true) + ignite.cluster().active(true) else if (hasArgFlag("deactivate", argLst)) - ignite.active(false) + ignite.cluster().active(false) else { val hosts = argLst.filter(_._1 == "h").map((a: Arg) => try @@ -242,7 +242,7 @@ class VisorTopologyCommand extends VisorConsoleCommand { if (all) { val nodesT = VisorTextTable() - nodesT #= ("Node ID8(@), IP", "Start Time", "Up Time", + nodesT #= ("Node ID8(@), IP", "Consistent ID", "Start Time", "Up Time", //"Idle Time", "CPUs", "CPU Load", "Free Heap") @@ -258,6 +258,7 @@ class VisorTopologyCommand extends VisorConsoleCommand { // Add row. nodesT += ( nodeId8Addr(n.id), + n.consistentId(), formatDateTime(m.getStartTime), X.timeSpan2HMS(m.getUpTime), m.getTotalCpus, @@ -277,12 +278,13 @@ class VisorTopologyCommand extends VisorConsoleCommand { val hostsT = VisorTextTable() - hostsT #= ("Int./Ext. IPs", "Node ID8(@)","Node Type", "OS", "CPUs", "MACs", "CPU Load") + hostsT #= ("Int./Ext. IPs", "Node ID8(@)", "Node consistent ID", "Node Type", "OS", "CPUs", "MACs", "CPU Load") neighborhood.foreach { case (_, neighbors) => var ips = Set.empty[String] var id8s = List.empty[String] + var consistentIds = List.empty[String] var nodeTypes = List.empty[String] var macs = Set.empty[String] var cpuLoadSum = 0.0 @@ -301,6 +303,7 @@ class VisorTopologyCommand extends VisorConsoleCommand { neighbors.foreach(n => { id8s = id8s :+ (i.toString + ": " + nodeId8(n.id)) + consistentIds = consistentIds :+ n.consistentId().toString nodeTypes = nodeTypes :+ (if (n.isClient) "Client" else "Server") i += 1 @@ -316,6 +319,7 @@ class VisorTopologyCommand extends VisorConsoleCommand { hostsT += ( ips.toSeq, id8s, + consistentIds, nodeTypes, os, cpus, @@ -336,7 +340,7 @@ class VisorTopologyCommand extends VisorConsoleCommand { val sumT = VisorTextTable() - sumT += ("Active", ignite.active) + sumT += ("Active", ignite.cluster().active()) sumT += ("Total hosts", U.neighborhood(nodes).size) sumT += ("Total nodes", m.getTotalNodes) sumT += ("Total CPUs", m.getTotalCpus) http://git-wip-us.apache.org/repos/asf/ignite/blob/a8112fbf/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 64dd29a..9eeea2d 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 @@ -1896,7 +1896,7 @@ object visor extends VisorTag { val t = VisorTextTable() - t #= ("#", "Node ID8(@), IP","Node Type", "Up Time", "CPUs", "CPU Load", "Free Heap") + t #= ("#", "Node ID8(@), IP", "Consistent ID", "Node Type", "Up Time", "CPUs", "CPU Load", "Free Heap") val nodes = ignite.cluster.nodes().toList @@ -1922,6 +1922,7 @@ object visor extends VisorTag { t += ( i, nodeId8Addr(n.id), + n.consistentId(), if (n.isClient) "Client" else "Server", X.timeSpan2HMS(m.getUpTime), n.metrics.getTotalCpus,
