http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMBeanAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMBeanAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMBeanAdapter.java deleted file mode 100644 index daa4cc8..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMBeanAdapter.java +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gridgain.grid.kernal.processors.cache; - -import org.apache.ignite.*; -import org.gridgain.grid.cache.*; - -/** - * Management bean that provides access to {@link GridCache}. - */ -class GridCacheMBeanAdapter implements GridCacheMBean { - /** Cache context. */ - private GridCacheContext<?, ?> cctx; - - /** DHT context. */ - private GridCacheContext<?, ?> dhtCtx; - - /** Write-behind store, if configured. */ - private GridCacheWriteBehindStore store; - - /** - * Creates MBean; - * - * @param cctx Cache context. - */ - GridCacheMBeanAdapter(GridCacheContext<?, ?> cctx) { - assert cctx != null; - - this.cctx = cctx; - - if (cctx.isNear()) - dhtCtx = cctx.near().dht().context(); - - if (cctx.store().store() instanceof GridCacheWriteBehindStore) - store = (GridCacheWriteBehindStore)cctx.store().store(); - } - - /** {@inheritDoc} */ - @Override public String name() { - return cctx.name(); - } - - /** {@inheritDoc} */ - @Override public String metricsFormatted() { - return String.valueOf(cctx.cache().metrics()); - } - - /** {@inheritDoc} */ - @Override public long getOverflowSize() { - try { - return cctx.cache().overflowSize(); - } - catch (IgniteCheckedException ignored) { - return -1; - } - } - - /** {@inheritDoc} */ - @Override public long getOffHeapEntriesCount() { - return cctx.cache().offHeapEntriesCount(); - } - - /** {@inheritDoc} */ - @Override public long getOffHeapAllocatedSize() { - return cctx.cache().offHeapAllocatedSize(); - } - - /** {@inheritDoc} */ - @Override public int getSize() { - return cctx.cache().size(); - } - - /** {@inheritDoc} */ - @Override public int getKeySize() { - return cctx.cache().size(); - } - - /** {@inheritDoc} */ - @Override public boolean isEmpty() { - return cctx.cache().isEmpty(); - } - - /** {@inheritDoc} */ - @Override public int getDhtEvictQueueCurrentSize() { - return cctx.isNear() ? dhtCtx.evicts().evictQueueSize() : cctx.evicts().evictQueueSize(); - } - - /** {@inheritDoc} */ - @Override public int getTxCommitQueueSize() { - return cctx.tm().commitQueueSize(); - } - - /** {@inheritDoc} */ - @Override public int getTxThreadMapSize() { - return cctx.tm().threadMapSize(); - } - - /** {@inheritDoc} */ - @Override public int getTxXidMapSize() { - return cctx.tm().idMapSize(); - } - - /** {@inheritDoc} */ - @Override public int getTxPrepareQueueSize() { - return cctx.tm().prepareQueueSize(); - } - - /** {@inheritDoc} */ - @Override public int getTxStartVersionCountsSize() { - return cctx.tm().startVersionCountsSize(); - } - - /** {@inheritDoc} */ - @Override public int getTxCommittedVersionsSize() { - return cctx.tm().committedVersionsSize(); - } - - /** {@inheritDoc} */ - @Override public int getTxRolledbackVersionsSize() { - return cctx.tm().rolledbackVersionsSize(); - } - - /** {@inheritDoc} */ - @Override public int getTxDhtThreadMapSize() { - return cctx.isNear() ? dhtCtx.tm().threadMapSize() : -1; - } - - /** {@inheritDoc} */ - @Override public int getTxDhtXidMapSize() { - return cctx.isNear() ? dhtCtx.tm().idMapSize() : -1; - } - - /** {@inheritDoc} */ - @Override public int getTxDhtCommitQueueSize() { - return cctx.isNear() ? dhtCtx.tm().commitQueueSize() : -1; - } - - /** {@inheritDoc} */ - @Override public int getTxDhtPrepareQueueSize() { - return cctx.isNear() ? dhtCtx.tm().prepareQueueSize() : -1; - } - - /** {@inheritDoc} */ - @Override public int getTxDhtStartVersionCountsSize() { - return cctx.isNear() ? dhtCtx.tm().startVersionCountsSize() : -1; - } - - /** {@inheritDoc} */ - @Override public int getTxDhtCommittedVersionsSize() { - return cctx.isNear() ? dhtCtx.tm().committedVersionsSize() : -1; - } - - /** {@inheritDoc} */ - @Override public int getTxDhtRolledbackVersionsSize() { - return cctx.isNear() ? dhtCtx.tm().rolledbackVersionsSize() : -1; - } - - /** {@inheritDoc} */ - @Override public boolean isWriteBehindEnabled() { - return store != null; - } - - /** {@inheritDoc} */ - @Override public int getWriteBehindFlushSize() { - return store != null ? store.getWriteBehindFlushSize() : -1; - } - - /** {@inheritDoc} */ - @Override public int getWriteBehindFlushThreadCount() { - return store != null ? store.getWriteBehindFlushThreadCount() : -1; - } - - /** {@inheritDoc} */ - @Override public long getWriteBehindFlushFrequency() { - return store != null ? store.getWriteBehindFlushFrequency() : -1; - } - - /** {@inheritDoc} */ - @Override public int getWriteBehindStoreBatchSize() { - return store != null ? store.getWriteBehindStoreBatchSize() : -1; - } - - /** {@inheritDoc} */ - @Override public int getWriteBehindTotalCriticalOverflowCount() { - return store != null ? store.getWriteBehindTotalCriticalOverflowCount() : -1; - } - - /** {@inheritDoc} */ - @Override public int getWriteBehindCriticalOverflowCount() { - return store != null ? store.getWriteBehindCriticalOverflowCount() : -1; - } - - /** {@inheritDoc} */ - @Override public int getWriteBehindErrorRetryCount() { - return store != null ? store.getWriteBehindErrorRetryCount() : -1; - } - - /** {@inheritDoc} */ - @Override public int getWriteBehindBufferSize() { - return store != null ? store.getWriteBehindBufferSize() : -1; - } -}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java index cb683d1..611e2cb 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java @@ -896,7 +896,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (GridCacheAdapter<?, ?> cache : caches.values()) { try { ObjectName mb = U.registerCacheMBean(mBeanSrv, ctx.gridName(), cache.name(), "Cache", - new GridCacheMBeanAdapter(cache.context()), GridCacheMBean.class); + new CacheMxBeanAdapter(cache.context()), IgniteCacheMxBean.class); cacheMBeans.add(mb); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java index d609560..5c986cf 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java @@ -196,7 +196,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public CacheMetricsMxBean metrics() { + @Override public CacheMetrics metrics() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCache.java index c3dbd18..b964ccf 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtCache.java @@ -71,7 +71,7 @@ public class GridDhtCache<K, V> extends GridDhtTransactionalCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public void start() throws IgniteCheckedException { - CacheMetricsMxBeanImpl m = new CacheMetricsMxBeanImpl(); + CacheMetricsImpl m = new CacheMetricsImpl(); m.delegate(ctx.dht().near().metrics0()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index d12c879..7435ccd 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -23,7 +23,6 @@ import org.apache.ignite.lang.*; import org.apache.ignite.plugin.security.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; @@ -155,7 +154,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { @Override public void start() throws IgniteCheckedException { super.start(); - CacheMetricsMxBeanImpl m = new CacheMetricsMxBeanImpl(); + CacheMetricsImpl m = new CacheMetricsImpl(); if (ctx.dht().near() != null) m.delegate(ctx.dht().near().metrics0()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java index b179ea8..1aef752 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java @@ -1137,7 +1137,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { /** {@inheritDoc} */ @Override public IgniteFuture<?> applyx(GridCacheProjection<Object, Object> c, GridKernalContext ctx) { - CacheMetricsMxBean metrics = c.cache().metrics(); + CacheMetrics metrics = c.cache().metrics(); assert metrics != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/top/GridTopologyCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/top/GridTopologyCommandHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/top/GridTopologyCommandHandler.java index 084444a..8560db3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/top/GridTopologyCommandHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/top/GridTopologyCommandHandler.java @@ -201,7 +201,7 @@ public class GridTopologyCommandHandler extends GridRestCommandHandlerAdapter { } if (mtr) { - ClusterNodeMetricsMBean metrics = node.metrics(); + ClusterNodeMetrics metrics = node.metrics(); GridClientNodeMetricsBean metricsBean = new GridClientNodeMetricsBean(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetrics.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetrics.java index 1d82d47..4040954 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetrics.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/cache/VisorCacheMetrics.java @@ -23,7 +23,7 @@ import org.gridgain.grid.util.typedef.internal.*; import java.io.*; /** - * Data transfer object for {@link org.gridgain.grid.cache.CacheMetricsMxBean}. + * Data transfer object for {@link org.gridgain.grid.cache.CacheMetrics}. */ public class VisorCacheMetrics implements Serializable { /** */ @@ -100,7 +100,7 @@ public class VisorCacheMetrics implements Serializable { public static VisorCacheMetrics from(GridCache c) { VisorCacheMetrics cm = new VisorCacheMetrics(); - CacheMetricsMxBean m = c.metrics(); + CacheMetrics m = c.metrics(); cm.size = c.size(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java index 356b482..edf5020 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorNodeGcTask.java @@ -87,7 +87,7 @@ public class VisorNodeGcTask extends VisorMultiNodeTask<Void, Map<UUID, IgniteBi * @return Current free heap. */ private long freeHeap(ClusterNode node) { - final ClusterNodeMetricsMBean m = node.metrics(); + final ClusterNodeMetrics m = node.metrics(); return m.getHeapMemoryMaximum() - m.getHeapMemoryUsed(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java index de2ebc6..d3e5a71 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java @@ -793,7 +793,7 @@ public abstract class GridUtils { double heap = 0.0; for (ClusterNode n : nodesPerJvm(nodes)) { - ClusterNodeMetricsMBean m = n.metrics(); + ClusterNodeMetrics m = n.metrics(); heap += Math.max(m.getHeapMemoryInitialized(), m.getHeapMemoryMaximum()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridDiscoveryMetricsHelperSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridDiscoveryMetricsHelperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridDiscoveryMetricsHelperSelfTest.java index 04b13ba..7fd7847 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridDiscoveryMetricsHelperSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/GridDiscoveryMetricsHelperSelfTest.java @@ -46,7 +46,7 @@ public class GridDiscoveryMetricsHelperSelfTest extends GridCommonAbstractTest { assert off == DiscoveryMetricsHelper.METRICS_SIZE; // Test deserialization. - ClusterNodeMetricsMBean res = DiscoveryMetricsHelper.deserialize(data, 0); + ClusterNodeMetrics res = DiscoveryMetricsHelper.deserialize(data, 0); assert res != null; } @@ -55,7 +55,7 @@ public class GridDiscoveryMetricsHelperSelfTest extends GridCommonAbstractTest { public void testSerialization() { byte[] data = new byte[DiscoveryMetricsHelper.METRICS_SIZE]; - ClusterNodeMetricsMBean metrics1 = createMetrics(); + ClusterNodeMetrics metrics1 = createMetrics(); // Test serialization. int off = DiscoveryMetricsHelper.serialize(data, 0, metrics1); @@ -63,7 +63,7 @@ public class GridDiscoveryMetricsHelperSelfTest extends GridCommonAbstractTest { assert off == DiscoveryMetricsHelper.METRICS_SIZE; // Test deserialization. - ClusterNodeMetricsMBean metrics2 = DiscoveryMetricsHelper.deserialize(data, 0); + ClusterNodeMetrics metrics2 = DiscoveryMetricsHelper.deserialize(data, 0); assert metrics2 != null; @@ -74,7 +74,7 @@ public class GridDiscoveryMetricsHelperSelfTest extends GridCommonAbstractTest { * @throws IOException If I/O error occurs. */ public void testMultipleMetricsSerialization() throws IOException { - Map<UUID, ClusterNodeMetricsMBean> metrics = new HashMap<>(METRICS_COUNT); + Map<UUID, ClusterNodeMetrics> metrics = new HashMap<>(METRICS_COUNT); for (int i = 0; i < METRICS_COUNT; i++) metrics.put(UUID.randomUUID(), createMetrics()); @@ -94,7 +94,7 @@ public class GridDiscoveryMetricsHelperSelfTest extends GridCommonAbstractTest { /** * @return Test metrics. */ - private ClusterNodeMetricsMBean createMetrics() { + private ClusterNodeMetrics createMetrics() { DiscoveryNodeMetricsAdapter metrics = new DiscoveryNodeMetricsAdapter(); metrics.setAvailableProcessors(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/test/java/org/gridgain/grid/kernal/ClusterNodeMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/ClusterNodeMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/ClusterNodeMetricsSelfTest.java index a59f4b6..5ca829c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/ClusterNodeMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/ClusterNodeMetricsSelfTest.java @@ -88,7 +88,7 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest { // Wait for metrics update. latch.await(); - ClusterNodeMetricsMBean metrics = ignite.cluster().localNode().metrics(); + ClusterNodeMetrics metrics = ignite.cluster().localNode().metrics(); info("Node metrics: " + metrics); @@ -144,7 +144,7 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest { // Wait for metrics update. latch.await(); - ClusterNodeMetricsMBean metrics = ignite.cluster().localNode().metrics(); + ClusterNodeMetrics metrics = ignite.cluster().localNode().metrics(); info("Node metrics: " + metrics); @@ -207,7 +207,7 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest { latch.await(); - ClusterNodeMetricsMBean metrics = ignite0.cluster().localNode().metrics(); + ClusterNodeMetrics metrics = ignite0.cluster().localNode().metrics(); info("Node 0 metrics: " + metrics); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java index afd346a..eb643e7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java @@ -372,7 +372,7 @@ public class GridDiscoverySelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Nullable @Override public ClusterNodeMetricsMBean metrics() { + @Nullable @Override public ClusterNodeMetrics metrics() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java index 66bd632..f1fb44f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java @@ -84,13 +84,13 @@ public class GridNonHistoryMetricsSelfTest extends GridCommonAbstractTest { GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - ClusterNodeMetricsMBean metrics = ignite.cluster().localNode().metrics(); + ClusterNodeMetrics metrics = ignite.cluster().localNode().metrics(); return metrics.getTotalExecutedJobs() == 5; } }, 5000); - ClusterNodeMetricsMBean metrics = ignite.cluster().localNode().metrics(); + ClusterNodeMetrics metrics = ignite.cluster().localNode().metrics(); info("Node metrics: " + metrics); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractMetricsSelfTest.java index 4563d3d..920910e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractMetricsSelfTest.java @@ -491,7 +491,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract int misses = 0; for (int i = 0; i < gridCount(); i++) { - CacheMetricsMxBean m = grid(i).cache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); puts += m.getCachePuts(); reads += m.getCacheGets(); @@ -534,7 +534,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract // Check metrics for the whole cache. for (int i = 0; i < gridCount(); i++) { - CacheMetricsMxBean m = grid(i).cache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); assertEquals(m.getCacheHits() * 100f / m.getCacheGets(), m.getCacheHitPercentage(), 0.1f); assertEquals(m.getCacheMisses() * 100f / m.getCacheGets(), m.getCacheMissPercentage(), 0.1f); @@ -569,7 +569,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract long misses = 0; for (int i = 0; i < gridCount(); i++) { - CacheMetricsMxBean m = grid(i).cache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); puts += m.getCachePuts(); reads += m.getCacheGets(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java index b01b562..bcbb347 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java @@ -220,7 +220,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int i = 0; i < gridCount(); i++) { IgniteTxMetrics metrics = grid(i).transactions().metrics(); - CacheMetricsMxBean cacheMetrics = grid(i).cache(null).metrics(); + CacheMetrics cacheMetrics = grid(i).cache(null).metrics(); if (i == 0) { assertEquals(TX_CNT, metrics.txCommits()); @@ -262,7 +262,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid for (int i = 0; i < gridCount(); i++) { IgniteTxMetrics metrics = grid(i).transactions().metrics(); - CacheMetricsMxBean cacheMetrics = grid(i).cache(null).metrics(); + CacheMetrics cacheMetrics = grid(i).cache(null).metrics(); assertEquals(0, metrics.txCommits()); assertEquals(0, cacheMetrics.getCacheTxCommits()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java index 87f74f9..ecf83dc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedNearDisabledMetricsSelfTest.java @@ -104,7 +104,7 @@ public class GridCachePartitionedNearDisabledMetricsSelfTest extends GridCacheAb long misses = 0; for (int i = 0; i < gridCount(); i++) { - CacheMetricsMxBean m = grid(i).cache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); removes += m.getCacheRemovals(); reads += m.getCacheGets(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java index e279a6e..2109fba 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java @@ -110,7 +110,7 @@ public class GridP2PClassLoadingSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Nullable @Override public ClusterNodeMetricsMBean metrics() { + @Nullable @Override public ClusterNodeMetrics metrics() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java b/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java index 032e152..083a1bf 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java +++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java @@ -53,7 +53,7 @@ public class GridTestNode extends GridMetadataAwareAdapter implements ClusterNod private Object consistentId = consistentIdCtr.incrementAndGet(); /** */ - private ClusterNodeMetricsMBean metrics; + private ClusterNodeMetrics metrics; /** */ private long order; @@ -84,7 +84,7 @@ public class GridTestNode extends GridMetadataAwareAdapter implements ClusterNod * @param id Node ID. * @param metrics Node metrics. */ - public GridTestNode(UUID id, ClusterNodeMetricsMBean metrics) { + public GridTestNode(UUID id, ClusterNodeMetrics metrics) { this.id = id; this.metrics = metrics; @@ -182,7 +182,7 @@ public class GridTestNode extends GridMetadataAwareAdapter implements ClusterNod } /** {@inheritDoc} */ - @Override public ClusterNodeMetricsMBean metrics() { + @Override public ClusterNodeMetrics metrics() { return metrics; } @@ -208,7 +208,7 @@ public class GridTestNode extends GridMetadataAwareAdapter implements ClusterNod * * @param metrics Node metrics. */ - public void setMetrics(ClusterNodeMetricsMBean metrics) { + public void setMetrics(ClusterNodeMetrics metrics) { this.metrics = metrics; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java index a2c1fd1..3f7eb27 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java @@ -347,7 +347,7 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr protected DiscoveryMetricsProvider createMetricsProvider() { return new DiscoveryMetricsProvider() { /** {@inheritDoc} */ - @Override public ClusterNodeMetricsMBean getMetrics() { return new DiscoveryNodeMetricsAdapter(); } + @Override public ClusterNodeMetrics getMetrics() { return new DiscoveryNodeMetricsAdapter(); } }; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4277989b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index 6b847c9..675060d 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -122,7 +122,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac long misses = 0; for (int i = 0; i < GRID_CNT; i++) { - CacheMetricsMxBean m = grid(i).cache(null).metrics(); + CacheMetrics m = grid(i).cache(null).metrics(); hits += m.getCacheHits(); misses += m.getCacheMisses();
