Merge remote-tracking branch 'remotes/origin/master' into ignite-zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0cf77836 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0cf77836 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0cf77836 Branch: refs/heads/ignite-zk Commit: 0cf77836336bb95a7a60959bf1f5ea41319b2ce8 Parents: b78183f 2847ead Author: sboikov <[email protected]> Authored: Tue Dec 12 11:24:49 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Dec 12 11:24:49 2017 +0300 ---------------------------------------------------------------------- .../ClusterLocalNodeMetricsMXBeanImpl.java | 62 +++- .../internal/ClusterMetricsMXBeanImpl.java | 45 +-- .../apache/ignite/internal/IgniteKernal.java | 13 +- .../cache/CacheGroupMetricsMXBeanImpl.java | 7 +- .../ignite/mxbean/CacheGroupMetricsMXBean.java | 10 +- .../mxbean/ClusterLocalNodeMetricsMXBean.java | 257 ---------------- .../ignite/mxbean/ClusterMetricsMXBean.java | 290 +++++++++++++++++-- .../tcp/TcpCommunicationMetricsListener.java | 19 +- .../communication/tcp/TcpCommunicationSpi.java | 18 +- .../tcp/TcpCommunicationSpiMBean.java | 5 +- .../internal/ClusterNodeMetricsSelfTest.java | 153 +++++++--- .../cache/CacheGroupMetricsMBeanTest.java | 12 + .../cache/CacheValidatorMetricsTest.java | 5 + .../tcp/TcpCommunicationStatisticsTest.java | 26 +- .../ignite/visor/commands/VisorConsole.scala | 1 + .../commands/cache/VisorCacheCommand.scala | 126 ++++---- .../cache/VisorCacheRebalanceCommand.scala | 134 +++++++++ 17 files changed, 719 insertions(+), 464 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0cf77836/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0cf77836/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ----------------------------------------------------------------------
