Merge branch 'ignite-49' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2363b6f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2363b6f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2363b6f Branch: refs/heads/ignite-132 Commit: c2363b6f59123cb6118ab986c05b3a21d8782f55 Parents: 17a1aa2 8be6dbe Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Jan 27 19:40:06 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Jan 27 19:40:06 2015 +0300 ---------------------------------------------------------------------- .../spi/checkpoint/s3/S3CheckpointSpiMBean.java | 12 +- .../integration/ClientAbstractSelfTest.java | 20 +- .../rest/AbstractRestProcessorSelfTest.java | 2 + .../rest/ClientMemcachedProtocolSelfTest.java | 4 +- .../rest/RestBinaryProtocolSelfTest.java | 9 +- .../rest/RestMemcacheProtocolSelfTest.java | 9 +- .../java/org/apache/ignite/IgniteCache.java | 15 + .../org/apache/ignite/cache/CacheMBean.java | 295 ---- .../org/apache/ignite/cache/CacheManager.java | 164 +- .../org/apache/ignite/cache/CacheMetrics.java | 416 +++++- .../java/org/apache/ignite/cache/GridCache.java | 15 +- .../fifo/CacheFifoEvictionPolicyMBean.java | 10 +- ...CacheGgfsPerBlockLruEvictionPolicyMBean.java | 18 +- .../lru/CacheLruEvictionPolicyMBean.java | 10 +- .../random/CacheRandomEvictionPolicyMBean.java | 6 +- .../client/router/GridTcpRouterMBean.java | 16 +- .../apache/ignite/cluster/ClusterMetrics.java | 697 +++++---- .../org/apache/ignite/cluster/ClusterNode.java | 40 +- .../ignite/cluster/ClusterNodeMetrics.java | 695 --------- .../ignite/internal/ClusterGroupAdapter.java | 2 +- .../internal/ClusterLocalNodeMetrics.java | 311 ---- .../ClusterLocalNodeMetricsMXBeanImpl.java | 309 ++++ .../ignite/internal/ClusterMetricsImpl.java | 813 ---------- .../ignite/internal/ClusterMetricsSnapshot.java | 1397 ++++++++++++++++++ .../internal/ClusterNodeMetricsMBean.java | 29 - .../org/apache/ignite/internal/GridGainEx.java | 4 +- .../org/apache/ignite/internal/GridKernal.java | 21 +- .../ignite/internal/IgniteClusterAsyncImpl.java | 1 - .../internal/IgniteThreadPoolMBeanAdapter.java | 149 -- .../internal/IgniteThreadPoolMXBeanAdapter.java | 129 ++ .../ignite/internal/IgnitionMBeanAdapter.java | 59 - .../ignite/internal/IgnitionMXBeanAdapter.java | 59 + .../discovery/GridDiscoveryManager.java | 4 +- .../internal/mxbean/IgniteStandardMXBean.java | 277 ++++ .../apache/ignite/internal/mxbean/package.html | 24 + .../processors/cache/CacheMetricsImpl.java | 586 ++++++++ .../cache/CacheMetricsMXBeanImpl.java | 310 ++++ .../processors/cache/CacheMetricsSnapshot.java | 518 +++++++ .../processors/cache/GridCacheAdapter.java | 377 ++++- .../cache/GridCacheEvictionManager.java | 3 + .../processors/cache/GridCacheMBeanAdapter.java | 217 --- .../processors/cache/GridCacheMapEntry.java | 55 +- .../cache/GridCacheMetricsAdapter.java | 260 ---- .../processors/cache/GridCacheProcessor.java | 37 - .../processors/cache/GridCacheProxyImpl.java | 25 +- .../processors/cache/GridCacheTtlManager.java | 3 + .../processors/cache/IgniteCacheProxy.java | 28 +- .../cache/distributed/dht/GridDhtCache.java | 12 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 30 +- .../dht/colocated/GridDhtColocatedCache.java | 4 +- .../distributed/near/GridNearCacheAdapter.java | 7 - .../distributed/near/GridNearCacheEntry.java | 3 +- .../distributed/near/GridNearGetFuture.java | 8 +- .../distributed/near/GridNearLockFuture.java | 6 +- .../local/atomic/GridLocalAtomicCache.java | 24 +- .../cache/transactions/IgniteTxManager.java | 5 +- .../handlers/cache/GridCacheCommandHandler.java | 7 +- .../handlers/cache/GridCacheRestMetrics.java | 77 +- .../top/GridTopologyCommandHandler.java | 2 +- .../apache/ignite/internal/util/GridUtils.java | 10 +- .../internal/visor/cache/VisorCacheMetrics.java | 37 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../internal/visor/node/VisorNodeGcTask.java | 2 +- .../ignite/mxbean/CacheMetricsMXBean.java | 245 +++ .../mxbean/ClusterLocalNodeMetricsMXBean.java | 240 +++ .../apache/ignite/mxbean/IgniteCacheMXBean.java | 72 - .../org/apache/ignite/mxbean/IgniteMBean.java | 386 ----- .../ignite/mxbean/IgniteMBeanDescription.java | 34 - .../IgniteMBeanParametersDescriptions.java | 34 - .../mxbean/IgniteMBeanParametersNames.java | 34 - .../org/apache/ignite/mxbean/IgniteMXBean.java | 386 +++++ .../ignite/mxbean/IgniteMXBeanDescription.java | 34 + .../IgniteMXBeanParametersDescriptions.java | 34 + .../mxbean/IgniteMXBeanParametersNames.java | 34 + .../ignite/mxbean/IgniteStandardMBean.java | 275 ---- .../ignite/mxbean/IgniteThreadPoolMBean.java | 152 -- .../ignite/mxbean/IgniteThreadPoolMXBean.java | 152 ++ .../org/apache/ignite/mxbean/IgnitionMBean.java | 151 -- .../apache/ignite/mxbean/IgnitionMXBean.java | 151 ++ .../ignite/spi/IgniteSpiManagementMBean.java | 14 +- .../noop/NoopAuthenticationSpiMBean.java | 2 +- .../cache/CacheCheckpointSpiMBean.java | 4 +- .../checkpoint/jdbc/JdbcCheckpointSpiMBean.java | 24 +- .../sharedfs/SharedFsCheckpointSpiMBean.java | 6 +- .../fifoqueue/FifoQueueCollisionSpiMBean.java | 18 +- .../JobStealingCollisionSpiMBean.java | 36 +- .../PriorityQueueCollisionSpiMBean.java | 34 +- .../tcp/TcpCommunicationSpiMBean.java | 58 +- .../local/LocalDeploymentSpiMBean.java | 2 +- .../spi/discovery/DiscoveryMetricsHelper.java | 368 ----- .../spi/discovery/DiscoveryMetricsProvider.java | 2 +- .../discovery/DiscoveryNodeMetricsAdapter.java | 1068 ------------- .../discovery/tcp/TcpClientDiscoverySpi.java | 6 +- .../tcp/TcpClientDiscoverySpiMBean.java | 34 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 62 +- .../tcp/internal/TcpDiscoveryNode.java | 16 +- .../messages/TcpDiscoveryHeartbeatMessage.java | 36 +- .../memory/MemoryEventStorageSpiMBean.java | 10 +- .../failover/always/AlwaysFailoverSpiMBean.java | 6 +- .../JobStealingFailoverSpiMBean.java | 8 +- .../failover/never/NeverFailoverSpiMBean.java | 2 +- .../adaptive/AdaptiveCpuLoadProbe.java | 2 +- .../adaptive/AdaptiveJobCountLoadProbe.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpiMBean.java | 4 +- .../AdaptiveProcessingTimeLoadProbe.java | 2 +- .../RoundRobinLoadBalancingSpiMBean.java | 4 +- .../WeightedRandomLoadBalancingSpiMBean.java | 6 +- .../noop/NoopSecureSessionSpiMBean.java | 2 +- .../swapspace/file/FileSwapSpaceSpiMBean.java | 12 +- .../apache/ignite/streamer/StreamerMBean.java | 34 +- .../ignite/streamer/StreamerStageMBean.java | 24 +- .../ignite/streamer/StreamerWindowMBean.java | 10 +- .../index/StreamerIndexProviderMBean.java | 12 +- .../ignite/internal/ClusterMetricsSelfTest.java | 124 +- .../internal/ClusterNodeMetricsSelfTest.java | 6 +- .../ignite/internal/GridDiscoverySelfTest.java | 2 +- .../internal/GridNonHistoryMetricsSelfTest.java | 4 +- .../GridCheckpointManagerAbstractSelfTest.java | 2 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 752 +++++++++- ...cheTransactionalAbstractMetricsSelfTest.java | 20 +- ...ePartitionedNearDisabledMetricsSelfTest.java | 14 +- ...AtomicPartitionedTckMetricsSelfTestImpl.java | 183 +++ .../near/GridCacheNearMetricsSelfTest.java | 163 +- .../near/GridCacheNearMultiNodeSelfTest.java | 38 +- ...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 161 ++ .../ignite/p2p/GridP2PClassLoadingSelfTest.java | 2 +- ...bStealingCollisionSpiAttributesSelfTest.java | 4 +- ...alingCollisionSpiCustomTopologySelfTest.java | 4 +- .../GridJobStealingCollisionSpiSelfTest.java | 4 +- ...ClusterMetricsSnapshotSerializeSelfTest.java | 126 ++ .../GridDiscoveryMetricsHelperSelfTest.java | 149 -- .../testframework/GridSpiTestContext.java | 6 +- .../ignite/testframework/GridTestNode.java | 8 +- .../junits/spi/GridSpiAbstractTest.java | 2 +- .../IgniteCacheMetricsSelfTestSuite.java | 4 +- .../testsuites/IgniteComputeGridTestSuite.java | 2 +- .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- .../util/GridTopologyHeapSizeSelfTest.java | 4 +- .../ignite/util/mbeans/GridMBeanSelfTest.java | 49 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 5 +- .../uri/GridUriDeploymentSpiMBean.java | 8 +- .../commands/alert/VisorAlertCommand.scala | 7 +- .../commands/top/VisorTopologyCommand.scala | 11 +- .../scala/org/apache/ignite/visor/visor.scala | 6 +- 146 files changed, 8046 insertions(+), 6880 deletions(-) ----------------------------------------------------------------------
