Repository: ignite Updated Branches: refs/heads/ignite-5072 26ec9ff58 -> 2fe80ef02
Merge into ignite-5072 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2fe80ef0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2fe80ef0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2fe80ef0 Branch: refs/heads/ignite-5072 Commit: 2fe80ef02e6ef0c15183142247f919a152dfbd29 Parents: 26ec9ff Author: Alexey Goncharuk <[email protected]> Authored: Tue Apr 25 17:44:26 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Apr 25 17:44:26 2017 +0300 ---------------------------------------------------------------------- .../database/IgniteCacheDatabaseSharedManager.java | 4 ++-- .../cache/database/MemoryMetricsMXBeanImpl.java | 17 +++++------------ .../processors/service/GridServiceProcessor.java | 9 +-------- 3 files changed, 8 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2fe80ef0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java index ccac7c9..ccf0cdb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java @@ -149,7 +149,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap cfg.getIgniteInstanceName(), "MemoryMetrics", memPlcCfg.getName(), - new MemoryMetricsMXBeanImpl(memMetrics, memPlcCfg), + new MemoryMetricsMXBeanImpl(memMetrics), MemoryMetricsMXBean.class); } catch (JMException e) { @@ -264,7 +264,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap if (dfltMemPlcName == null) dfltMemPlcName = DFLT_MEM_PLC_DEFAULT_NAME; - MemoryMetricsImpl memMetrics = new MemoryMetricsImpl(U.maskName(memPlcCfg.getName())); + MemoryMetricsImpl memMetrics = new MemoryMetricsImpl(memPlcCfg); MemoryPolicy memPlc = initMemory(dbCfg, memPlcCfg, memMetrics); http://git-wip-us.apache.org/repos/asf/ignite/blob/2fe80ef0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MemoryMetricsMXBeanImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MemoryMetricsMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MemoryMetricsMXBeanImpl.java index 9861509..d180134 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MemoryMetricsMXBeanImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MemoryMetricsMXBeanImpl.java @@ -17,8 +17,6 @@ package org.apache.ignite.internal.processors.cache.database; import org.apache.ignite.MemoryMetrics; -import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.mxbean.MemoryMetricsMXBean; /** @@ -28,16 +26,11 @@ class MemoryMetricsMXBeanImpl implements MemoryMetricsMXBean { /** */ private final MemoryMetricsImpl memMetrics; - /** */ - private final MemoryPolicyConfiguration memPlcCfg; - /** * @param memMetrics MemoryMetrics instance to expose through JMX interface. - * @param memPlcCfg Memory policy configuration. */ - public MemoryMetricsMXBeanImpl(MemoryMetricsImpl memMetrics, MemoryPolicyConfiguration memPlcCfg) { + MemoryMetricsMXBeanImpl(MemoryMetricsImpl memMetrics) { this.memMetrics = memMetrics; - this.memPlcCfg = memPlcCfg; } /** {@inheritDoc} */ @@ -87,16 +80,16 @@ class MemoryMetricsMXBeanImpl implements MemoryMetricsMXBean { /** {@inheritDoc} */ @Override public String getName() { - return U.maskName(memPlcCfg.getName()); + return memMetrics.getName(); } /** {@inheritDoc} */ - @Override public int getSize() { - return (int) (memPlcCfg.getSize() / (1024 * 1024)); + @Override public long getSize() { + return memMetrics.getSize(); } /** {@inheritDoc} */ @Override public String getSwapFilePath() { - return memPlcCfg.getSwapFilePath(); + return memMetrics.getSwapFilePath(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/2fe80ef0/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index afe9fea..0c8f857 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@ -20,14 +20,11 @@ package org.apache.ignite.internal.processors.service; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; -import java.util.TreeSet; import java.util.UUID; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; @@ -48,7 +45,6 @@ import org.apache.ignite.compute.ComputeJobContext; import org.apache.ignite.configuration.DeploymentMode; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.DiscoveryEvent; -import org.apache.ignite.events.Event; import org.apache.ignite.events.EventType; import org.apache.ignite.internal.GridClosureCallMode; import org.apache.ignite.internal.GridKernalContext; @@ -73,9 +69,7 @@ import org.apache.ignite.internal.processors.cache.binary.MetadataUpdateProposed import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal; import org.apache.ignite.internal.processors.cache.query.CacheQuery; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager; -import org.apache.ignite.internal.processors.marshaller.MappingAcceptedMessage; -import org.apache.ignite.internal.processors.marshaller.MappingProposedMessage; -import org.apache.ignite.internal.processors.continuous.AbstractContinuousMessage; +import org.apache.ignite.internal.processors.cluster.IgniteChangeGlobalStateSupport; import org.apache.ignite.internal.processors.task.GridInternal; import org.apache.ignite.internal.processors.timeout.GridTimeoutObject; import org.apache.ignite.internal.util.GridEmptyIterator; @@ -92,7 +86,6 @@ import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.LT; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.internal.processors.cluster.IgniteChangeGlobalStateSupport; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.lang.IgniteFuture;
