IGNITE-49 Moved methods form IgniteCacheMxBean into CacheMetrics
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8d338c0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8d338c0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8d338c0c Branch: refs/heads/ignite-49 Commit: 8d338c0c5ab8dc1739eb96e3bb5c96df244c9ffa Parents: e4288e3 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Jan 23 16:07:58 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Jan 23 16:07:58 2015 +0300 ---------------------------------------------------------------------- .../org/gridgain/grid/cache/CacheMetrics.java | 7 - .../gridgain/grid/cache/IgniteCacheMxBean.java | 4 - .../processors/cache/CacheMetricsAdapter.java | 23 +- .../processors/cache/CacheMetricsSnapshot.java | 380 ++++++++++++++----- .../processors/cache/CacheMxBeanImpl.java | 129 +++---- .../processors/cache/GridCacheAdapter.java | 2 +- 6 files changed, 346 insertions(+), 199 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d338c0c/modules/core/src/main/java/org/gridgain/grid/cache/CacheMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/CacheMetrics.java b/modules/core/src/main/java/org/gridgain/grid/cache/CacheMetrics.java index 9810e1c..4f866a3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/CacheMetrics.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/CacheMetrics.java @@ -145,13 +145,6 @@ public interface CacheMetrics { public String name(); /** - * Gets metrics (statistics) for this cache. - * - * @return Cache metrics. - */ - public String metricsFormatted(); - - /** * Gets number of entries that was swapped to disk. * * @return Number of entries that was swapped to disk. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d338c0c/modules/core/src/main/java/org/gridgain/grid/cache/IgniteCacheMxBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/IgniteCacheMxBean.java b/modules/core/src/main/java/org/gridgain/grid/cache/IgniteCacheMxBean.java index 9f40264..2812cb2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/cache/IgniteCacheMxBean.java +++ b/modules/core/src/main/java/org/gridgain/grid/cache/IgniteCacheMxBean.java @@ -95,10 +95,6 @@ public interface IgniteCacheMxBean extends CacheStatisticsMXBean, CacheMetrics { public String name(); /** {@inheritDoc} */ - @IgniteMBeanDescription("Formatted cache metrics.") - public String metricsFormatted(); - - /** {@inheritDoc} */ @IgniteMBeanDescription("Number of entries that was swapped to disk.") public long getOverflowSize(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d338c0c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMetricsAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMetricsAdapter.java index cf342a3..f1c5248 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMetricsAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMetricsAdapter.java @@ -116,11 +116,6 @@ public class CacheMetricsAdapter implements CacheMetrics { } /** {@inheritDoc} */ - @Override public String metricsFormatted() { - return String.valueOf(cctx.cache().metrics()); - } - - /** {@inheritDoc} */ @Override public long getOverflowSize() { try { return cctx.cache().overflowSize(); @@ -157,7 +152,9 @@ public class CacheMetricsAdapter implements CacheMetrics { /** {@inheritDoc} */ @Override public int getDhtEvictQueueCurrentSize() { - return cctx.isNear() ? dhtCtx.evicts().evictQueueSize() : cctx.evicts().evictQueueSize(); + return cctx.isNear() ? + dhtCtx != null ? dhtCtx.evicts().evictQueueSize() : -1 + : cctx.evicts().evictQueueSize(); } /** {@inheritDoc} */ @@ -197,37 +194,37 @@ public class CacheMetricsAdapter implements CacheMetrics { /** {@inheritDoc} */ @Override public int getTxDhtThreadMapSize() { - return cctx.isNear() ? dhtCtx.tm().threadMapSize() : -1; + return cctx.isNear() && dhtCtx !=null ? dhtCtx.tm().threadMapSize() : -1; } /** {@inheritDoc} */ @Override public int getTxDhtXidMapSize() { - return cctx.isNear() ? dhtCtx.tm().idMapSize() : -1; + return cctx.isNear() && dhtCtx !=null ? dhtCtx.tm().idMapSize() : -1; } /** {@inheritDoc} */ @Override public int getTxDhtCommitQueueSize() { - return cctx.isNear() ? dhtCtx.tm().commitQueueSize() : -1; + return cctx.isNear() && dhtCtx !=null ? dhtCtx.tm().commitQueueSize() : -1; } /** {@inheritDoc} */ @Override public int getTxDhtPrepareQueueSize() { - return cctx.isNear() ? dhtCtx.tm().prepareQueueSize() : -1; + return cctx.isNear() && dhtCtx !=null ? dhtCtx.tm().prepareQueueSize() : -1; } /** {@inheritDoc} */ @Override public int getTxDhtStartVersionCountsSize() { - return cctx.isNear() ? dhtCtx.tm().startVersionCountsSize() : -1; + return cctx.isNear() && dhtCtx !=null ? dhtCtx.tm().startVersionCountsSize() : -1; } /** {@inheritDoc} */ @Override public int getTxDhtCommittedVersionsSize() { - return cctx.isNear() ? dhtCtx.tm().committedVersionsSize() : -1; + return cctx.isNear() && dhtCtx !=null ? dhtCtx.tm().committedVersionsSize() : -1; } /** {@inheritDoc} */ @Override public int getTxDhtRolledbackVersionsSize() { - return cctx.isNear() ? dhtCtx.tm().rolledbackVersionsSize() : -1; + return cctx.isNear() && dhtCtx !=null ? dhtCtx.tm().rolledbackVersionsSize() : -1; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d338c0c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMetricsSnapshot.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMetricsSnapshot.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMetricsSnapshot.java index d8d6b48..0e40e18 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMetricsSnapshot.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMetricsSnapshot.java @@ -68,6 +68,99 @@ class CacheMetricsSnapshot implements CacheMetrics, Externalizable { /** Commit transaction time taken nanos. */ private float rollbackAvgTimeNanos = 0; + /** Cache name */ + private String cacheName; + + /** Number of entries that was swapped to disk. */ + private long overflowSize; + + /** Number of entries stored in off-heap memory. */ + private long offHeapEntriesCount; + + /** Memory size allocated in off-heap. */ + private long offHeapAllocatedSize; + + /** Number of non-{@code null} values in the cache. */ + private int size; + + /** Number of keys in the cache, possibly with {@code null} values. */ + private int keySize; + + /** Cache is empty. */ + private boolean isEmpty; + + /** Gets current size of evict queue used to batch up evictions. */ + private int dhtEvictQueueCurrentSize; + + /** Transaction per-thread map size. */ + private int txThreadMapSize; + + /** Transaction per-Xid map size. */ + private int txXidMapSize; + + /** Committed transaction queue size. */ + private int txCommitQueueSize; + + /** Prepared transaction queue size. */ + private int txPrepareQueueSize; + + /** Start version counts map size. */ + private int txStartVersionCountsSize; + + /** Number of cached committed transaction IDs. */ + private int txCommittedVersionsSize; + + /** Number of cached rolled back transaction IDs. */ + private int txRolledbackVersionsSize; + + /** DHT thread map size. */ + private int txDhtThreadMapSize; + + /** Transaction DHT per-Xid map size. */ + private int txDhtXidMapSize; + + /** Committed DHT transaction queue size. */ + private int txDhtCommitQueueSize; + + /** Prepared DHT transaction queue size. */ + private int txDhtPrepareQueueSize; + + /** DHT start version counts map size. */ + private int txDhtStartVersionCountsSize; + + /** Number of cached committed DHT transaction IDs. */ + private int txDhtCommittedVersionsSize; + + /** Number of cached rolled back DHT transaction IDs. */ + private int txDhtRolledbackVersionsSize; + + /** Write-behind is enabled. */ + private boolean isWriteBehindEnabled; + + /** Buffer size that triggers flush procedure. */ + private int writeBehindFlushSize; + + /** Count of worker threads. */ + private int writeBehindFlushThreadCount; + + /** Flush frequency in milliseconds. */ + private long writeBehindFlushFrequency; + + /** Maximum size of batch. */ + private int writeBehindStoreBatchSize; + + /** Count of cache overflow events since start. */ + private int writeBehindTotalCriticalOverflowCount; + + /** Count of cache overflow events since start. */ + private int writeBehindCriticalOverflowCount; + + /** Count of entries in store-retry state. */ + private int writeBehindErrorRetryCount; + + /** Total count of entries in cache store internal buffer. */ + private int writeBehindBufferSize; + /** * Create snapshot for given metrics. * @@ -88,6 +181,38 @@ class CacheMetricsSnapshot implements CacheMetrics, Externalizable { removeAvgTimeNanos = m.getAverageRemoveTime(); commitAvgTimeNanos = m.getAverageTxCommitTime(); rollbackAvgTimeNanos = m.getAverageTxRollbackTime(); + + cacheName = m.name(); + overflowSize = m.getOverflowSize(); + offHeapEntriesCount = m.getOffHeapEntriesCount(); + offHeapAllocatedSize = m.getOffHeapAllocatedSize(); + size = m.getSize(); + keySize = m.getKeySize(); + isEmpty = m.isEmpty(); + dhtEvictQueueCurrentSize = m.getDhtEvictQueueCurrentSize(); + txThreadMapSize = m.getTxThreadMapSize(); + txXidMapSize = m.getTxXidMapSize(); + txCommitQueueSize = m.getTxCommitQueueSize(); + txPrepareQueueSize = m.getTxPrepareQueueSize(); + txStartVersionCountsSize = m.getTxStartVersionCountsSize(); + txCommittedVersionsSize = m.getTxCommittedVersionsSize(); + txRolledbackVersionsSize = m.getTxRolledbackVersionsSize(); + txDhtThreadMapSize = m.getTxDhtThreadMapSize(); + txDhtXidMapSize = m.getTxDhtXidMapSize(); + txDhtCommitQueueSize = m.getTxDhtCommitQueueSize(); + txDhtPrepareQueueSize = m.getTxDhtPrepareQueueSize(); + txDhtStartVersionCountsSize = m.getTxDhtStartVersionCountsSize(); + txDhtCommittedVersionsSize = m.getTxDhtCommittedVersionsSize(); + txDhtRolledbackVersionsSize = m.getTxDhtRolledbackVersionsSize(); + isWriteBehindEnabled = m.isWriteBehindEnabled(); + writeBehindFlushSize = m.getWriteBehindFlushSize(); + writeBehindFlushThreadCount = m.getWriteBehindFlushThreadCount(); + writeBehindFlushFrequency = m.getWriteBehindFlushFrequency(); + writeBehindStoreBatchSize = m.getWriteBehindStoreBatchSize(); + writeBehindTotalCriticalOverflowCount = m.getWriteBehindTotalCriticalOverflowCount(); + writeBehindCriticalOverflowCount = m.getWriteBehindCriticalOverflowCount(); + writeBehindErrorRetryCount = m.getWriteBehindErrorRetryCount(); + writeBehindBufferSize = m.getWriteBehindBufferSize(); } /** {@inheritDoc} */ @@ -172,164 +297,159 @@ class CacheMetricsSnapshot implements CacheMetrics, Externalizable { return txRollbacks; } - @Override - public String name() { - return null; - } - - @Override - public String metricsFormatted() { - return null; + /** {@inheritDoc} */ + @Override public String name() { + return cacheName; } - @Override - public long getOverflowSize() { - return 0; + /** {@inheritDoc} */ + @Override public long getOverflowSize() { + return overflowSize; } - @Override - public long getOffHeapEntriesCount() { - return 0; + /** {@inheritDoc} */ + @Override public long getOffHeapEntriesCount() { + return offHeapEntriesCount; } - @Override - public long getOffHeapAllocatedSize() { - return 0; + /** {@inheritDoc} */ + @Override public long getOffHeapAllocatedSize() { + return offHeapAllocatedSize; } - @Override - public int getSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getSize() { + return size; } - @Override - public int getKeySize() { - return 0; + /** {@inheritDoc} */ + @Override public int getKeySize() { + return keySize; } - @Override - public boolean isEmpty() { - return false; + /** {@inheritDoc} */ + @Override public boolean isEmpty() { + return isEmpty; } - @Override - public int getDhtEvictQueueCurrentSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getDhtEvictQueueCurrentSize() { + return dhtEvictQueueCurrentSize; } - @Override - public int getTxThreadMapSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxThreadMapSize() { + return txThreadMapSize; } - @Override - public int getTxXidMapSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxXidMapSize() { + return txXidMapSize; } - @Override - public int getTxCommitQueueSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxCommitQueueSize() { + return txCommitQueueSize; } - @Override - public int getTxPrepareQueueSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxPrepareQueueSize() { + return txPrepareQueueSize; } - @Override - public int getTxStartVersionCountsSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxStartVersionCountsSize() { + return txStartVersionCountsSize; } - @Override - public int getTxCommittedVersionsSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxCommittedVersionsSize() { + return txCommittedVersionsSize; } - @Override - public int getTxRolledbackVersionsSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxRolledbackVersionsSize() { + return txRolledbackVersionsSize; } - @Override - public int getTxDhtThreadMapSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxDhtThreadMapSize() { + return txDhtThreadMapSize; } - @Override - public int getTxDhtXidMapSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxDhtXidMapSize() { + return txDhtXidMapSize; } - @Override - public int getTxDhtCommitQueueSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxDhtCommitQueueSize() { + return txDhtCommitQueueSize; } - @Override - public int getTxDhtPrepareQueueSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxDhtPrepareQueueSize() { + return txDhtPrepareQueueSize; } - @Override - public int getTxDhtStartVersionCountsSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxDhtStartVersionCountsSize() { + return txDhtStartVersionCountsSize; } - @Override - public int getTxDhtCommittedVersionsSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxDhtCommittedVersionsSize() { + return txDhtCommittedVersionsSize; } - @Override - public int getTxDhtRolledbackVersionsSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getTxDhtRolledbackVersionsSize() { + return txDhtRolledbackVersionsSize; } - @Override - public boolean isWriteBehindEnabled() { - return false; + /** {@inheritDoc} */ + @Override public boolean isWriteBehindEnabled() { + return isWriteBehindEnabled; } - @Override - public int getWriteBehindFlushSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getWriteBehindFlushSize() { + return writeBehindFlushSize; } - @Override - public int getWriteBehindFlushThreadCount() { - return 0; + /** {@inheritDoc} */ + @Override public int getWriteBehindFlushThreadCount() { + return writeBehindFlushThreadCount; } - @Override - public long getWriteBehindFlushFrequency() { - return 0; + /** {@inheritDoc} */ + @Override public long getWriteBehindFlushFrequency() { + return writeBehindFlushFrequency; } - @Override - public int getWriteBehindStoreBatchSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getWriteBehindStoreBatchSize() { + return writeBehindStoreBatchSize; } - @Override - public int getWriteBehindTotalCriticalOverflowCount() { - return 0; + /** {@inheritDoc} */ + @Override public int getWriteBehindTotalCriticalOverflowCount() { + return writeBehindTotalCriticalOverflowCount; } - @Override - public int getWriteBehindCriticalOverflowCount() { - return 0; + /** {@inheritDoc} */ + @Override public int getWriteBehindCriticalOverflowCount() { + return writeBehindCriticalOverflowCount; } - @Override - public int getWriteBehindErrorRetryCount() { - return 0; + /** {@inheritDoc} */ + @Override public int getWriteBehindErrorRetryCount() { + return writeBehindErrorRetryCount; } - @Override - public int getWriteBehindBufferSize() { - return 0; + /** {@inheritDoc} */ + @Override public int getWriteBehindBufferSize() { + return writeBehindBufferSize; } /** {@inheritDoc} */ @@ -348,6 +468,38 @@ class CacheMetricsSnapshot implements CacheMetrics, Externalizable { out.writeFloat(removeAvgTimeNanos); out.writeFloat(commitAvgTimeNanos); out.writeFloat(rollbackAvgTimeNanos); + + out.writeObject(cacheName); + out.writeLong(overflowSize); + out.writeLong(offHeapEntriesCount); + out.writeLong(offHeapAllocatedSize); + out.writeInt(size); + out.writeInt(keySize); + out.writeBoolean(isEmpty); + out.writeInt(dhtEvictQueueCurrentSize); + out.writeInt(txThreadMapSize); + out.writeInt(txXidMapSize); + out.writeInt(txCommitQueueSize); + out.writeInt(txPrepareQueueSize); + out.writeInt(txStartVersionCountsSize); + out.writeInt(txCommittedVersionsSize); + out.writeInt(txRolledbackVersionsSize); + out.writeInt(txDhtThreadMapSize); + out.writeInt(txDhtXidMapSize); + out.writeInt(txDhtCommitQueueSize); + out.writeInt(txDhtPrepareQueueSize); + out.writeInt(txDhtStartVersionCountsSize); + out.writeInt(txDhtCommittedVersionsSize); + out.writeInt(txDhtRolledbackVersionsSize); + out.writeBoolean(isWriteBehindEnabled); + out.writeInt(writeBehindFlushSize); + out.writeInt(writeBehindFlushThreadCount); + out.writeLong(writeBehindFlushFrequency); + out.writeInt(writeBehindStoreBatchSize); + out.writeInt(writeBehindTotalCriticalOverflowCount); + out.writeInt(writeBehindCriticalOverflowCount); + out.writeInt(writeBehindErrorRetryCount); + out.writeInt(writeBehindBufferSize); } /** {@inheritDoc} */ @@ -366,6 +518,38 @@ class CacheMetricsSnapshot implements CacheMetrics, Externalizable { removeAvgTimeNanos = in.readFloat(); commitAvgTimeNanos = in.readFloat(); rollbackAvgTimeNanos = in.readFloat(); + + cacheName = (String)in.readObject(); + overflowSize = in.readLong(); + offHeapEntriesCount = in.readLong(); + offHeapAllocatedSize = in.readLong(); + size = in.readInt(); + keySize = in.readInt(); + isEmpty = in.readBoolean(); + dhtEvictQueueCurrentSize = in.readInt(); + txThreadMapSize = in.readInt(); + txXidMapSize = in.readInt(); + txCommitQueueSize = in.readInt(); + txPrepareQueueSize = in.readInt(); + txStartVersionCountsSize = in.readInt(); + txCommittedVersionsSize = in.readInt(); + txRolledbackVersionsSize = in.readInt(); + txDhtThreadMapSize = in.readInt(); + txDhtXidMapSize = in.readInt(); + txDhtCommitQueueSize = in.readInt(); + txDhtPrepareQueueSize = in.readInt(); + txDhtStartVersionCountsSize = in.readInt(); + txDhtCommittedVersionsSize = in.readInt(); + txDhtRolledbackVersionsSize = in.readInt(); + isWriteBehindEnabled = in.readBoolean(); + writeBehindFlushSize = in.readInt(); + writeBehindFlushThreadCount = in.readInt(); + writeBehindFlushFrequency = in.readLong(); + writeBehindStoreBatchSize = in.readInt(); + writeBehindTotalCriticalOverflowCount = in.readInt(); + writeBehindCriticalOverflowCount = in.readInt(); + writeBehindErrorRetryCount = in.readInt(); + writeBehindBufferSize = in.readInt(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d338c0c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMxBeanImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMxBeanImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMxBeanImpl.java index c3837f2..3d5ba1e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMxBeanImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheMxBeanImpl.java @@ -17,281 +17,258 @@ 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 CacheMxBeanImpl implements IgniteCacheMxBean { - /** Cache context. */ - private GridCacheContext<?, ?> cctx; - - /** DHT context. */ - private GridCacheContext<?, ?> dhtCtx; - - /** Write-behind store, if configured. */ - private GridCacheWriteBehindStore store; + /** Cache. */ + private GridCacheAdapter<?, ?> cache; /** * Creates MBean; * - * @param cctx Cache context. + * @param cache Cache. */ - CacheMxBeanImpl(GridCacheContext<?, ?> cctx) { - assert cctx != null; - - this.cctx = cctx; - - if (cctx.isNear()) - dhtCtx = cctx.near().dht().context(); + CacheMxBeanImpl(GridCacheAdapter<?, ?> cache) { + assert cache != null; - if (cctx.store().store() instanceof GridCacheWriteBehindStore) - store = (GridCacheWriteBehindStore)cctx.store().store(); + this.cache = cache; } /** {@inheritDoc} */ @Override public String name() { - return cctx.name(); - } - - /** {@inheritDoc} */ - @Override public String metricsFormatted() { - return String.valueOf(cctx.cache().metrics()); + return cache.metrics0().name(); } /** {@inheritDoc} */ @Override public long getOverflowSize() { - try { - return cctx.cache().overflowSize(); - } - catch (IgniteCheckedException ignored) { - return -1; - } + return cache.metrics0().getOverflowSize(); } /** {@inheritDoc} */ @Override public long getOffHeapEntriesCount() { - return cctx.cache().offHeapEntriesCount(); + return cache.metrics0().getOffHeapEntriesCount(); } /** {@inheritDoc} */ @Override public long getOffHeapAllocatedSize() { - return cctx.cache().offHeapAllocatedSize(); + return cache.metrics0().getOffHeapAllocatedSize(); } /** {@inheritDoc} */ @Override public int getSize() { - return cctx.cache().size(); + return cache.metrics0().getSize(); } /** {@inheritDoc} */ @Override public int getKeySize() { - return cctx.cache().size(); + return cache.metrics0().getKeySize(); } /** {@inheritDoc} */ @Override public boolean isEmpty() { - return cctx.cache().isEmpty(); + return cache.metrics0().isEmpty(); } /** {@inheritDoc} */ @Override public int getDhtEvictQueueCurrentSize() { - return cctx.isNear() ? dhtCtx.evicts().evictQueueSize() : cctx.evicts().evictQueueSize(); + return cache.metrics0().getDhtEvictQueueCurrentSize(); } /** {@inheritDoc} */ @Override public int getTxCommitQueueSize() { - return cctx.tm().commitQueueSize(); + return cache.metrics0().getTxCommitQueueSize(); } /** {@inheritDoc} */ @Override public int getTxThreadMapSize() { - return cctx.tm().threadMapSize(); + return cache.metrics0().getTxThreadMapSize(); } /** {@inheritDoc} */ @Override public int getTxXidMapSize() { - return cctx.tm().idMapSize(); + return cache.metrics0().getTxXidMapSize(); } /** {@inheritDoc} */ @Override public int getTxPrepareQueueSize() { - return cctx.tm().prepareQueueSize(); + return cache.metrics0().getTxPrepareQueueSize(); } /** {@inheritDoc} */ @Override public int getTxStartVersionCountsSize() { - return cctx.tm().startVersionCountsSize(); + return cache.metrics0().getTxStartVersionCountsSize(); } /** {@inheritDoc} */ @Override public int getTxCommittedVersionsSize() { - return cctx.tm().committedVersionsSize(); + return cache.metrics0().getTxCommittedVersionsSize(); } /** {@inheritDoc} */ @Override public int getTxRolledbackVersionsSize() { - return cctx.tm().rolledbackVersionsSize(); + return cache.metrics0().getTxRolledbackVersionsSize(); } /** {@inheritDoc} */ @Override public int getTxDhtThreadMapSize() { - return cctx.isNear() ? dhtCtx.tm().threadMapSize() : -1; + return cache.metrics0().getTxDhtThreadMapSize(); } /** {@inheritDoc} */ @Override public int getTxDhtXidMapSize() { - return cctx.isNear() ? dhtCtx.tm().idMapSize() : -1; + return cache.metrics0().getTxDhtXidMapSize(); } /** {@inheritDoc} */ @Override public int getTxDhtCommitQueueSize() { - return cctx.isNear() ? dhtCtx.tm().commitQueueSize() : -1; + return cache.metrics0().getTxDhtCommitQueueSize(); } /** {@inheritDoc} */ @Override public int getTxDhtPrepareQueueSize() { - return cctx.isNear() ? dhtCtx.tm().prepareQueueSize() : -1; + return cache.metrics0().getTxDhtPrepareQueueSize(); } /** {@inheritDoc} */ @Override public int getTxDhtStartVersionCountsSize() { - return cctx.isNear() ? dhtCtx.tm().startVersionCountsSize() : -1; + return cache.metrics0().getTxDhtStartVersionCountsSize(); } /** {@inheritDoc} */ @Override public int getTxDhtCommittedVersionsSize() { - return cctx.isNear() ? dhtCtx.tm().committedVersionsSize() : -1; + return cache.metrics0().getTxDhtCommittedVersionsSize(); } /** {@inheritDoc} */ @Override public int getTxDhtRolledbackVersionsSize() { - return cctx.isNear() ? dhtCtx.tm().rolledbackVersionsSize() : -1; + return cache.metrics0().getTxDhtRolledbackVersionsSize(); } /** {@inheritDoc} */ @Override public boolean isWriteBehindEnabled() { - return store != null; + return cache.metrics0().isWriteBehindEnabled(); } /** {@inheritDoc} */ @Override public int getWriteBehindFlushSize() { - return store != null ? store.getWriteBehindFlushSize() : -1; + return cache.metrics0().getWriteBehindFlushSize(); } /** {@inheritDoc} */ @Override public int getWriteBehindFlushThreadCount() { - return store != null ? store.getWriteBehindFlushThreadCount() : -1; + return cache.metrics0().getWriteBehindFlushThreadCount(); } /** {@inheritDoc} */ @Override public long getWriteBehindFlushFrequency() { - return store != null ? store.getWriteBehindFlushFrequency() : -1; + return cache.metrics0().getWriteBehindFlushFrequency(); } /** {@inheritDoc} */ @Override public int getWriteBehindStoreBatchSize() { - return store != null ? store.getWriteBehindStoreBatchSize() : -1; + return cache.metrics0().getWriteBehindStoreBatchSize(); } /** {@inheritDoc} */ @Override public int getWriteBehindTotalCriticalOverflowCount() { - return store != null ? store.getWriteBehindTotalCriticalOverflowCount() : -1; + return cache.metrics0().getWriteBehindTotalCriticalOverflowCount(); } /** {@inheritDoc} */ @Override public int getWriteBehindCriticalOverflowCount() { - return store != null ? store.getWriteBehindCriticalOverflowCount() : -1; + return cache.metrics0().getWriteBehindCriticalOverflowCount(); } /** {@inheritDoc} */ @Override public int getWriteBehindErrorRetryCount() { - return store != null ? store.getWriteBehindErrorRetryCount() : -1; + return cache.metrics0().getWriteBehindErrorRetryCount(); } /** {@inheritDoc} */ @Override public int getWriteBehindBufferSize() { - return store != null ? store.getWriteBehindBufferSize() : -1; + return cache.metrics0().getWriteBehindBufferSize(); } /** {@inheritDoc} */ @Override public void clear() { - cctx.cache().metrics0().clear(); + cache.metrics0().clear(); } /** {@inheritDoc} */ @Override public long getCacheHits() { - return cctx.cache().metrics0().getCacheHits(); + return cache.metrics0().getCacheHits(); } /** {@inheritDoc} */ @Override public float getCacheHitPercentage() { - return cctx.cache().metrics0().getCacheHitPercentage(); + return cache.metrics0().getCacheHitPercentage(); } /** {@inheritDoc} */ @Override public long getCacheMisses() { - return cctx.cache().metrics0().getCacheMisses(); + return cache.metrics0().getCacheMisses(); } /** {@inheritDoc} */ @Override public float getCacheMissPercentage() { - return cctx.cache().metrics0().getCacheMissPercentage(); + return cache.metrics0().getCacheMissPercentage(); } /** {@inheritDoc} */ @Override public long getCacheGets() { - return cctx.cache().metrics0().getCacheGets(); + return cache.metrics0().getCacheGets(); } /** {@inheritDoc} */ @Override public long getCachePuts() { - return cctx.cache().metrics0().getCachePuts(); + return cache.metrics0().getCachePuts(); } /** {@inheritDoc} */ @Override public long getCacheRemovals() { - return cctx.cache().metrics0().getCacheRemovals(); + return cache.metrics0().getCacheRemovals(); } /** {@inheritDoc} */ @Override public long getCacheEvictions() { - return cctx.cache().metrics0().getCacheEvictions(); + return cache.metrics0().getCacheEvictions(); } /** {@inheritDoc} */ @Override public float getAverageGetTime() { - return cctx.cache().metrics0().getAverageGetTime(); + return cache.metrics0().getAverageGetTime(); } /** {@inheritDoc} */ @Override public float getAveragePutTime() { - return cctx.cache().metrics0().getAveragePutTime(); + return cache.metrics0().getAveragePutTime(); } /** {@inheritDoc} */ @Override public float getAverageRemoveTime() { - return cctx.cache().metrics0().getAverageRemoveTime(); + return cache.metrics0().getAverageRemoveTime(); } /** {@inheritDoc} */ @Override public float getAverageTxCommitTime() { - return cctx.cache().metrics0().getAverageTxCommitTime(); + return cache.metrics0().getAverageTxCommitTime(); } /** {@inheritDoc} */ @Override public float getAverageTxRollbackTime() { - return cctx.cache().metrics0().getAverageTxRollbackTime(); + return cache.metrics0().getAverageTxRollbackTime(); } /** {@inheritDoc} */ @Override public long getCacheTxCommits() { - return cctx.cache().metrics0().getCacheTxCommits(); + return cache.metrics0().getCacheTxCommits(); } /** {@inheritDoc} */ @Override public long getCacheTxRollbacks() { - return cctx.cache().metrics0().getCacheTxRollbacks(); + return cache.metrics0().getCacheTxRollbacks(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d338c0c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index 3d959e2..4d354a4 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -231,7 +231,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, metrics = new CacheMetricsAdapter(ctx); - mxBean = new CacheMxBeanImpl(ctx); + mxBean = new CacheMxBeanImpl(this); IgniteFsConfiguration[] ggfsCfgs = gridCfg.getGgfsConfiguration();
